imperituroard 0.5.3 → 0.5.9

data/lib/imperituroard/projects/dns.rb

@@ -1,4 +1,4 @@
-require 'imperituroard/projects/dns/ukaz60/dns_update'
+require 'imperituroard/projects/ukaz60/dns_update'
 
 
 class Dns_2

data/lib/imperituroard/projects/iot.rb

@@ -1037,7 +1037,7 @@ class IotFunctions_2
   end
 
 
-  def test
+  def test1278493
     #ddd = MongoIot.new(mongoip, mongoport, mongo_database)
     #ddd.get_profiles_by_login("test")
 

data/lib/imperituroard/projects/iot/add_functions.rb

@@ -96,27 +96,27 @@ class AdditionalFunc
   end
 
   def check_input_1(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def check_input_2(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def check_input_3(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def check_input_4(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def check_input_5(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def check_input_6(login, imei_list)
-    {:code=>200, :result=>"Request completed successfully", :body=>"Data checked"}
+    {:code => 200, :result => "Request completed successfully", :body => "Data checked"}
   end
 
   def iot_query_dev_soapgw_answer(input_params, output_answer)
@@ -127,28 +127,28 @@ class AdditionalFunc
 
     begin
 
-    if output_answer[:code]==200
-      dataaa = []
-      dataaa_failed = []
-
-      ddd = answ_dev_query_format_process(output_answer[:data])[:body]
-      p ddd
-
-      answ = { :code => output_answer[:code],
-               :result => output_answer[:result],
-               :data => ddd[:ok],
-               :error_list => ddd[:failed]
-      }
-    else
-      answ = { :code => output_answer[:code],
-               :result => output_answer[:result],
-               :data => [],
-               :error_list => input_params[:imei]
-      }
-    end
+      if output_answer[:code]==200
+        dataaa = []
+        dataaa_failed = []
+
+        ddd = answ_dev_query_format_process(output_answer[:data])[:body]
+        p ddd
+
+        answ = {:code => output_answer[:code],
+                :result => output_answer[:result],
+                :data => ddd[:ok],
+                :error_list => ddd[:failed]
+        }
+      else
+        answ = {:code => output_answer[:code],
+                :result => output_answer[:result],
+                :data => [],
+                :error_list => input_params[:imei]
+        }
+      end
     rescue
-      answ = { :code => 500,
-               :result => "Unknown error"
+      answ = {:code => 500,
+              :result => "Unknown error"
       }
     end
 

data/lib/imperituroard/projects/mhub.rb

@@ -51,6 +51,7 @@ class MhubFunctions_2
   # "notifyContentType"=>"application/json"}}
 
 
+  #for bank dabrabyt
   def get_send_message_2(params, ip_src, ip_real, ip_vip)
 
     input_params = {:params => params}
@@ -123,6 +124,7 @@ class MhubFunctions_2
   end
 
 
+  #for bank dabrabyt
   def rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}

data/lib/imperituroard/projects/mhub/infobip.rb

@@ -5,7 +5,7 @@
 
 
 
-class Infobip_1
+class Infobip_2
 
   def test
     gg = "{\"destinations\"=>[{\"to\"=>{\"phoneNumber\"=>\"375297116638\", \"emailAddress\"=>nil}}], \"scenarioKey\"=>\"1\", \"viber\"=>nil, \"sms\"=>{\"text\"=>\"карточка готова\"}, \"sendAt\"=>\"2019-08-15T08:40:00.000\", \"notifyUrl\"=>\"https://bpmonline.bankdabrabyt.by:444/0/ServiceModel/ScGetReports.svc/GetReports\", \"notifyContentType\"=>\"application/json\", \"controller\"=>\"bank\", \"action\"=>\"api\", \"bank\"=>{\"destinations\"=>[{\"to\"=>{\"phoneNumber\"=>\"375297116638\", \"emailAddress\"=>nil}}], \"scenarioKey\"=>\"1\", \"viber\"=>nil, \"sms\"=>{\"text\"=>\"карточка готова\"}, \"sendAt\"=>\"2019-08-15T08:40:00.000\", \"notifyUrl\"=>\"https://bpmonline.bankdabrabyt.by:444/0/ServiceModel/ScGetReports.svc/GetReports\", \"notifyContentType\"=>\"application/json\"}}"

data/lib/imperituroard/projects/mhub/sk.rb

@@ -1,8 +1,9 @@
 require 'imperituroard/projects/iot/internal_functions'
+require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
 
 class Sksk_2
 
-  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector
+  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector, :dabrab_add_func
 
   def initialize(sk_url, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @sk_url = sk_url
@@ -11,6 +12,7 @@ class Sksk_2
     @internal_func = InternalFunc.new
     @sk_url_broadcast = sk_url_broadcast
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+    @dabrab_add_func = Dabrab.new
   end
 
 
@@ -82,50 +84,49 @@ class Sksk_2
     request_message = {}
 
     begin
-
       thr_sk_send_viber_one = Thread.new do
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
+
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url)
+          #8 - client id
+
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl=true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+
+          req.basic_auth sk_login, sk_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          request_message = {
+              "phone_number": msisdn,
+              #"extra_id": "4232j4h89932kjhs",
+              "callback_url": callback_url,
+              #"start_time": "2019-08-16 09:59:10",
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber"
+              ],
+              "channel_options": {
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+          req.body = request_message.to_json
+          res = https.request(req)
+          output_params = {:code => 200,
+                           :result => "Sksk_2.sk_send_viber_one: Request processed",
+                           :body => {:request_message => request_message,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_one: Something wrong with dabrabyt_text_field_parse"}
+        end
 
 
-        uri = URI(sk_url)
-        #8 - client id
-
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl=true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
-
-        req.basic_auth sk_login, sk_password
-
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
-
-        request_message = {
-            "phone_number": msisdn,
-            #"extra_id": "4232j4h89932kjhs",
-            "callback_url": callback_url,
-            #"start_time": "2019-08-16 09:59:10",
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber"
-            ],
-            "channel_options": {
-                "viber": {
-                    "text": text,
-                    "ttl": 60,
-                    # "img": "http://olddogs.org/logo.png",
-                    # "caption": "Old Dogs need you!",
-                    # "action": "http://olddogs.org",
-                },
-            }
-        }
-        req.body = request_message.to_json
-        res = https.request(req)
-        output_params = {:code => 200,
-                         :result => "Sksk_2.sk_send_viber_one: Request processed",
-                         :body => {:request_message => request_message,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
-
       end
 
       thr_sk_send_viber_one.join
@@ -149,53 +150,54 @@ class Sksk_2
 
       thr_sk_send_viber_sms_one = Thread.new do
 
-        uri = URI(sk_url)
-        #8 - client id
-
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl=true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
-
-        req.basic_auth sk_login, sk_password
-
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
-
-        request_message = {
-            "phone_number": msisdn,
-            #"extra_id": "4232j4h89932kjhs",
-            "callback_url": callback_url,
-            #"start_time": "2019-08-16 09:59:10",
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber",
-                "sms"
-            ],
-            "channel_options": {
-                "sms": {
-                    "text": sms_text,
-                    "alpha_name": alphaname,
-                    "ttl": 600
-                },
-                "viber": {
-                    "text": viber_txt,
-                    "ttl": 60,
-                    # "img": "http://olddogs.org/logo.png",
-                    # "caption": "Old Dogs need you!",
-                    # "action": "http://olddogs.org",
-                },
-            }
-        }
-
-        req.body = request_message.to_json
-        res = https.request(req)
-
-        output_params = {:code => 200,
-                         :result => "Sksk_2.sk_send_viber_sms_one: Request processed",
-                         :body => {:request_message => request_message,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_txt)
+
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url)
+          #8 - client id
+
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl=true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+
+          req.basic_auth sk_login, sk_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          request_message = {
+              "phone_number": msisdn,
+              #"extra_id": "4232j4h89932kjhs",
+              "callback_url": callback_url,
+              #"start_time": "2019-08-16 09:59:10",
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber",
+                  "sms"
+              ],
+              "channel_options": {
+                  "sms": {
+                      "text": sms_text,
+                      "alpha_name": alphaname,
+                      "ttl": 600
+                  },
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :result => "Sksk_2.sk_send_viber_sms_one: Request processed",
+                           :body => {:request_message => request_message,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_one: Something wrong with dabrabyt_text_field_parse"}
+        end
 
       end
 
@@ -281,44 +283,49 @@ class Sksk_2
     begin
 
       thr_sk_send_viber_list = Thread.new do
-        uri = URI(sk_url_broadcast)
-        #8 - client id
 
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url_broadcast)
+          #8 - client id
 
-        req.basic_auth sk_login, sk_password
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
 
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
 
-        # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
-        request_message = {
-            "recipients": msisdn_list,
-            "callback_url": callback_url,
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber"
-            ],
-            "channel_options": {
-                "viber": {
-                    "text": text,
-                    "ttl": 60
-                }
-            }
-        }
+          req.basic_auth sk_login, sk_password
 
-        req.body = request_message.to_json
-        res = https.request(req)
 
-        output_params = {:code => 200,
-                         :result => "Sksk_2.sk_send_viber_list: Request processed",
-                         :body => {:request_message => request_message,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
+          # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
+          request_message = {
+              "recipients": msisdn_list,
+              "callback_url": callback_url,
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber"
+              ],
+              "channel_options": {
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :result => "Sksk_2.sk_send_viber_list: Request processed",
+                           :body => {:request_message => request_message,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_list: Something wrong with dabrabyt_text_field_parse"}
+        end
+
       end
       thr_sk_send_viber_list.join
     rescue
@@ -337,50 +344,57 @@ class Sksk_2
 
     begin
       thr_sk_send_viber_sms_list = Thread.new do
-        uri = URI(sk_url_broadcast)
-        #8 - client id
 
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text)
 
-        req.basic_auth sk_login, sk_password
+        if viber_mess_ans[:code] == 200
 
+          uri = URI(sk_url_broadcast)
+          #8 - client id
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
 
-        # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
-        request_message = {
-            "recipients": msisdn_list,
-            "callback_url": callback_url,
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber",
-                "sms"
-            ],
-            "channel_options": {
-                "sms": {
-                    "alpha_name": alphaname,
-                    "text": sms_text,
-                    "ttl": 60
-                },
-                "viber": {
-                    "text": viber_text,
-                    "ttl": 60
-                }
-            }
-        }
+          req.basic_auth sk_login, sk_password
 
-        req.body = request_message.to_json
-        res = https.request(req)
 
-        output_params = {:code => 200,
-                         :result => "Sksk_2.sk_send_viber_sms_list: Request processed",
-                         :body => {:request_message => request_message,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
+          request_message = {
+              "recipients": msisdn_list,
+              "callback_url": callback_url,
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber",
+                  "sms"
+              ],
+              "channel_options": {
+                  "sms": {
+                      "alpha_name": alphaname,
+                      "text": sms_text,
+                      "ttl": 60
+                  },
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :result => "Sksk_2.sk_send_viber_sms_list: Request processed",
+                           :body => {:request_message => request_message,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_list: Something wrong with dabrabyt_text_field_parse"}
+        end
+
       end
 
       thr_sk_send_viber_sms_list.join