dabrab_proced.rb in imperituroard-1.1.10

- old
+ new

@@ -28,13 +28,13 @@
       button_url_dat = stri.scan(button_url1)
       button_text_dat = stri.scan(button_text1)
       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 != ""
           button_url = button_url_dat[0][1]
           text = text.gsub(button_url_dat[0][0], "")
@@ -88,23 +88,24 @@
         scheme = 1
       else
         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
       output_answer ={:code => 507, :result => "dabrabyt_text_field_parse: Unknown error"}
     end
@@ -123,15 +124,16 @@
         converted_msisdn_list.append({
                                          "phone_number": g["to"]["phoneNumber"].to_i
                                          #"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
 
 
@@ -153,12 +155,12 @@
                          "messageId": "2250be2d4219-3af1-78856-aabe-1362af1edfd2"
                      }
         ]
     }
 
-    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 = {}
       if a["processed"] == true && a["accepted"] == true
         status1 = {"to": {"phoneNumber": a["phone_number"]},
@@ -179,20 +181,20 @@
       end
 
       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)
 #{"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"
     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",