imperituroard 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82d66d85db1bd66d2a98362544e98de744cf142
-  data.tar.gz: 71a88db5237cc41dbc305efcfb3de6ea5158379e
+  metadata.gz: aed6187f630376b03b976303e1fa4f87800d036e
+  data.tar.gz: 94fad4b56fd4a5926d3b6433ea7da900cd4d1e20
 SHA512:
-  metadata.gz: 7a30826bee6fcb2d3bf180bda82fa41893138b471d28f611065874f1d05ebb13bc3246f613d1b292a50aa44501f1301e6606b0f700aba0f1c195fa1f5362ceb7
-  data.tar.gz: 85e5c0a75b626cd7eaaeda049a6ca3c2209b58b120b3930bfebaa2f74c2b4fb6300ceb6d23b10465a0dcb7088e3d302ad62b8ee56d08a66628ca4c679601d67b
+  metadata.gz: e445408da82e71836bb61a94c0ab26cb166e904b48b8aa03f23c0395803cfa3a2ce5026a89364bdfc88b1561c8148815465df8dfcd6313b60fe0e950baf494c8
+  data.tar.gz: 740a6cbee54ce5949bf0059d3847a86bb66486f43d90b8e766ddf74b362e56f70e44784b71f2bc1643b32e27e11822f33b42c3145493a312948ad61e230c0370

data/imperituroard.gemspec

@@ -51,6 +51,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "simpleidn", "0.1.1"
   spec.add_dependency "net-scp", "3.0.0"
 
-
-
 end

data/lib/imperituroard/projects/iot.rb

@@ -86,6 +86,9 @@ class IotFunctions_2
 
             for ss in list_checked[:body][:exists]
               not_processed_list.append({:imei => ss, :error => "Device exists in database"})
+              p ss
+              p "ss"
+              p list_checked
             end
 
             for jj in list_checked[:body][:not_exists]
@@ -686,6 +689,7 @@ class IotFunctions_2
 
 
   #7 procedure for subscriber autorization
+  # save data to mongodb
   def autorize_subscriber_2(login, password)
     input_json = {:login => login, :password => password}
     resp_out = {}
@@ -717,6 +721,7 @@ class IotFunctions_2
   end
 
 
+  #8 get available profiles by login
   def get_available_prof_2(login)
 
     input_params = {:login => login}
@@ -767,7 +772,7 @@ class IotFunctions_2
     resp_out
   end
 
-
+  #9 get available device types by login
   def get_available_types_2(login)
 
     input_params = {:login => login}
@@ -824,7 +829,64 @@ class IotFunctions_2
   end
 
 
-  #10 get info for device type
+  #10 get available device types by login and profile. procedure update
+  def get_available_types2_2(login, profile)
+
+    input_params = {:login => login}
+    resp_out = {}
+
+    begin
+      data_processed = []
+      data_soapgw = []
+      login_info = mongo_client.get_login_inf2_select(login)
+      if login_info[:code]==200
+
+        permit_profiles = login_info[:body]["permit_profiles"]
+        permit_types = login_info[:body]["permit_types"]
+
+        data_from_mongo = mongo_client.get_type_list_by_id(permit_types)
+
+        for ff in data_from_mongo
+          data_processed.append({:type_id => ff["type_id"],
+                                 :description => ff["description"],
+                                 :note => ff["note"],
+                                 :form => ff["form"],
+                                 :ManufacturerID => ff["ManufacturerID"],
+                                 :ManufacturerNAME => ff["ManufacturerNAME"],
+                                 :device_type => ff["device_type"],
+                                 :model => ff["model"],
+                                 :info => ff["info"]
+                                })
+          data_soapgw.append({:name => ff["model"], :form => ff["form"], :description => ff["description"], :type_id => ff["type_id"]})
+        end
+
+        tosoapgw = {:code => 200,
+                    :result => "Request completed successfully",
+                    :types => data_soapgw
+        }
+
+        resp_out = {:code => 200, :result => "Request completed successfully", :body => {:data => data_processed, :tosoapgw => tosoapgw}}
+      else
+        tosoapgw = {:code => login_info[:code],
+                    :result => login_info[:result],
+                    :types => data_soapgw
+        }
+        resp_out = {:code => login_info[:code], :result => login_info[:result], :body => {:tosoapgw => tosoapgw}}
+      end
+
+    rescue
+      tosoapgw = {:code => 507,
+                  :result => "Unknown SDK error",
+                  :types => data_soapgw
+      }
+      resp_out = {:code => 507, :result => "Unknown SDK error", :body => {:tosoapgw => tosoapgw}}
+    end
+    mongo_client.audit_logger("get_available_types_2", remote_ip, input_params, resp_out, real_ip)
+    resp_out
+  end
+
+
+  #11 get info for device type
   def get_info_data_type_2(type)
 
     input_params = {:type => type}
@@ -854,7 +916,7 @@ class IotFunctions_2
   end
 
 
-  #11 get info for profile
+  #12 get info for profile
   def get_info_data_profile_2(profile)
 
     input_params = {:profile => profile}

data/lib/imperituroard/projects/mhub.rb

@@ -23,9 +23,10 @@ class MhubFunctions_2
                 :dabrab_connecter,
                 :static_callback,
                 :crm_connector,
-                :telegram_connector
+                :telegram_connector,
+                :sms_alphaname
 
-  def initialize(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)
+  def initialize(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)
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
@@ -36,6 +37,7 @@ class MhubFunctions_2
     @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)
+    @sms_alphaname = sms_alphaname
   end
 
 
@@ -91,13 +93,13 @@ class MhubFunctions_2
         msisdn2 = dabrab_connecter.num_formatter(params["destinations"], params["notifyUrl"].split(":")[2])
 
         if null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
-          hub_resp = mhub_connector.sk_send_sms_list(msisdn2, static_callback, params["sms"]["text"], "TEST")
+          hub_resp = mhub_connector.sk_send_sms_list(msisdn2, static_callback, params["sms"]["text"], sms_alphaname)
         elsif !null_statement.include?(params["viber"]) && null_statement.include?(params["sms"])
           hub_resp = mhub_connector.sk_send_viber_list(msisdn2, static_callback, params["viber"]["text"])
         elsif !null_statement.include?(params["viber"]) && !null_statement.include?(params["sms"])
           p "vibersms"
           p msisdn2
-          hub_resp = mhub_connector.sk_send_viber_sms_list(msisdn2, static_callback, params["sms"]["text"], params["viber"]["text"], "TEST")
+          hub_resp = mhub_connector.sk_send_viber_sms_list(msisdn2, static_callback, params["sms"]["text"], params["viber"]["text"], sms_alphaname)
         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

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/imperituroard.rb

@@ -272,7 +272,7 @@ class Mhub_2
                 :static_callback,
                 :crm_connector
 
-  def initialize(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)
+  def initialize(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)
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
@@ -280,13 +280,11 @@ class Mhub_2
     @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @internal_func = InternalFunc.new
     @dabrab_connecter = Dabrab.new
-
     @static_callback = static_callback
     @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
-    @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)
+    @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)
   end
 
-
   #{"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",
@@ -296,18 +294,14 @@ class Mhub_2
   # "notifyUrl"=>"https://bpmonline.bankdabrabyt.by:444/0/ServiceModel/ScGetReports.svc/GetReports",
   # "notifyContentType"=>"application/json"}}
 
-
   def get_send_message(params, ip_src, ip_real, ip_vip)
     mhub_connector.get_send_message_2(params, ip_src, ip_real, ip_vip)
   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)
   end
 
-
-
 end
 
 

metadata

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