imperituroard 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '088118e62f44142a8e96e6275b6f80902133f675'
-  data.tar.gz: de5d6a58525645906238977ed3ff2016c3cea3f0
+  metadata.gz: 80e97d149199ca8d19d1f44fd7efa93c83fb3735
+  data.tar.gz: c3fb37c6327ba5f80409e8a1de60eacef665b16d
 SHA512:
-  metadata.gz: c6aa662e9956771a4f4e5adadc5e26c8ac7881fa5b8a3ce67c6c7affb80a720b303b183365a31410625d32c5201d6959a92310c0b564182d2b11221f8eee9aad
-  data.tar.gz: c9d6dc4d4106a4ec23aa25a7749ea7e0d098972a7c50a3c5860ffe7de2995382ad63253f7fed739693caedd4bbf19a967ea6366f64ba1b11e407ccf9f932d761
+  metadata.gz: 76330a50f5c3e066b16374ce5ec656c855bb6988987d608f3d42ff0cbf1e7677562c071ca4ccf3b693affa51d517710f874d0dadac3d9f93e7f4a6212d96ea17
+  data.tar.gz: 8f71b08f56d0cc2134048be60d81eb42f73d5f6fc8e2a5b909d876cf398be587f774407603b0beb77fc1c6951037734211482da73a3740c7ae5b2881c94c5f7a

data/lib/imperituroard.rb

@@ -248,60 +248,6 @@ class Iot
   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 = []
-      resss = {}
-      data_from_db = mongo_client.get_imei_info_from_db(imei_list)
-      p data_from_db
-      for g in data_from_db[:body]
-        dev_id_list.append(g["huadata"]["body"]["deviceId"])
-      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)
-      end
-    rescue
-      resp_out = {:code => "500", :message => "get_info_by_imeilist_from_iot: Something wrong", :body => {"devices" => []}}
-    end
-    internal_func.printer_texter(resp_out, "debug")
-    resp_out
-  end
-
-
-  #for internal use. Add new device model
-  def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
-    model = {
-        model: model,
-        ManufacturerID: manufacture_id,
-        ManufacturerNAME: manufacture_name,
-        device_type: device_type,
-        description: description,
-        note: note,
-        created: DateTime.now
-    }
-    mongo_client.imei_insert_model(model)
-  end
-
-  def test()
-    #ddd = MongoIot.new(mongoip, mongoport, mongo_database)
-    #ddd.get_profiles_by_login("test")
-
-    ff = [131234123412341233, 131234123127341233]
-    #ddd.get_imsi_info_from_db(ff)
-
-    #p ddd.get_profile_id_by_name("1341241")
-    #p ddd.get_device_type_info_by_model("BGT_PPMC11")
-
-    #fff = HuaIot.new("134.17.93.4", "443", "/Users/imperituroard/Desktop/cert.crt", "/Users/imperituroard/Desktop/key.pem")
-    p hua_aceanconnect_connector.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "eWllZpHgXgvgDAQlJjWs4QXaR94a", "91234")
-  end
-
 end
 
 

data/lib/imperituroard/iot.rb

@@ -651,6 +651,7 @@ class IotFunctions_2
 
     begin
       data_processed = []
+      data_soapgw = []
       login_info = mongo_client.get_login_inf2_select(login)
       if login_info[:code]==200
         permit_profiles = login_info[:body]["permit_profiles"]
@@ -665,14 +666,29 @@ class IotFunctions_2
                                  :profile => ff["profile"],
                                  :info => ff["info"]
                                 })
+          data_soapgw.append({:id => ff["profile_id"], :form => ff["form"], :description => ff["description"], :profile => ff["profile"]})
+
         end
-        resp_out = {:code => 200, :result => "Request completed successfully", :body => {:data => data_processed}}
+        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
-        resp_out = {:code => login_info[:code], :result => login_info[:result]}
+        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
-      resp_out = {:code => 507, :result => "Unknown SDK error"}
+      tosoapgw = { :code => 507,
+                   :result => "Unknown SDK error",
+                   :profiles => data_soapgw
+      }
+      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)
     resp_out
@@ -686,6 +702,7 @@ class IotFunctions_2
 
     begin
       data_processed = []
+      data_soapgw = []
       login_info = mongo_client.get_login_inf2_select(login)
       if login_info[:code]==200
 
@@ -705,14 +722,29 @@ class IotFunctions_2
                                  :model => ff["model"],
                                  :info => ff["info"]
                                 })
+          data_soapgw.append({:name => ff["model"], :form => ff["form"], :description => ff["description"], :type_id => ff["type_id"]})
         end
-        resp_out = {:code => 200, :result => "Request completed successfully", :body => {:data => data_processed}}
+
+        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
-        resp_out = {:code => login_info[:code], :result => login_info[:result]}
+        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
-      resp_out = {:code => 507, :result => "Unknown SDK error"}
+      tosoapgw = { :code => 507,
+                   :result => "Unknown SDK error",
+                   :types => data_soapgw
+      }
+      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)
     resp_out
@@ -726,7 +758,8 @@ class IotFunctions_2
     output_answ = {}
     mon_answer = {}
     begin
-      if type.is_a? String
+      #if type.is_a? String
+      if internal_func.if_digit_or_string(type)[:body][:string]
         mon_answer = mongo_client.get_type_by_name(type)
       else
         mon_answer = mongo_client.get_type_by_id(type)
@@ -753,11 +786,9 @@ class IotFunctions_2
 
     input_params = {:profile => profile}
     output_answ = {}
-
     mon_answer = {}
-
     begin
-      if profile.is_a? String
+      if internal_func.if_digit_or_string(profile)[:body][:string]
         mon_answer = mongo_client.get_profile_id_by_name(profile)
       else
         mon_answer = mongo_client.get_profile_name_by_id(profile)
@@ -782,4 +813,63 @@ 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 = []
+      resss = {}
+      data_from_db = mongo_client.get_imei_info_from_db(imei_list)
+      p data_from_db
+      for g in data_from_db[:body]
+        dev_id_list.append(g["huadata"]["body"]["deviceId"])
+      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)
+      end
+    rescue
+      resp_out = {:code => "500", :message => "get_info_by_imeilist_from_iot: Something wrong", :body => {"devices" => []}}
+    end
+    internal_func.printer_texter(resp_out, "debug")
+    resp_out
+  end
+
+
+  #for internal use. Add new device model
+  def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
+    model = {
+        model: model,
+        ManufacturerID: manufacture_id,
+        ManufacturerNAME: manufacture_name,
+        device_type: device_type,
+        description: description,
+        note: note,
+        created: DateTime.now
+    }
+    mongo_client.imei_insert_model(model)
+  end
+
+
+  def test()
+    #ddd = MongoIot.new(mongoip, mongoport, mongo_database)
+    #ddd.get_profiles_by_login("test")
+
+    ff = [131234123412341233, 131234123127341233]
+    #ddd.get_imsi_info_from_db(ff)
+
+    #p ddd.get_profile_id_by_name("1341241")
+    #p ddd.get_device_type_info_by_model("BGT_PPMC11")
+
+    #fff = HuaIot.new("134.17.93.4", "443", "/Users/imperituroard/Desktop/cert.crt", "/Users/imperituroard/Desktop/key.pem")
+    p hua_aceanconnect_connector.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "eWllZpHgXgvgDAQlJjWs4QXaR94a", "91234")
+  end
+
+
+
 end

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

@@ -44,6 +44,34 @@ class InternalFunc
   end
 
 
+  def if_digit_or_string(data)
+
+    input_params = {:data => data}
+    output_params = {}
+    str_incr = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
+                'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+    ]
+    d_a_t_a = data.split('')
+
+    is_string = 0
+
+    for ddd in d_a_t_a
+      if str_incr.include?(ddd)
+        is_string = 1
+      end
+    end
+
+    if is_string == 0
+      output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => false}}
+    else
+      output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => true}}
+    end
+
+    output_params
+
+  end
+
+
 
   def test()
     p "eeeeeeeeeeeeeeeeeeeeeeee"

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

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