imperituroard 1.1.11 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a8ed8a7d0e3e2896f7c67a7d63911c82e4c263
-  data.tar.gz: df3d6c2b96ac564a4feee8e9df5ac6c884b46187
+  metadata.gz: 015a5d3136b3e47eab433636dd7b9e0fc4b70fdb
+  data.tar.gz: 90d1189ffd4fdcb5a2458dda0752d5e0b10342c7
 SHA512:
-  metadata.gz: 65ae8bf70ab9db28066ac1b566612d975ec165b4fa34b2fb58fb3bb7ec50defe7c5192fa0d88ff3a89f3d5d7022be8a81c0965e2638a2ffb77810a13c9759e57
-  data.tar.gz: 85e98458692adc97a666e40c7b26287f9e1985011d3d81acf57a8f5fb7ce4df19c2430727d85cf78bdd1f450b90f43506f56e42124c87353455ea13c7ddedca9
+  metadata.gz: e55cf9eafb144b4426c61ef65f72d715b8240195af65b173ec09d350a6dead6bff75a9487d8e519ff2ed7dd68047ebffa91f29c54595c37cf03cdd9e7be6a995
+  data.tar.gz: 6df5079662a650f243107f6bc4a22da04054097f4211c514833c349ace9d4312cec8c2c9df9b3f13f7b3f76f03c61ecdf4e074c81e349361a44cef246a32f233

data/lib/imperituroard.rb

@@ -322,7 +322,7 @@ class Mhub_2
     @internal_func = InternalFunc.new
     @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id, log_level)
     @internal_func = InternalFunc.new
-    @dabrab_connecter = Dabrab.new
+    @dabrab_connecter = Dabrab.new(log_level)
     @static_callback = static_callback
     @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id, log_level)
     @mhub_connector = MhubFunctions_2.new(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password, sms_alphaname, log_level)
@@ -341,12 +341,12 @@ class Mhub_2
     mhub_connector.get_send_message_2(params, ip_src, ip_real, ip_vip)
   end
 
-  def get_send_message_mass(params, ip_src, ip_real, ip_vip, slice_number=100, time_pause_minutes=5)
-    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
+  def get_send_message_mass(params, ip_src, ip_real, ip_vip, slice_number=100, time_pause_minutes=5, viberttl=60, params_manual_set=0, smsttl=60)
+    mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes, viberttl, params_manual_set, smsttl)
   end
 
-  def recieve_delivery_report(params, ip_src, ip_real, ip_vip)
-    mhub_connector.rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
+  def recieve_delivery_report(params, ip_src, ip_real, ip_vip, crm_slice_num)
+    mhub_connector.rec_deliv_report_2(params, ip_src, ip_real, ip_vip, crm_slice_num)
   end
 
 end

data/lib/imperituroard/projects/mhub.rb

@@ -35,7 +35,7 @@ class MhubFunctions_2
     @internal_func = InternalFunc.new
     @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id, log_level)
     @internal_func = InternalFunc.new
-    @dabrab_connecter = Dabrab.new
+    @dabrab_connecter = Dabrab.new(log_level)
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
     @static_callback = static_callback
     @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id, log_level)
@@ -129,7 +129,16 @@ class MhubFunctions_2
 
 
   #for bank dabrabyt for massive nums
-  def get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
+  def get_send_message_mass_2(params,
+                              ip_src,
+                              ip_real,
+                              ip_vip,
+                              slice_number,
+                              time_pause_minutes,
+                              viberttl,
+                              params_manual_set,
+                              smsttl
+  )
 
     input_params = {:params => params}
     output_params = {}
@@ -148,12 +157,29 @@ class MhubFunctions_2
 
           hub_resp = {}
 
-          if null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname, time_pause_minutes)
-          elsif !null_statement.include?(params["viber"]) && null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"], time_pause_minutes)
-          elsif !null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
-            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname, time_pause_minutes)
+
+          viber_param = params["viber"]
+          sms_param = params["sms"]
+
+          if params_manual_set != 0
+            begin
+              if params_manual_set[:viber] == 0
+                viber_param = nil
+              end
+              if params_manual_set[:sms] == 0
+                sms_param = nil
+              end
+            rescue
+              nil
+            end
+          end
+
+          if null_statement.include?(viber_param) && !null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_sms_list(part_list, static_callback, params["sms"]["text"], sms_alphaname, time_pause_minutes, smsttl)
+          elsif !null_statement.include?(viber_param) && null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_viber_list(part_list, static_callback, params["viber"]["text"], time_pause_minutes, viberttl)
+          elsif !null_statement.include?(viber_param) && !null_statement.include?(sms_param)
+            hub_resp = mhub_connector.sk_send_viber_sms_list(part_list, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname, time_pause_minutes, viberttl, smsttl)
           else
             output_params = {"code": 502, "result": "Invalid input data st2", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
           end
@@ -183,14 +209,14 @@ class MhubFunctions_2
 
 
   #for bank dabrabyt
-  def rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
+  def rec_deliv_report_2(params, ip_src, ip_real, ip_vip, crm_slice_num=2)
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}
     hub_resp = {}
 
     begin
       mes_report = dabrab_connecter.delivery_report_transform(params)[:body][:report_to_recip]
-      result = crm_connector.crm_status_2(mes_report)
+      result = crm_connector.crm_status_2(mes_report, crm_slice_num)
       if result[:body][:res_body]["GetReportsResult"]==""
         output_params = {"code": 200, "result": "Data processed", "body": {"answer": {"code": 200, "status": "Success"}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
       else

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

@@ -14,7 +14,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
+    @dabrab_add_func = Dabrab.new(log_level)
   end
 
 
@@ -148,7 +148,7 @@ class Sksk_2
     output_params
   end
 
-  def sk_send_viber_sms_one(msisdn, callback_url, sms_text, viber_txt, alphaname)
+  def sk_send_viber_sms_one(msisdn, callback_url, sms_text, viber_txt, alphaname, smsttl=600)
 
     input_params = {:msisdn => msisdn, :callback_url => callback_url, :sms_text => sms_text, :viber_txt => viber_txt, :alphaname => alphaname}
     output_params = {}
@@ -188,7 +188,7 @@ class Sksk_2
                   "sms": {
                       "text": sms_text,
                       "alpha_name": alphaname,
-                      "ttl": 600
+                      "ttl": smsttl
                   },
                   "viber": viber_mess_ans[:body][:to_sk_format]
               }
@@ -220,7 +220,7 @@ class Sksk_2
   end
 
 
-  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname, time_pause_minutes=1)
+  def sk_send_sms_list(msisdn_list, callback_url, text, alphaname, time_pause_minutes=1, smsttl)
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text, :alphaname => alphaname}
     output_params = {}
@@ -256,7 +256,7 @@ class Sksk_2
                 "sms": {
                     "alpha_name": alphaname,
                     "text": text,
-                    "ttl": 60
+                    "ttl": smsttl
                 }
             }
         }
@@ -282,7 +282,10 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_list(msisdn_list, callback_url, text, time_pause_minutes)
+  def sk_send_viber_list(msisdn_list, callback_url, text, time_pause_minutes, viberttl)
+
+    internal_func.printer_texter({:input => "Fun started", :output => {}, :procedure => "Sksk_2.sk_send_viber_list"}, log_level)
+
 
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :text => text}
     output_params = {}
@@ -292,7 +295,7 @@ class Sksk_2
 
       thr_sk_send_viber_list = Thread.new do
 
-        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text, viberttl)
 
         if viber_mess_ans[:code] == 200
           uri = URI(sk_url_broadcast)
@@ -346,7 +349,7 @@ class Sksk_2
   end
 
 
-  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname, time_pause_minutes)
+  def sk_send_viber_sms_list(msisdn_list, callback_url, sms_text, viber_text, alphaname, time_pause_minutes, viberttl, smsttl)
     input_params = {:msisdn_list => msisdn_list, :callback_url => callback_url, :sms_text => sms_text, :viber_text => viber_text, :alphaname => alphaname}
     output_params = {}
     request_message = {}
@@ -355,7 +358,7 @@ class Sksk_2
       thr_sk_send_viber_sms_list = Thread.new do
 
 
-        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text)
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text, viberttl)
 
         if viber_mess_ans[:code] == 200
 
@@ -388,7 +391,7 @@ class Sksk_2
                   "sms": {
                       "alpha_name": alphaname,
                       "text": sms_text,
-                      "ttl": 60
+                      "ttl": smsttl
                   },
                   "viber": viber_mess_ans[:body][:to_sk_format]
               }

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

@@ -14,7 +14,7 @@ class Crm_2
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
   end
 
-  def crm_status_2(crm_payload)
+  def crm_status_2(crm_payload, slice_num)
 
     input_params = {:crm_payload => crm_payload}
     output_params = {}
@@ -22,29 +22,50 @@ class Crm_2
 
     begin
 
+      internal_func.printer_texter({:input => "Start process", :procedure => "Crm_2.crm_status_2"}, log_level)
+
+
       thr_crm_status_2 = Thread.new do
-        uri = URI(crm_callback_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'})
+        partnnn = crm_payload[:results].each_slice(slice_num).to_a
+
+        partnnn.each { |one_part_reports|
+
+          crm_payload2 = {:results => one_part_reports }
+
+
+          uri = URI(crm_callback_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 crm_login, crm_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          internal_func.printer_texter({:input => {:crm_payload2 => crm_payload2}, :procedure => "Crm_2.crm_status_2"}, log_level)
+
+
+          req.body = crm_payload2.to_json
 
-        req.basic_auth crm_login, crm_password
+          internal_func.printer_texter({:input => "Before send request to crm", :procedure => "Crm_2.crm_status_2"}, log_level)
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+          res = https.request(req)
 
-        req.body = crm_payload.to_json
-        res = https.request(req)
+          internal_func.printer_texter({:input => "After send request to crm", :procedure => "Crm_2.crm_status_2"}, log_level)
+          internal_func.printer_texter({:input => {:res_code => res.code, :res_body => res.body.to_s}, :procedure => "Crm_2.crm_status_2"}, log_level)
 
+        }
 
         output_params = {:code => 200,
                          :result => "Crm_2.crm_status_2: Request processed",
                          :body => {:request_message => crm_payload,
-                                   :res_code => res.code,
-                                   :res_body => JSON.parse(res.body.to_s)}}
+                                   :res_code => "200",
+                                   :res_body => ""}}
         #p res.body
       end
       thr_crm_status_2.join

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

@@ -1,6 +1,15 @@
+require 'imperituroard/projects/iot/internal_functions'
+
 class Dabrab
 
-  def dabrabyt_text_field_parse(stri)
+  attr_accessor :internal_func, :log_level
+
+  def initialize(log_level)
+    @internal_func = InternalFunc.new
+    @log_level = log_level
+  end
+
+  def dabrabyt_text_field_parse(stri, viberttl)
     button_url = ""
     image = ""
     button_text = ""
@@ -92,13 +101,13 @@ class Dabrab
 
       case scheme
         when 0
-          sk_format = {"text": text, "ttl": 60}
+          sk_format = {"text": text, "ttl": viberttl}
         when 1
-          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
+          sk_format = {"text": text, "ttl": viberttl, "caption": button_text, "action": button_url}
         when 2
-          sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
+          sk_format = {"text": text, "ttl": viberttl, "caption": button_text, "action": button_url, "img": image}
         when 3
-          sk_format = {"img": image, "ttl": 60}
+          sk_format = {"img": image, "ttl": viberttl}
         else
           nil
       end
@@ -191,72 +200,77 @@ class Dabrab
 
 
   def delivery_report_transform(hub_report_in)
+
+    internal_func.printer_texter({:input => "Start delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
 #{"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"
-    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
-            },
-            23033 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by Viber",
-                      :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
-            },
-            35015 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "SMS Message TTL EXPIRED",
-                      :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent", :error_permanent => false
-            }, #message SMS expired
-            36463 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "Viber Message TTL EXPIRED",
-                      :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent.", :error_permanent => false
-            }, #message Viber expired
-            36010 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Subscriber not exists",
-                      :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
-            }, #SMS subscriber not exists
-            36131 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Unknown subscriber",
-                      :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
-            }, #SMS unknown subscriber
-            36505 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "Viber. Subscriber not exists",
-                      :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
-            } #Viber subscriber not exists
-        }
-
-    if hub_report_in.key?("msg_status")
+    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
+        },
+        23033 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by Viber",
+                  :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
+        },
+        35015 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "SMS Message TTL EXPIRED",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent", :error_permanent => false
+        }, #message SMS expired
+        36463 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "Viber Message TTL EXPIRED",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent.", :error_permanent => false
+        }, #message Viber expired
+        36010 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Subscriber not exists",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        }, #SMS subscriber not exists
+        36131 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Unknown subscriber",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        }, #SMS unknown subscriber
+        36505 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "Viber. Subscriber not exists",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        } #Viber subscriber not exists
+    }
+
+    if hub_report_in.key?("msg_status") && !hub_report_in.key?("_json") && !hub_report_in["report"].key?("_json")
+      internal_func.printer_texter({:input => "One message delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
       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]] != ""
+      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],
+                                 "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]
+                                     "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]
+                                     "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["results"].app
 
         report_to_recip.push({
 
                                  "bulkId": "00000000-0000-0000-0000-000000000000",
-                                 "messageId": hub_report[:report][:message_id],
-                                 "to": hub_report[:report][:number],
+                                 "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": {
@@ -282,40 +296,44 @@ class Dabrab
 
       hub_report_in["_json"].each {|hub_report2|
 
-        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]] != ""
+        internal_func.printer_texter({:input => "Start Mass message delivery_report_transform", :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
+        internal_func.printer_texter({:input => {:hub_report2 => hub_report2}, :procedure => "Dabrab.delivery_report_transform"}, log_level)
+
+
+        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],
+                                   "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]
+                                       "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]
+                                       "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["results"].app
 
           report_to_recip.push({
 
                                    "bulkId": "00000000-0000-0000-0000-000000000000",
-                                   "messageId": hub_report2[:message_id],
-                                   "to": hub_report2[:number],
+                                   "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": {
@@ -337,7 +355,6 @@ class Dabrab
         end
 
       }
-
     end
 
     {:code => 200, :result => "Data processed", :body => {:report_to_recip => {"results": report_to_recip}}}

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.11"
+  VERSION = "1.1.17"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.17
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler