imperituroard 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3be6181f0232b7cf9ffcbc83e64b250c193ba8
-  data.tar.gz: 1bec083ea1a987aa71a5387f01ee66d414c82fc2
+  metadata.gz: d07f8ba8173fac1753c044f8f0e6e06a6598e7b5
+  data.tar.gz: 3170f430dec13119ba8ba95de2224b54cdc35d1e
 SHA512:
-  metadata.gz: 3e2c3e4efb2ae8069803ddafaa4fcf55dda9b9cf6759444fe21ba829927d3c1067003df4a5c0ab51338e43cf2fb831035fee1c64a0b384869610078ad2c15842
-  data.tar.gz: 0b4e145d35a75cbc40f75fe84fb1d72b6ae3fd749ab8a47ad6ecc405c50fee1e2972b03a2f1ca1e270107a645a72f9bc47f10e18c1e97c8121214528fa72b5e5
+  metadata.gz: fbb564b3afc160a77cc9b8e9e0dffb2675b5a89cfc9e7042ca62348aa29cd0057428c35090066ab80db51dbe3b2ee466817fb9a5f882a2cc5fe4082a0bbac184
+  data.tar.gz: 7ac4309248422d5d326b1e9c5ad98d1595ec79bc6f3e51bb9ae31632225e465b7b4677d201f149c32004c72b897e7c182d61e143be863ec63d70c311d9e2a59f

data/.idea/runConfigurations/version.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="version" type="RubyRunConfigurationType" factoryName="Ruby">
+    <module name="imperituroard" />
+    <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/imperituroard" />
+    <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+    <envs />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/imperituroard/version.rb" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/lib/imperituroard.rb

@@ -168,6 +168,10 @@ class Iot
     iot_connector.add_device_to_prof_2(login, imei_list, real_ip, remote_ip)
   end
 
+  def add_device_to_profile2(request_f, real_ip, remote_ip)
+    iot_connector.add_device_to_prof2_2(request_f, real_ip, remote_ip)
+  end
+
 
   #!!2 Find device (only mongo datebase. IOT platform not need)
   # procedure for data selection from mongo database.
@@ -270,10 +274,19 @@ class Iot
     mongo_client.audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
   end
 
+
+  ####################################################################
+  #######technological procedures
+  ####################################################################
+  def delete_all_iot_device_in_db
+    iot_connector.delete_all_devices_in_database
+  end
+
   def test111
     iot_connector.test1278493
   end
 
+
 end
 
 

data/lib/imperituroard/projects/iot.rb

@@ -131,9 +131,174 @@ class IotFunctions_2
 
                 #########
 
+                if aaa.key?("type") && !aaa.key?("device_type")
+                  aaa["device_type"] = aaa["type"]
+                  aaa = internal_func.delete_key_hash(aaa, "type")
+                end
+
+                aaa = internal_func.hash_val_to_string(aaa)
 
                 if credentials[:code] == 200
 
+                  begin
+                    dev_name = aaa["imei"].to_s
+
+                    #get {"model"=>"BGT_PPMC", "ManufacturerID"=>"unknown", "ManufacturerNAME"=>"unknown", "device_type"=>"unknown"}
+                    #from database
+                    model_data = mongo_client.get_device_type_info_universal(aaa["device_type"])
+                    profile_data = mongo_client.get_profile_universal(aaa["profile"])
+                    p profile_data
+                    p model_data
+                    p "model_data"
+                    resss = hua_aceanconnect_connector.add_new_device_on_huawei(credentials[:body][:app_id],
+                                                                                credentials[:body][:secret],
+                                                                                aaa["imei"],
+                                                                                dev_name,
+                                                                                aaa["description"],
+                                                                                model_data[:body]["device_type"],
+                                                                                aaa["profile"],
+                                                                                model_data[:body]["ManufacturerID"],
+                                                                                model_data[:body]["ManufacturerNAME"],
+                                                                                model_data[:body]["model"]
+                    )
+                    if resss[:code]=="200"
+                      if resss[:body].key?("error_code") && resss[:body]["error_code"] != 200
+                        not_processed_list.append({:imei => aaa["imei"], :error => resss})
+                      else
+                        s1 = aaa
+                        s1[:huadata] = resss
+                        s1[:created] = DateTime.now
+                        s1["device_type"] = model_data[:body]["model"]
+                        s1["profile"] = profile_data["profile_id"]
+                        added_on_iot_platf.append(s1)
+                      end
+                    else
+                      not_processed_list.append({:imei => aaa["imei"], :error => resss})
+                    end
+                  rescue
+                    not_processed_list.append({:imei => aaa["imei"], :error => "Unknown error with insertion imei on IOT platform"})
+                  end
+                  #########end iot platform logic#######
+
+                else
+                  resss_err = {:code => 400, :result => "IOT platform credentials not found"}
+                  not_processed_list.append({:imei => aaa["imei"], :error => resss_err})
+                end
+
+              end
+
+              if added_on_iot_platf.length != 0
+                mongo_client.imei_insert_list(added_on_iot_platf)
+                resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
+              else
+                resp_out = {:code => 202, :result => "Empty list. Nothing for insertion", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
+              end
+            else
+              resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
+            end
+          rescue
+            resp_out = {:code => 505, :result => "Error with database communication"}
+          end
+        else
+          resp_out = {:code => 509, :result => "Input data invalid"}
+        end
+      end
+    rescue
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
+    end
+    thr1.join
+
+    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json, resp_out)
+    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip, {})
+    resp_out
+  end
+
+
+
+  def add_device_to_prof2_2(request_full, real_ip, remote_ip)
+
+    #{"autorization"=>{"login"=>"test", "token"=>"tE3aFvs27"}, "devlist"=>[{"devices"=>{"imei"=>123419520034999, "type"=>"1000002", "profile"=>0}}]}
+
+    login = request_full["autorization"]["login"]
+
+    im_li =[]
+
+    for sd in request_full["devlist"]
+      im_li.append(sd["devices"])
+    end
+    imei_list = im_li
+
+    input_json = {:request_full => request_full}
+    resp_out = {}
+    begin
+
+      thr1 = Thread.new do
+        if add_functions_connector.check_input_1(login, imei_list)[:code]==200
+
+          imei = []
+          list1 = {}
+          for_insert = []
+          not_processed_list = []
+          processed_list = []
+
+          for ii in imei_list
+            valid_resp = internal_func.imei_validate(ii["imei"])
+            if valid_resp[:checked]
+              list1[ii["imei"]] = ii
+              imei.append(ii["imei"])
+            else
+              not_processed_list.append({:imei => ii["imei"], :error => valid_resp[:result]})
+            end
+          end
+
+          if imei != []
+            list_checked = mongo_client.check_imei_exists(imei)
+
+            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]
+              begin
+                get_login_info = mongo_client.check_login_prof_perm_id_one(login, list1[jj]["profile"])[:code]
+                if get_login_info==200
+                  for_insert.append(list1[jj])
+                else
+                  not_processed_list.append({:imei => list1[jj], :error => "Permission denied for this profile"})
+                end
+              rescue
+                not_processed_list.append({:imei => list1[jj], :error => "Unknown error"})
+              end
+            end
+          end
+
+          begin
+            added_on_iot_platf = []
+            if for_insert != []
+              ##Logic for IOT Platform connection###
+
+
+              for aaa in for_insert
+
+                #########change 2020.05.11. imperituroard
+                #########replace process for get iot app_id and password from users to profile
+
+                #credentials = mongo_client.get_iot_oceanconnect_credent(login)
+                credentials = mongo_client.get_iot_oceanconn_credent_2(aaa["profile"])
+
+                #########
+
+                if aaa.key?("type") && !aaa.key?("device_type")
+                  aaa["device_type"] = aaa["type"]
+                  aaa = internal_func.delete_key_hash(aaa, "type")
+                end
+
+                aaa = internal_func.hash_val_to_string(aaa)
+
+                if credentials[:code] == 200
 
                   begin
                     dev_name = aaa["imei"].to_s
@@ -141,6 +306,10 @@ class IotFunctions_2
                     #get {"model"=>"BGT_PPMC", "ManufacturerID"=>"unknown", "ManufacturerNAME"=>"unknown", "device_type"=>"unknown"}
                     #from database
                     model_data = mongo_client.get_device_type_info_universal(aaa["device_type"])
+                    profile_data = mongo_client.get_profile_universal(aaa["profile"])
+                    p profile_data
+                    p model_data
+                    p "model_data"
                     resss = hua_aceanconnect_connector.add_new_device_on_huawei(credentials[:body][:app_id],
                                                                                 credentials[:body][:secret],
                                                                                 aaa["imei"],
@@ -159,6 +328,8 @@ class IotFunctions_2
                         s1 = aaa
                         s1[:huadata] = resss
                         s1[:created] = DateTime.now
+                        s1["device_type"] = model_data[:body]["model"]
+                        s1["profile"] = profile_data["profile_id"]
                         added_on_iot_platf.append(s1)
                       end
                     else
@@ -198,7 +369,7 @@ class IotFunctions_2
     thr1.join
 
     resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json, resp_out)
-    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
 
@@ -261,7 +432,7 @@ class IotFunctions_2
 
     resp_out[:data][:tosoapgw] = add_functions_connector.iot_query_dev_soapgw_answer(input_json, resp_out)
 
-    mongo_client.audit_logger("device_find", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("device_find", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
 
   end
@@ -433,7 +604,7 @@ class IotFunctions_2
     end
 
     thr3.join
-    mongo_client.audit_logger("imei_replace", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("imei_replace", remote_ip, input_json, resp_out, real_ip, {})
 
     resp_out
 
@@ -520,7 +691,7 @@ class IotFunctions_2
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr4.join
-    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
 
@@ -600,7 +771,7 @@ class IotFunctions_2
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr5.join
-    mongo_client.audit_logger("device_add_address", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("device_add_address", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
 
@@ -678,7 +849,7 @@ class IotFunctions_2
       resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
     thr6.join
-    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
 
@@ -706,7 +877,7 @@ class IotFunctions_2
       end
     end
     thr7.join
-    mongo_client.audit_logger("autorize_subscriber", remote_ip, input_json, resp_out, real_ip)
+    mongo_client.audit_logger("autorize_subscriber", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
 
@@ -764,7 +935,7 @@ class IotFunctions_2
       }
       resp_out = {:code => 507, :result => "Unknown SDK error", :body => {:tosoapgw => tosoapgw}}
     end
-    mongo_client.audit_logger("get_available_prof_2", remote_ip, input_params, resp_out, real_ip)
+    mongo_client.audit_logger("get_available_prof_2", remote_ip, input_params, resp_out, real_ip, {})
     resp_out
   end
 
@@ -820,7 +991,7 @@ class IotFunctions_2
       }
       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)
+    mongo_client.audit_logger("get_available_types_2", remote_ip, input_params, resp_out, real_ip, {})
     resp_out
   end
 
@@ -891,7 +1062,7 @@ class IotFunctions_2
       }
       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)
+    mongo_client.audit_logger("get_available_types_2", remote_ip, input_params, resp_out, real_ip, {})
     resp_out
   end
 
@@ -921,7 +1092,7 @@ class IotFunctions_2
     rescue
       output_answ = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("get_info_data_type_2", remote_ip, input_params, output_answ, real_ip)
+    mongo_client.audit_logger("get_info_data_type_2", remote_ip, input_params, output_answ, real_ip, {})
     output_answ
   end
 
@@ -952,7 +1123,7 @@ class IotFunctions_2
     rescue
       output_answ = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("get_info_data_profile_2", remote_ip, input_params, output_answ, real_ip)
+    mongo_client.audit_logger("get_info_data_profile_2", remote_ip, input_params, output_answ, real_ip, {})
     output_answ
   end
 
@@ -1059,11 +1230,12 @@ class IotFunctions_2
                                   if resss[:body].key?("error_code") && resss[:body]["error_code"] != 200
                                     not_processed_list.append({:imei => curr_dev["imei"], :error => resss})
                                   else
+                                    p resss
                                     new_id_iot = resss[:body]
                                     new_profile_id = prof_new_id
                                     now_date = DateTime.now
                                     #finished success. update database
-                                    attribute = {profile: new_profile_id, device_type: model_data[:body]["model"], huadata: {body: new_id_iot}, updated: now_date}
+                                    attribute = {profile: new_profile_id, device_type: model_data[:body]["model"], huadata: resss, updated: now_date}
                                     answ_mongo = mongo_client.modify_attr_mongo_universal(curr_dev["imei"].to_i, attribute)
                                     if answ_mongo[:code] != 200
                                       not_processed_list.append({:imei => curr_dev["imei"], :error => "Critical error. Mongo not updated", :mongo_err => answ_mongo})
@@ -1077,6 +1249,8 @@ class IotFunctions_2
                               rescue
                                 not_processed_list.append({:imei => curr_dev["imei"], :error => "Unknown error with insertion imei on IOT platform"})
                               end
+                            else
+                              not_processed_list.append({:imei => curr_dev["imei"], :error => "Something wrong with IOT platform"})
                             end
                           else
                             not_processed_list.append({:imei => curr_dev["imei"], :error => "Not processed by iot platform. deviceId not found in mongoDB"})
@@ -1125,7 +1299,7 @@ class IotFunctions_2
     thr13set.join
 
     output_answ = {:code => 200, :result => "Success", :body => {:to_soap_gw => answ_to_soapgw, :not_processed_list => not_processed_list, :processed_list => processed_list}}
-    mongo_client.audit_logger("set_data_replace_2", remote_ip, input_params, output_answ, real_ip)
+    mongo_client.audit_logger("set_data_replace_2", remote_ip, input_params, output_answ, real_ip, {})
     output_answ
   end
 
@@ -1207,6 +1381,31 @@ class IotFunctions_2
   end
 
 
+
+
+
+
+  ################################################
+  ############technology procedures###############
+  ################################################
+
+  def delete_all_devices_in_database
+
+    imei_list = []
+    all_imei = mongo_client.get_all_imei_from_db
+    all_imei[:body].each do |immm|
+      imei_list.append(immm["imei"])
+    end
+
+    imei_list.each do |del_imei|
+      p del_imei
+      self.device_remove_2("test", del_imei, "localhost", "localhost")
+    end
+  end
+
+
+
+
   #for internal use. Add new device model
   def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
     model = {

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -25,6 +25,12 @@ class HuaIot
     @client_iot_mongo = MongoIot.new(mongo_ip, mongo_port, mongo_database)
   end
 
+  def valid_json?(json)
+    JSON.parse(json)
+  rescue JSON::ParserError => e
+    json
+  end
+
   def parse_token(str)
     begin
       dd = str.split(",")
@@ -54,6 +60,9 @@ class HuaIot
   def get_token(app_id, secret)
     internal_func.printer_texter("get_token: start. Step1, iput: app_id: #{app_id.to_s}, secret: #{secret.to_s}", "debug")
     out_resp = {}
+    fff = {}
+    data = {}
+    url_string = ""
     begin
       path = "/iocm/app/sec/v1.1.0/login"
       url_string = "https://" + platformip + ":" + platformport + path
@@ -73,16 +82,21 @@ class HuaIot
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
-      out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      p res.code
+      p res.message
+      p res.body.to_s
+
+      out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
+
       fff = {:func => "get_token",
              :iot_fun => "",
              :req_header => {:content_type => 'application/x-www-form-urlencoded',
                              :platform => "Huawei oceanconnect"
              }}
-      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed get token"}
     end
+    client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     jjj = {:procedure => "get_token", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
     out_resp
@@ -93,6 +107,9 @@ class HuaIot
 
     internal_func.printer_texter("token_logout Step1 token: #{token}", "debug")
     out_resp = {}
+    fff = {}
+    data = {}
+    url_string = ""
     begin
       path = "/iocm/app/sec/v1.1.0/logout"
       url_string = "https://" + platformip + ":" + platformport + path
@@ -111,15 +128,21 @@ class HuaIot
       request.content_type = 'application/json'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
-      out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+      #JSON.parse(res.body.to_s)
+      out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s) }
+
       fff = {:func => "token_logout",
              :iot_fun => "logout",
              :platform => "Huawei oceanconnect"
       }
-      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
+      p res.code
+      p res.message
+      p res.body.to_s
+
     rescue
       out_resp = {:code => 500, :message => "failed logout token"}
     end
+    client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     jjj = {:procedure => "token_logout", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
     out_resp
@@ -144,7 +167,7 @@ class HuaIot
     data = {nodeId: node_id}
     request.body = data.to_json
     res = https.request(request)
-    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "dev_register_verif_code_mode",
            :iot_fun => "Registering a Directly Connected Device (Verification Code Mode) (V2)",
            :req_header => {:content_type => 'application/json',
@@ -182,7 +205,7 @@ class HuaIot
     internal_func.printer_texter({:procedure => "dev_register_passw_code_mode2", :data => {:body => data_out, :url => url_string}}, "debug")
     request.body = data_out.to_json
     res = https.request(request)
-    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "dev_register_passw_code_mode2",
            :iot_fun => "2.2.4",
            :req_header => {:authorization => 'Bearer ' + token,
@@ -217,7 +240,7 @@ class HuaIot
     request.body = data_out
     res = https.request(request)
     p res.body.to_s
-    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "dev_reg_passw_code_mode2_2",
            :iot_fun => "2.2.4",
            :req_header => {:content_type => 'application/json',
@@ -249,7 +272,7 @@ class HuaIot
       request['app_key'] = app_id
       res = https.request(request)
       if res.body != nil
-        out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => valid_json?(res.body.to_s)}}
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end
@@ -290,7 +313,7 @@ class HuaIot
     res = https.request(request)
     p res.body.to_s
     p res.code
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
   end
 
   #2.2.14 Querying Device Activation Status
@@ -310,7 +333,7 @@ class HuaIot
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
     res = https.request(request)
-    output_ans = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_ans = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "querying_device_activ_status",
            :iot_fun => "2.2.14",
            :req_header => {:content_type => 'application/json',
@@ -340,7 +363,7 @@ class HuaIot
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
     res = https.request(request)
-    out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "querying_device_info",
            :iot_fun => "2.9.1",
            :req_header => {:authorization => 'Bearer ' + token,
@@ -371,7 +394,7 @@ class HuaIot
     req_body = {deviceIds: dev_list}
     request.body = req_body.to_json
     res = https.request(request)
-    output_str = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_str = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "querying_device_direct_conn",
            :iot_fun => "2.9.6",
            :req_header => {:authorization => 'Bearer ' + token,
@@ -401,7 +424,7 @@ class HuaIot
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
     res = https.request(request)
-    output_ans = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_ans = {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
 
     fff = {:func => "querying_device_type_list",
            :iot_fun => "2.9.19",
@@ -435,7 +458,7 @@ class HuaIot
     data = {deviceIds: dev_list}
     request.body = data.to_json
     res = https.request(request)
-    output_ans =  {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    output_ans =  {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
     fff = {:func => "quer_dev_direct_conn_batches",
            :iot_fun => "2.9.6",
            :req_header => {:content_type => 'application/json',
@@ -472,7 +495,7 @@ class HuaIot
       p res.code
       p res.body
       if res.body != nil
-        out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => valid_json?(res.body.to_s)}}
       else
         out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
       end

data/lib/imperituroard/projects/iot/internal_functions.rb

@@ -163,6 +163,30 @@ class InternalFunc
     v3.uniq - v2.uniq - v1.uniq
   end
 
+
+  #delete one key from hash
+  def delete_key_hash(hash_f, delete_key)
+    res = {}
+    hash_f.each do |ggg|
+      if ggg[0].to_s != delete_key.to_s
+        res[ggg[0]] = ggg[1]
+      end
+    end
+    res
+  end
+
+
+  #process hash array. Transform keys to string keys
+  def hash_val_to_string(hash_full)
+    resp = {}
+    hash_full.each do |hsh|
+      resp[hsh[0].to_s] = hsh[1]
+    end
+    resp
+  end
+
+
+
   def test()
     p "eeeeeeeeeeeeeeeeeeeeeeee"
   end

data/lib/imperituroard/projects/iot/mongoconnector.rb

@@ -20,7 +20,7 @@ class MongoIot
     @internal_func = InternalFunc.new
   end
 
-  def audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
+  def audit_logger(proc_name, src_ip, input_json, output_json, real_ip, add_params)
     out_resp = {}
     begin
       current = internal_func.datetimenow
@@ -30,7 +30,8 @@ class MongoIot
           :date => current,
           :sender => {:src_ip => src_ip, :real_ip => real_ip},
           :input_params => input_json,
-          :output_params => output_json
+          :output_params => output_json,
+          :add_params => add_params
       }
       result = collection.insert_one(doc)
       out_resp = {:code => 200, :result => "audit_logger: Request completed successfully", :body => result}
@@ -540,7 +541,7 @@ class MongoIot
         result_ps.append(row)
       }
       dattaa = result_ps[0]
-      if dattaa!=nil
+      if dattaa != nil
         out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
       else
         out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
@@ -566,9 +567,9 @@ class MongoIot
         }
         dattaa = result_ps[0]
         if dattaa!=nil
-          out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
+          out_resp = {:code => 200, :result => "get_device_type_info_universal: Request completed successfully", :body => dattaa}
         else
-          out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+          out_resp = {:code => 404, :result => "get_device_type_info_universal: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
         end
       else
         result_ps2 = []
@@ -578,9 +579,9 @@ class MongoIot
         }
         dattaa = result_ps2[0]
         if dattaa!=nil
-          out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
+          out_resp = {:code => 200, :result => "get_device_type_info_universal: Request completed successfully", :body => dattaa}
         else
-          out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+          out_resp = {:code => 404, :result => "get_device_type_info_universal: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
         end
       end
 
@@ -713,5 +714,23 @@ class MongoIot
     out_resp
   end
 
+
+  def get_all_imei_from_db
+    out_resp = {}
+    begin
+      req2 = []
+      result_ps = []
+      collection = client[:device_imei]
+      collection.find({}, {:_id => 0}).each {|row|
+        result_ps.append(row)
+      }
+      out_resp = {:code => 200, :result => "get_all_imei_from_db: Request completed successfully", :body => result_ps}
+    rescue
+      out_resp = {:code => 507, :result => "get_all_imei_from_db: Unknown SDK error"}
+    end
+    #internal_func.printer_texter(out_resp, "debug")
+    out_resp
+  end
+
 end
 

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.0.5"
+  VERSION = "1.1.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,6 +187,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
+- ".idea/runConfigurations/version.xml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"