imperituroard 1.1.1 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07f8ba8173fac1753c044f8f0e6e06a6598e7b5
-  data.tar.gz: 3170f430dec13119ba8ba95de2224b54cdc35d1e
+  metadata.gz: 7919ac48dbcd533bd4f368d270658af138d85a9c
+  data.tar.gz: 983635e4384c254401baeabb9b53c590c0ad283e
 SHA512:
-  metadata.gz: fbb564b3afc160a77cc9b8e9e0dffb2675b5a89cfc9e7042ca62348aa29cd0057428c35090066ab80db51dbe3b2ee466817fb9a5f882a2cc5fe4082a0bbac184
-  data.tar.gz: 7ac4309248422d5d326b1e9c5ad98d1595ec79bc6f3e51bb9ae31632225e465b7b4677d201f149c32004c72b897e7c182d61e143be863ec63d70c311d9e2a59f
+  metadata.gz: cf610d13353c653e39f9af8e243cf19121c7aba27efcb6320dc24bd15db34b2b51dd96ac83e9264b9d4cf847e7d2fc64d163987e5bc45948177cbb229ea8510c
+  data.tar.gz: b22a70dc42f117ad123bab0a2be922b8aa236fd9f2f87dd717fd5e83aa6d711792133c1857c23b62f441bfce07c8eb243a0336cafe76ee18387e2d0ffbebb165

data/lib/imperituroard/projects/iot.rb

@@ -214,7 +214,6 @@ class IotFunctions_2
   end
 
 
-
   def add_device_to_prof2_2(request_full, real_ip, remote_ip)
 
     #{"autorization"=>{"login"=>"test", "token"=>"tE3aFvs27"}, "devlist"=>[{"devices"=>{"imei"=>123419520034999, "type"=>"1000002", "profile"=>0}}]}
@@ -229,6 +228,7 @@ class IotFunctions_2
     imei_list = im_li
 
     input_json = {:request_full => request_full}
+    input_json22 = {:login => login, :imei_list => imei_list}
     resp_out = {}
     begin
 
@@ -368,7 +368,7 @@ class IotFunctions_2
     end
     thr1.join
 
-    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json, resp_out)
+    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json22, resp_out)
     mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip, {})
     resp_out
   end
@@ -1381,10 +1381,6 @@ class IotFunctions_2
   end
 
 
-
-
-
-
   ################################################
   ############technology procedures###############
   ################################################
@@ -1404,8 +1400,6 @@ class IotFunctions_2
   end
 
 
-
-
   #for internal use. Add new device model
   def add_model_to_mongo(model, manufacture_id, manufacture_name, device_type, description, note)
     model = {

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

@@ -55,8 +55,8 @@ class AdditionalFunc
                 note=i["note"]
               end
             end
-            if i.key?("type")
-              type=i["type"]
+            if i.key?("device_type")
+              type=i["device_type"]
             end
             if i.key?("profile")
               profile=i["profile"]

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

@@ -65,6 +65,7 @@ class InternalFunc
     else
       output_params = {:code => 200, :result => "if_digit_or_string: Request processed. Its string", :body => {:string => true}}
     end
+    printer_texter({:input_params => input_params, :output_params => output_params}, "debug")
     output_params
 
   end
@@ -76,7 +77,6 @@ class InternalFunc
 
     output_info = {}
     begin
-
       if output_answer[:code] != 200
         deviceserr = []
         failednum = input_params[:imei_list].length
@@ -151,7 +151,7 @@ class InternalFunc
     else
       answer = {:code => 400, :result => "Invalid IMEI. Data is not integer", :checked => false}
     end
-    printer_texter({:answer => answer, :input => input}, "debug")
+    printer_texter({:answer => answer, :input => input, :fun => "imei_validate"}, "debug")
     answer
   end
 
@@ -166,13 +166,18 @@ class InternalFunc
 
   #delete one key from hash
   def delete_key_hash(hash_f, delete_key)
+    inp_fun = {:hash_f => hash_f, :delete_key => delete_key}
+    hash_f = hash_f.to_h
+    out_data = {}
     res = {}
     hash_f.each do |ggg|
       if ggg[0].to_s != delete_key.to_s
         res[ggg[0]] = ggg[1]
       end
     end
-    res
+    out_data = res
+    printer_texter({:out_data => out_data, :inp_fun => inp_fun, :fun => "delete_key_hash" }, "debug")
+    out_data
   end
 
 

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

@@ -507,6 +507,7 @@ class MongoIot
   #function for get iot platform credentials from profile
   #universal procedure. use profile or profile id
   def get_iot_oceanconn_credent_2(profile)
+    input_in = {:profile => profile}
     out_resp = {}
     begin
       result_ps = []
@@ -528,7 +529,7 @@ class MongoIot
     rescue
       out_resp = {:code => 500, :result => "get_iot_oceanconn_credent_2: Process failed"}
     end
-    internal_func.printer_texter(out_resp, "debug")
+    internal_func.printer_texter({:input_in => input_in, :out_resp => out_resp, :fun => "get_iot_oceanconn_credent_2"}, "debug")
     out_resp
   end
 
@@ -555,6 +556,7 @@ class MongoIot
 
   #universal procedure. Use id or name
   def get_device_type_info_universal(device_model)
+    input_fun = {:device_model => device_model}
     out_resp = {}
     begin
       as = internal_func.if_digit_or_string(device_model)
@@ -588,13 +590,14 @@ class MongoIot
     rescue
       out_resp = {:code => 500, :result => "get_device_type_info_universal: procedure error", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
     end
-    internal_func.printer_texter(out_resp, "debug")
+    internal_func.printer_texter({:input_fun => input_fun, :out_resp => out_resp, :fun => "get_device_type_info_universal"}, "debug")
     out_resp
   end
 
 
 
   def compare_profiles(profile1, profile2)
+    input_inf = {:profile1 => profile1, :profile2 => profile2}
     out_answ = {}
     ch1 = internal_func.if_digit_or_string(profile1)
     ch2 = internal_func.if_digit_or_string(profile2)
@@ -631,10 +634,12 @@ class MongoIot
         out_answ = {:code => 200, :result => "compare_profiles: profiles are different", :is_the_same => false, :data_type => "different"}
       end
     end
+    internal_func.printer_texter({:input_inf => input_inf, :out => out_answ, :fun => "compare_profiles"}, "debug")
     out_answ
   end
 
   def compare_device_types(type1, type2)
+    input_inf = {:type1 => type1, :type2 => type2}
     out_answ = {}
     tp1 = internal_func.if_digit_or_string(type1)
     tp2 = internal_func.if_digit_or_string(type2)
@@ -681,12 +686,15 @@ class MongoIot
         out_answ = {:code => 200, :result => "compare_device_types: profiles are different", :is_the_same => false, :data_type => "different"}
       end
     end
+    internal_func.printer_texter({:input_inf => input_inf, :out => out_answ, :fun => "compare_device_types"}, "debug")
     out_answ
   end
 
 
   #universal procedure. put there profile name or id in string or int
   def get_profile_universal(profile)
+    input_inf = {:profile => profile}
+    out = {}
     inn = internal_func.if_digit_or_string(profile)
     out = {}
     if inn[:body][:string]
@@ -694,10 +702,12 @@ class MongoIot
     else
       out = self.get_profile_name_by_id(profile.to_i)
     end
+    internal_func.printer_texter({:input_inf => input_inf, :out => out, :fun => "get_profile_universal"}, "debug")
     out
   end
 
   def modify_attr_mongo_universal(imei, attribute)
+    input_add = {:imei => imei, :attribute => attribute}
     out_resp = {}
     begin
       collection = client[:device_imei]
@@ -710,7 +720,7 @@ class MongoIot
     rescue
       out_resp = {:code => 507, :result => "modify_attr_mongo_universal: Unknown SDK error"}
     end
-    internal_func.printer_texter(out_resp, "debug")
+    internal_func.printer_texter({:input_add => input_add, :out_resp => out_resp, :fun => "modify_attr_mongo_universal"}, "debug")
     out_resp
   end
 

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.1"
+  VERSION = "1.1.7"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.7
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler