imperituroard 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e940fef724694620f92446e776b76f186aefb9f2
-  data.tar.gz: 7684c9da421ec5e068e1992aa69d9908d8617398
+  metadata.gz: 5264f8d3d00a73980d4de22a91b93c49ccd65904
+  data.tar.gz: a165a821f4ea118ca20916f6ca512aa4d1f4b173
 SHA512:
-  metadata.gz: 192b9dc5e4d12006aa68c10cd50455edffb5c6d0ed0452022437653c7780c506e40a99bf2a084c1ce264fd4f5214e8511e37f4e8c32e505a8b54638be9422bab
-  data.tar.gz: 65d41e4c02a8f54585dd6652e9637e60b0b60204788d7e0bcfd50ed7632ee3c9959dc7f50a26745189a11cf8104f1859843d67cedb0ed47602df6463a3d8b559
+  metadata.gz: e8d44ca288a3ebadc98ebd0ad7844e781c1ca3085c4df144113f9cd61a349915f71565daeeaa460437d4b6da545a40f7577c488bc7f4f6ca09230dafacc535b1
+  data.tar.gz: 1161e315402988d67d08cb63d0c7660412a24d2826172e5d23c38f81d1fa876c84cfef2f56b83754a7f8ff3cbc1d45e2cdd1415b6cc96abb8c8a9a8a5c15739f

data/lib/imperituroard/projects/iot.rb

@@ -980,24 +980,33 @@ class IotFunctions_2
             #step1 checking permission for writing for imei list
             prof_name1 = mongo_client.get_profile_name_from_imei(curr_dev["imei"].to_i)
             if prof_name1[:code] == 200
-              prof_new_id = mongo_client.get_profile_universal(curr_dev["new_profile"])["profile_id"]
+
+              if curr_dev["new_profile"] != "nil" && curr_dev["new_profile"] != "null" && curr_dev["new_profile"] != "empty"
+                prof_new_id = mongo_client.get_profile_universal(curr_dev["new_profile"])["profile_id"]
+              else
+                prof_new_id = prof_name1[:body]["profile_id"]
+              end
+
+
+              if curr_dev["new_type"] != "nil" && curr_dev["new_type"] != "null" && curr_dev["new_type"] != "empty"
+                type_new_pr = curr_dev["new_type"]
+              else
+                type_new_pr = prof_name1[:imei_info][:body][0]["device_type"]
+              end
+
 
               get_login_info = mongo_client.check_login_prof_perm_id_one(inp_login, prof_name1[:body]["profile_id"])
               if get_login_info[:code] == 200
                 get_login_info_new = mongo_client.check_login_prof_perm_id_one(inp_login, prof_new_id)
                 if get_login_info_new[:code] == 200
-
                   cur_comp1 = mongo_client.compare_profiles(prof_name1[:body]["profile_id"], prof_new_id)
-                  cur_comp2 = mongo_client.compare_device_types(prof_name1[:imei_info][:body][0]["device_type"], curr_dev["new_type"])
+                  cur_comp2 = mongo_client.compare_device_types(prof_name1[:imei_info][:body][0]["device_type"], type_new_pr)
 
-                  p cur_comp1
-                  p cur_comp2
                   if cur_comp1[:is_the_same] && cur_comp2[:is_the_same]
                     #the same. Nothing to do
                     processed_list.append(curr_dev)
                     ########
                   else
-
                     credentials_old = mongo_client.get_iot_oceanconn_credent_2(prof_name1[:body]["profile"])
                     credentials_new = mongo_client.get_iot_oceanconn_credent_2(prof_new_id)
                     #########
@@ -1006,9 +1015,7 @@ class IotFunctions_2
                       if imei_data[:body] != []
                         ans = {}
                         if imei_data[:body][0]["huadata"]["body"]["deviceId"] != nil
-
-                          model_data = mongo_client.get_device_type_info_universal(curr_dev["new_type"])
-
+                          model_data = mongo_client.get_device_type_info_universal(type_new_pr)
                           #####all checks completed. then process data#####
                           ans_old = hua_aceanconnect_connector.remove_one_device_from_iot(credentials_old[:body][:app_id], credentials_old[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"])
 
@@ -1025,9 +1032,7 @@ class IotFunctions_2
                                                                                           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 => curr_dev["imei"], :error => resss})
                                 else
@@ -1036,18 +1041,14 @@ class IotFunctions_2
                                   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}
-
                                   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})
                                   else
                                     processed_list.append(curr_dev)
                                   end
-
                                   #added_on_iot_platf.append(s1)
                                 end
-
                               else
                                 not_processed_list.append({:imei => curr_dev["imei"], :error => resss})
                               end
@@ -1102,7 +1103,6 @@ class IotFunctions_2
     output_answ = {:code => 200, :result => "Success", :body => {:to_soap_gw => soap_answ, :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)
     output_answ
-
   end
 
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,4 @@
 module Imperituroard
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end
+

metadata

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