imperituroard 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18b3b415b4abd99d7278bc85a36e106b4c7cd06
-  data.tar.gz: 1836cbde25b99638c57951d554e162177593bc6e
+  metadata.gz: 43b90b49ef287bd5255675f8687a9fb6cc036f85
+  data.tar.gz: 3e97f122233aa15acaaf07a6bd25b1bc98af1d69
 SHA512:
-  metadata.gz: 5d295fb8baa99e0c2a69009432af9bd7ce079826d335e1dbec712eaa997d27b86ac8bfbf5d9d625a78bc5ac5b4bc83a9b866076039dba45b9791f1a3a739e411
-  data.tar.gz: 6f849cca851ed66cf4fe2c63bc3fd724066f086aef44a6fd744868b3431dccbc78ee67542eac4ced9189f23fe750b76bf120dd8f558d97a7cd83777070031a70
+  metadata.gz: 17e89a0109c1f6d8821a39e7e1a8572cf0d8fe3c6795120d3000a2242f6a9e1987bfa6b920d2a8b7b72bd39d74e8d08ec85ca1a2098844231ccaf7f1d3b6e51c
+  data.tar.gz: bacdd4a4e1f59f9530daede8cc142672d044fc16a04f8ed5d3a329e4c25007911f39b8b90ee828710743b17da5785473a3cec9f9bd3868d65a0a65c9a1e57152

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)
@@ -345,8 +345,8 @@ class Mhub_2
     mhub_connector.get_send_message_mass_2(params, ip_src, ip_real, ip_vip, slice_number, time_pause_minutes)
   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)
@@ -183,14 +183,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
 
 

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 => JSON.parse(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,5 +1,14 @@
+require 'imperituroard/projects/iot/internal_functions'
+
 class Dabrab
 
+  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)
     button_url = ""
     image = ""
@@ -192,6 +201,8 @@ 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"
@@ -221,7 +232,9 @@ class Dabrab
         } #Viber subscriber not exists
     }
 
-    if hub_report_in.key?("msg_status")
+    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"]] != ""
@@ -283,6 +296,11 @@ class Dabrab
 
       hub_report_in["_json"].each {|hub_report2|
 
+        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({
 

data/lib/imperituroard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Dzmitry Buynovskiy