iot.rb in imperituroard-1.1.0

- old
+ new

@@ -131,22 +131,25 @@
 
                 #########
 
                 if aaa.key?("type") && !aaa.key?("device_type")
                   aaa["device_type"] = aaa["type"]
-                elsif aaa.key?("device_type") && !aaa.key?("type")
-                  aaa["type"] = aaa["device_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"],
@@ -163,9 +166,11 @@
                         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