imperituroard 1.1.8 → 1.1.13

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb

@@ -30,9 +30,9 @@ class Dabrab
       image_dat = stri.scan(regexp_image1)
 
 
-      p button_url_dat
-      p button_text_dat
-      p image_dat
+      #p button_url_dat
+      #p button_text_dat
+      #p image_dat
 
       begin
         if button_url_dat != [] && button_url_dat != nil && button_url_dat != ""
@@ -90,19 +90,20 @@ class Dabrab
         scheme = 0
       end
 
-      if scheme==0
-        sk_format = {"text": text, "ttl": 60}
-      elsif scheme==1
-        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
-      elsif scheme==2
-        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
-      elsif scheme==3
-        sk_format = {"img": image, "ttl": 60}
-      else
-        nil
+      case scheme
+        when 0
+          sk_format = {"text": text, "ttl": 60}
+        when 1
+          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
+        when 2
+          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
+        when 3
+          sk_format = {"img": image, "ttl": 60}
+        else
+          nil
       end
 
-      p sk_format
+      #p sk_format
 
       output_answer ={:code => 200, :result => "Success", :body => {:to_sk_format => sk_format, :button_url => button_url, :image => image, :button_text => button_text, :text => text, :scheme => scheme, :scheme_dic => scheme_dic[scheme]}}
     rescue
@@ -125,11 +126,12 @@ class Dabrab
                                          #"extra_id": extra_id
                                      })
       rescue
-        p "failed: #{g.to_s}"
+        nil
+        #p "failed: #{g.to_s}"
       end
 
     end
-    p converted_msisdn_list
+    #p converted_msisdn_list
     converted_msisdn_list
 
   end
@@ -155,8 +157,8 @@ class Dabrab
         ]
     }
 
-    p "send_responce_formatter(hub_answer)"
-    p hub_answer
+    #p "send_responce_formatter(hub_answer)"
+    #p hub_answer
 
     for a in hub_answer[:body][:res_body]["messages"]
       status1 = {}
@@ -181,17 +183,20 @@ class Dabrab
       messages_sect.append(status1)
     end
 
-    p messages_sect
+    #p messages_sect
 
     mess_to_recip = {"bulkId": "00000000-0000-0000-0000-000000000000", "messages": messages_sect}
     {:code => 200, :result => "Data processed", :body => {:mess_to_recip => mess_to_recip}}
   end
 
 
-  def delivery_report_transform(hub_report)
+  def delivery_report_transform(hub_report_in)
+
 #{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber", "controller"=>"reports", "action"=>"delivery", "report"=>{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber"}}
-    p hub_report
-    p "hub_report"
+#p hub_report
+#p "hub_report"
+    report_to_recip = []
+
     data_for_status = {
         23011 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by SMS",
                   :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
@@ -216,66 +221,125 @@ class Dabrab
         } #Viber subscriber not exists
     }
 
-    if data_for_status[hub_report[:msg_status]] != nil && data_for_status[hub_report[:msg_status]] != {} && data_for_status[hub_report[:msg_status]] != [] && data_for_status[hub_report[:msg_status]] != ""
-      report_to_recip = {
-          "results": [
-              {
-
-                  "bulkId": "00000000-0000-0000-0000-000000000000",
-                  "messageId": hub_report[:report][:message_id],
-                  "to": hub_report[:report][:number],
-                  #    "sentAt": "2020-05-05T20:00:00.000+0000",
-                  #    "doneAt": "2020-05-05T20:00:00.000+0000",
-                  "status": {
-                      "groupId": data_for_status[hub_report[:msg_status]][:status_grid],
-                      "groupName": data_for_status[hub_report[:msg_status]][:status_grname],
-                      "id": data_for_status[hub_report[:msg_status]][:status_id],
-                      "name": data_for_status[hub_report[:msg_status]][:status_name],
-                      "description": data_for_status[hub_report[:msg_status]][:status_descr]
-                  },
-                  "error": {
-                      "groupId": data_for_status[hub_report[:msg_status]][:error_grid],
-                      "groupName": data_for_status[hub_report[:msg_status]][:error_grname],
-                      "id": data_for_status[hub_report[:msg_status]][:error_id],
-                      "name": data_for_status[hub_report[:msg_status]][:error_name],
-                      "description": data_for_status[hub_report[:msg_status]][:error_descr],
-                      "permanent": data_for_status[hub_report[:msg_status]][:error_permanent]
-                  }
-              }
-          ]
-      }
+    if hub_report_in.key?("msg_status")
+      hub_report = hub_report_in
+
+      if data_for_status[hub_report["msg_status"]] != nil && data_for_status[hub_report["msg_status"]] != {} && data_for_status[hub_report["msg_status"]] != [] && data_for_status[hub_report["msg_status"]] != ""
+
+        report_to_recip.push({
+
+                                 "bulkId": "00000000-0000-0000-0000-000000000000",
+                                 "messageId": hub_report["report"]["message_id"],
+                                 "to": hub_report["report"]["number"],
+                                 #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                 #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                 "status": {
+                                     "groupId": data_for_status[hub_report["msg_status"]][:status_grid],
+                                     "groupName": data_for_status[hub_report["msg_status"]][:status_grname],
+                                     "id": data_for_status[hub_report["msg_status"]][:status_id],
+                                     "name": data_for_status[hub_report["msg_status"]][:status_name],
+                                     "description": data_for_status[hub_report["msg_status"]][:status_descr]
+                                 },
+                                 "error": {
+                                     "groupId": data_for_status[hub_report["msg_status"]][:error_grid],
+                                     "groupName": data_for_status[hub_report["msg_status"]][:error_grname],
+                                     "id": data_for_status[hub_report["msg_status"]][:error_id],
+                                     "name": data_for_status[hub_report["msg_status"]][:error_name],
+                                     "description": data_for_status[hub_report["msg_status"]][:error_descr],
+                                     "permanent": data_for_status[hub_report["msg_status"]][:error_permanent]
+                                 }
+                             })
+
+
+      else
+
+        report_to_recip.push({
+
+                                 "bulkId": "00000000-0000-0000-0000-000000000000",
+                                 "messageId": hub_report["report"]["message_id"],
+                                 "to": hub_report["report"]["number"],
+                                 #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                 #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                 "status": {
+                                     "groupId": 2,
+                                     "groupName": "UNDELIVERABLE_NOT_DELIVERED",
+                                     "id": 9,
+                                     "name": "UNDELIVERED",
+                                     "description": "Unknown error"
+                                 },
+                                 "error": {
+                                     "groupId": 1,
+                                     "groupName": "HANDSET_ERRORS",
+                                     "id": 32,
+                                     "name": "EC_SM_DELIVERY_FAILURE",
+                                     "description": "Unknown error",
+                                     "permanent": false
+                                 }
+                             })
+
+      end
 
     else
 
-      report_to_recip = {
-          "results": [
-              {
-
-                  "bulkId": "00000000-0000-0000-0000-000000000000",
-                  "messageId": hub_report[:report][:message_id],
-                  "to": hub_report[:report][:number],
-                  #    "sentAt": "2020-05-05T20:00:00.000+0000",
-                  #    "doneAt": "2020-05-05T20:00:00.000+0000",
-                  "status": {
-                      "groupId": 2,
-                      "groupName": "UNDELIVERABLE_NOT_DELIVERED",
-                      "id": 9,
-                      "name": "UNDELIVERED",
-                      "description": "Unknown error"
-                  },
-                  "error": {
-                      "groupId": 1,
-                      "groupName": "HANDSET_ERRORS",
-                      "id": 32,
-                      "name": "EC_SM_DELIVERY_FAILURE",
-                      "description": "Unknown error",
-                      "permanent": false
-                  }
-              }
-          ]
+      hub_report_in["_json"].each {|hub_report2|
+
+        if data_for_status[hub_report2["msg_status"]] != nil && data_for_status[hub_report2["msg_status"]] != {} && data_for_status[hub_report2["msg_status"]] != [] && data_for_status[hub_report2["msg_status"]] != ""
+          report_to_recip.push({
+
+                                   "bulkId": "00000000-0000-0000-0000-000000000000",
+                                   "messageId": hub_report2["message_id"],
+                                   "to": hub_report2["number"],
+                                   #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                   #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                   "status": {
+                                       "groupId": data_for_status[hub_report2["msg_status"]][:status_grid],
+                                       "groupName": data_for_status[hub_report2["msg_status"]][:status_grname],
+                                       "id": data_for_status[hub_report2["msg_status"]][:status_id],
+                                       "name": data_for_status[hub_report2["msg_status"]][:status_name],
+                                       "description": data_for_status[hub_report2["msg_status"]][:status_descr]
+                                   },
+                                   "error": {
+                                       "groupId": data_for_status[hub_report2["msg_status"]][:error_grid],
+                                       "groupName": data_for_status[hub_report2["msg_status"]][:error_grname],
+                                       "id": data_for_status[hub_report2["msg_status"]][:error_id],
+                                       "name": data_for_status[hub_report2["msg_status"]][:error_name],
+                                       "description": data_for_status[hub_report2["msg_status"]][:error_descr],
+                                       "permanent": data_for_status[hub_report2["msg_status"]][:error_permanent]
+                                   }
+                               })
+
+
+        else
+
+          report_to_recip.push({
+
+                                   "bulkId": "00000000-0000-0000-0000-000000000000",
+                                   "messageId": hub_report2["message_id"],
+                                   "to": hub_report2["number"],
+                                   #    "sentAt": "2020-05-05T20:00:00.000+0000",
+                                   #    "doneAt": "2020-05-05T20:00:00.000+0000",
+                                   "status": {
+                                       "groupId": 2,
+                                       "groupName": "UNDELIVERABLE_NOT_DELIVERED",
+                                       "id": 9,
+                                       "name": "UNDELIVERED",
+                                       "description": "Unknown error"
+                                   },
+                                   "error": {
+                                       "groupId": 1,
+                                       "groupName": "HANDSET_ERRORS",
+                                       "id": 32,
+                                       "name": "EC_SM_DELIVERY_FAILURE",
+                                       "description": "Unknown error",
+                                       "permanent": false
+                                   }
+                               })
+        end
+
       }
     end
-    {:code => 200, :result => "Data processed", :body => {:report_to_recip => report_to_recip}}
+
+    {:code => 200, :result => "Data processed", :body => {:report_to_recip => {"results": report_to_recip}}}
   end
 
 end

data/lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb

@@ -0,0 +1,69 @@
+require 'net/https'
+
+require 'json'
+
+require 'uri'
+require 'net/http'
+require 'rubygems'
+require 'nokogiri'
+require 'rails'
+
+require 'imperituroard/projects/iot/internal_functions'
+
+
+class Gms_2
+
+  attr_accessor :gms_login, :gms_password, :telegram_connector, :internal_func
+
+  def initialize(gms_login, gms_password, telegram_api_url, telegram_chat_id)
+    @gms_login = gms_login
+    @gms_password = gms_password
+    @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+  end
+
+  def get_advanced_by_external(external_id)
+
+    input_params = {:external_id => external_id}
+    output_params = {}
+    thr1_get_advanced_by_external = Thread.new do
+      begin
+        uri = URI("https://dr-v2.hyber.im/2160/api/dr/external/" + external_id + "/advanced")
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        req = Net::HTTP::Get.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        req.basic_auth gms_login, gms_password
+        req["Content-Type"] = "application/json"
+        res = https.request(req)
+
+        p res.code
+        p res.body
+        if res.code == "200"
+          output_params = {:code => 200,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+        else
+          output_params = {:code => res.code.to_i,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => res.body.to_s}}
+        end
+      rescue
+        output_params = {:code => 500, :result => "Gms_2.get_advanced_by_external: Something wrong", :body => {:request_message => input_params}}
+      end
+    end
+    thr1_get_advanced_by_external.join
+
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Gms_2.get_advanced_by_external"}, "debug")
+    output_params
+
+  end
+
+
+
+
+end

data/lib/imperituroard/projects/wttx/updatepostcps.rb

@@ -45,25 +45,25 @@ class StateWTTX
     http = Net::HTTP.new(uri.host, uri.port)
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     p content = response.body
-    p resultcode = response.to_s.include?("OK")
+    p result_code = response.to_s.include?("OK")
     #Rails.logger = Logger.new(STDOUT)
     #logger.info "WTTX service getrestCPS result code: #{response.to_s}"
     #logger.info "WTTX service getrestCPS soap body: #{content.to_s}"
 
 
 
-    if resultcode == false
+    if !result_code
       "false"
     else
-      regimsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
-      regimei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
+      reg_imsi = /<field code=\"imsi\" value=\"([0-9]{10,15})\"/
+      reg_imei = /<field code=\"imei\" value=\"([0-9]{10,17})\"/
 
-      m1 = regimsi.match(content)
-      m2 = regimei.match(content)
+      m1 = reg_imsi.match(content)
+      m2 = reg_imei.match(content)
       imsi = m1[1]
       imei = m2[1]
 
-      res = resultcode.to_s + " " + imsi + " " + imei
+      res = result_code.to_s + " " + imsi + " " + imei
       p res
       res
     end

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.8"
+  VERSION = "1.1.13"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.13
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,7 +187,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/runConfigurations/autovpn.xml"
+- ".idea/runConfigurations/dabrab_proced.xml"
 - ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
+- ".idea/runConfigurations/test9_dab.xml"
 - ".idea/runConfigurations/version.xml"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -207,6 +209,9 @@ files:
 - lib/imperituroard/platforms/cps/cps_multiple_thread_req.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
+- lib/imperituroard/platforms/iwag/get_iwag_data.rb
+- lib/imperituroard/platforms/iwag/iwag_database_worker.rb
+- lib/imperituroard/platforms/iwag/iwag_telnet_connector.rb
 - lib/imperituroard/platforms/public/telegram.rb
 - lib/imperituroard/platforms/staros/get_data_ssh.rb
 - lib/imperituroard/platforms/staros/staros_automation.rb
@@ -222,10 +227,12 @@ files:
 - lib/imperituroard/projects/iot/internal_functions.rb
 - lib/imperituroard/projects/iot/mongoconnector.rb
 - lib/imperituroard/projects/mhub.rb
+- lib/imperituroard/projects/mhub/gms.rb
 - lib/imperituroard/projects/mhub/infobip.rb
 - lib/imperituroard/projects/mhub/sk.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb
+- lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb
 - lib/imperituroard/projects/ukaz60.rb
 - lib/imperituroard/projects/ukaz60/belgim.rb
 - lib/imperituroard/projects/ukaz60/dns.rb
@@ -245,7 +252,7 @@ metadata:
   homepage_uri: https://rubygems.org/
   source_code_uri: https://github.com/imperituroard/imperituroard
   changelog_uri: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,9 +267,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14
-signing_key: 
+signing_key:
 specification_version: 4
 summary: imperituroard gem
 test_files: []