imperituroard 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8f6bbfe4c5e01a964045775d36b13741596323
-  data.tar.gz: 310767c96c24eaba6b79bd68ea5deea2040f6df3
+  metadata.gz: dae0092e4f87b047adb62157ee51cb3e917bc3d7
+  data.tar.gz: be638036010d680252df866b5b09fb49bddd6628
 SHA512:
-  metadata.gz: a11a03525f557e5c371b66826dc040c3eeaaf991697bf292c565b5f9f2431b568764765a4b1add9bbdbcdd3a5187f035c0f3790b13703d99dbd552d701b764a4
-  data.tar.gz: 83ab21b87e290534e833043230524fbef8b1fa1def3112c80b6e3046b21dd1ce180651f99d31626780ff89803f7f52434e24451b174e49470898cbfa5d253971
+  metadata.gz: a0e130dbe846d930dfe7da4a6290f76e4c1f6326e944ea4dbc693bafe90b9087ee4915e0e08dd83c346fb35c6a0ea68ce88ce5f690db27e47ab6b82e1ffaa3c6
+  data.tar.gz: f9c6ffd509148ae09d85fc4aac1439686612283d735fc020f3e45d76fd62e94d41b938d6a033fd93be6e2221612009b66d8a8da948e64fd32e0ee0c252baa93f

data/lib/imperituroard/projects/iot.rb

@@ -133,10 +133,11 @@ class IotFunctions_2
 
                 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
@@ -145,6 +146,8 @@ 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],
@@ -165,6 +168,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

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/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end
 

metadata

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