imperituroard 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c14a6e4b874b88dee7fcb385a9bdc1a3421171c
-  data.tar.gz: e0db9b2f11a898a8eda22a0075da8f88c5902f6b
+  metadata.gz: 45ef3c7115d6ab674dcf9d14460a7b14388d16ef
+  data.tar.gz: 0c77a69151136f2d1377fffcaf1f29e6abacf49c
 SHA512:
-  metadata.gz: 3c01ba2b79798b63b81137c34d410834b0d1814101c4b70dfb788b974b6835a07954c36e30f70a0dbc28d2aa46c3857542502527daf8fb978f0915ed953648e0
-  data.tar.gz: 013d5fa3179ac944216c3c7ae87e96bbc54c3c65d03c069a45fa21b03bbb558ecf3a35725ef9704b74e132601e68ad718871fb44b4f3524c4e8449e49a793340
+  metadata.gz: '038bd9f35f37440b6c5bd7a288a2e06f8955258643ae113b647edbd6c7a0110506294e107718759a8c552a2690c2caf340dfc1a113734ad9a210c84cca64f8b1'
+  data.tar.gz: 845b39504e1c12da72ded315ac1ff49bb40a811eba8819283a7dff420b9e59f4c23c13df3e69716faf6927c52a69c53eb76bb8675228b25c1eb689b896efb1f7

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

@@ -61,9 +61,9 @@ class InternalFunc
       end
     end
     if is_string == 0
-      output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => false}}
+      output_params = {:code => 200, :result => "if_digit_or_string: Request processed. Its digit", :body => {:string => false}}
     else
-      output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => true}}
+      output_params = {:code => 200, :result => "if_digit_or_string: Request processed. Its string", :body => {:string => true}}
     end
     output_params
 

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

@@ -475,6 +475,33 @@ class MongoIot
   end
 
 
+  #function for get iot platform credentials from profile
+  def get_iot_oceanconn_credent_2(profile)
+    out_resp = {}
+    begin
+      result_ps = []
+      collection = client[:device_profiles]
+
+      if internal_func.if_digit_or_string(profile.to_s)[:body][:string]
+        collection.find({"profile" => profile}).each {|row|
+          result_ps.append(row)
+        }
+      else
+        collection.find({"profile_id" => profile.to_i}).each {|row|
+          result_ps.append(row)
+        }
+      end
+
+      app_id = result_ps[0][:iot_data][:app_id]
+      secret = result_ps[0][:iot_data][:secret]
+      out_resp = {:code => 200, :result => "get_iot_oceanconn_credent_2: Request completed successfully", :body => {:app_id => app_id, :secret => secret}}
+    rescue
+      out_resp = {:code => 500, :result => "get_iot_oceanconn_credent_2: Process failed"}
+    end
+    internal_func.printer_texter(out_resp, "debug")
+    out_resp
+  end
+
   def get_device_type_info_by_model(device_model)
     out_resp = {}
     begin
@@ -497,30 +524,4 @@ class MongoIot
   end
 
 
-  def ttt
-    p "111111"
-    begin
-      puts(client.cluster.inspect)
-      puts('Collection Names: ')
-      puts(client.database.collection_names)
-      puts('Connected!')
-      collection = client[:audit]
-      doc = {
-          name: 'Steve',
-          hobbies: ['hiking', 'tennis', 'fly fishing'],
-          siblings: {
-              brothers: 0,
-              sisters: 1
-          }
-      }
-      result = collection.insert_one(doc)
-      p result
-      client.close
-    rescue StandardError => err
-      puts('Error: ')
-      puts(err)
-    end
-
-
-  end
 end

data/lib/imperituroard/projects/iot.rb

@@ -108,10 +108,21 @@ class IotFunctions_2
             if for_insert!=[]
               ##Logic for IOT Platform connection###
 
-              credentials = mongo_client.get_iot_oceanconnect_credent(login)
 
-              if credentials[:code]==200
-                for aaa in for_insert
+              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 credentials[:code] == 200
+
+
                   begin
                     dev_name = aaa["imei"].to_s
 
@@ -146,18 +157,22 @@ class IotFunctions_2
                   rescue
                     not_processed_list.append({:imei => aaa["imei"], :error => "Unknown error with insertion imei on IOT platform"})
                   end
-                end
 
-                #########end iot platform logic#######
 
-                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}}
+                  #########end iot platform logic#######
+
                 else
-                  resp_out = {:code => 202, :result => "Empty list. Nothing for insertion", :body => {:imei_processed => added_on_iot_platf, :error_list => not_processed_list}}
+                  resss_err = {:code => 400, :result => "IOT platform credentials not found"}
+                  not_processed_list.append({:imei => aaa["imei"], :error => resss_err})
                 end
-                              else
-                resp_out = {:code => 400, :result => "IOT platform credentials not found"}
+
+              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
 
 
@@ -344,7 +359,7 @@ class IotFunctions_2
           internal_func.printer_texter({:function => "imei_replace Step6", :list_from_iot => list_from_iot, :description => "data from iot platform by old imei"}, "debug")
 
           #processing data. modifying data on iot platform and mongoDB
-          if list_from_iot[:code]=="200"
+          if list_from_iot[:code]=="200" && list_from_iot[:body]["devices"] != nil
 
             for ard in list_from_iot[:body]["devices"]
               p ard
@@ -355,7 +370,19 @@ class IotFunctions_2
               new_data_cur_dev = ard["deviceInfo"]
               new_data_cur_dev["nodeId"] = old_new_translation[current_old_dev.to_i].to_s
 
-              credentials = mongo_client.get_iot_oceanconnect_credent(login)
+              p list_from_iot
+              p "list_from_iot"
+
+
+              #########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)
+              info_from_mongo = mongo_client.get_imei_info_from_db([current_old_dev.to_i])
+              credentials = mongo_client.get_iot_oceanconn_credent_2(info_from_mongo[:body][0]["profile"])
+
+              #########
+
 
               if credentials[:code]==200
                 flag_remove=0
@@ -436,7 +463,14 @@ class IotFunctions_2
 
               ##Logic for IOT Platform connection###
 
-              credentials = mongo_client.get_iot_oceanconnect_credent(login)
+              #########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(prof_name[:body]["profile"])
+
+              #########
+
               resp = {}
 
               if credentials[:code]==200
@@ -518,13 +552,21 @@ class IotFunctions_2
               if permiss[:code]==200
 
                 ##Logic for IOT Platform connection###
-                credentials = mongo_client.get_iot_oceanconnect_credent(login)
+
+                #########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(prof_name[:body]["profile"])
+
+                #########
+
                 resp = {}
 
                 if credentials[:code]==200
                   imei_data = mongo_client.get_imei_info_from_db([p[:imei]])
                   if imei_data[:body]!=[]
-                    ans =hua_aceanconnect_connector.modify_location_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"], p[:address])
+                    ans = hua_aceanconnect_connector.modify_location_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"], p[:address])
 
                     internal_func.printer_texter({:function => "device_add_address Step2", :ans => ans, :descrition => "answer from hua IOT", :input => {:did => imei_data[:body][0]["huadata"]["body"]["deviceId"], :appid => credentials[:body][:app_id], :secret => credentials[:body][:secret], :address => p[:address]}}, "debug")
                   end
@@ -700,24 +742,24 @@ class IotFunctions_2
           data_soapgw.append({:id => ff["profile_id"], :form => ff["form"], :description => ff["description"], :profile => ff["profile"]})
 
         end
-        tosoapgw = { :code => 200,
-          :result => "Request completed successfully",
-          :profiles => data_soapgw
+        tosoapgw = {:code => 200,
+                    :result => "Request completed successfully",
+                    :profiles => 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],
-                     :profiles => data_soapgw
+        tosoapgw = {:code => login_info[:code],
+                    :result => login_info[:result],
+                    :profiles => data_soapgw
         }
         resp_out = {:code => login_info[:code], :result => login_info[:result], :body => {:tosoapgw => tosoapgw}}
       end
 
     rescue
-      tosoapgw = { :code => 507,
-                   :result => "Unknown SDK error",
-                   :profiles => data_soapgw
+      tosoapgw = {:code => 507,
+                  :result => "Unknown SDK error",
+                  :profiles => data_soapgw
       }
       resp_out = {:code => 507, :result => "Unknown SDK error", :body => {:tosoapgw => tosoapgw}}
     end
@@ -756,24 +798,24 @@ class IotFunctions_2
           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
+        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
+        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
+      tosoapgw = {:code => 507,
+                  :result => "Unknown SDK error",
+                  :types => data_soapgw
       }
       resp_out = {:code => 507, :result => "Unknown SDK error", :body => {:tosoapgw => tosoapgw}}
     end
@@ -842,25 +884,74 @@ class IotFunctions_2
   end
 
 
-
-
   #additional procedure for checking status on iot platform
   def get_info_by_imeilist_from_iot(login, imei_list)
     resp_out={}
     begin
       dev_id_list = []
+      for_process_list = {}
       resss = {}
       data_from_db = mongo_client.get_imei_info_from_db(imei_list)
       p data_from_db
+      profile = 0
       for g in data_from_db[:body]
+        p g
+        p "ggggg"
         dev_id_list.append(g["huadata"]["body"]["deviceId"])
+
+        if for_process_list[g["profile"]] == nil
+          for_process_list[g["profile"]] = [g["huadata"]["body"]["deviceId"]]
+        else
+          for_process_list[g["profile"]].append(g["huadata"]["body"]["deviceId"])
+        end
+
+        if g["profile"] != nil && g["profile"] != ""
+          profile = g["profile"]
+        end
       end
-      credentials = mongo_client.get_iot_oceanconnect_credent(login)
-      if credentials[:code]==200
-        p apid = credentials[:body][:app_id]
-        p secre = credentials[:body][:secret]
-        resp_out = hua_aceanconnect_connector.quer_dev_query_list(apid, secre, dev_id_list)
+
+      p dev_id_list
+      p "dev_id_list"
+      p for_process_list
+
+      for ard in for_process_list
+        ##Logic for IOT Platform connection###
+
+        #########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(ard[0])
+
+        #########
+
+        if credentials[:code] == 200
+          resp_out[:code] = "200"
+          resp_out[:result] = "Processed"
+          p apid = credentials[:body][:app_id]
+          p secre = credentials[:body][:secret]
+          resp_out_1 = hua_aceanconnect_connector.quer_dev_query_list(apid, secre, ard[1])
+          p resp_out_1
+          p "resp_out_1"
+          p resp_out[:body]
+          p "resp_out[:body][\"devices\"]"
+
+          if resp_out[:body] == nil || resp_out[:body] == {} || resp_out[:body] == {"devices"=>nil}
+            p "step1111"
+            p resp_out_1[:body]["devices"]
+            resp_out[:body] = { 'devices' => resp_out_1[:body]["devices"]}
+            p "step22222"
+          else
+            if resp_out_1[:body]["devices"] != nil
+              resp_out[:body]["devices"] = resp_out[:body]["devices"] + resp_out_1[:body]["devices"]
+            end
+          end
+        end
       end
+
+      p resp_out
+      p "resp_out"
+
     rescue
       resp_out = {:code => "500", :message => "get_info_by_imeilist_from_iot: Something wrong", :body => {"devices" => []}}
     end
@@ -899,5 +990,4 @@ class IotFunctions_2
   end
 
 
-
 end

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

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