imperituroard 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f4aba43e40c3e31b5d3336e6dd8233ced0fdc47
-  data.tar.gz: 14a08ce0ee5ee4af6f0af163c4eb148e1c18274b
+  metadata.gz: 5e7e99efd1a73f476d513d802842f3f0433cd5be
+  data.tar.gz: 760abd30d5d6ea6419c0f4195c08b9dca3d73537
 SHA512:
-  metadata.gz: bbb81cd14c71ebe0693054322a33f8ad93096cada10528eb7665d8f822ec53430f42f81ccbaeb632bc7f41441509fda8dc2d0b69b54de6cdea11abe5034ac306
-  data.tar.gz: 6d9f3d756baaa25e8eacbb630822b1c26449d677caaa3dc0d47e8c79c1e514dfe6321c5370922f7b41da86ca466437f03ee1f2d45fffca990a73a4941053feff
+  metadata.gz: 6f8d0903a392cf44f300612e621ea34647cf5158c67dbd2f0fa75c7470e867e48a3d94b0676f666ed50ea6e9b40d6702467ac9a05ea9737831fe9cf024e8903f
+  data.tar.gz: 24741e66dc260aaef273175b302f840a89b4ffb7b25395e73bc1d087661f89cd54130e7c49076d4572c782a4a574adfff19c495f099ce1ac044c004d435c78dd

data/lib/imperituroard/projects/iot.rb

@@ -141,6 +141,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"])
+                    p model_data
+                    p "model_data"
                     resss = hua_aceanconnect_connector.add_new_device_on_huawei(credentials[:body][:app_id],
                                                                                 credentials[:body][:secret],
                                                                                 aaa["imei"],
@@ -1059,11 +1061,12 @@ class IotFunctions_2
                                   if resss[:body].key?("error_code") && resss[:body]["error_code"] != 200
                                     not_processed_list.append({:imei => curr_dev["imei"], :error => resss})
                                   else
+                                    p resss
                                     new_id_iot = resss[:body]
                                     new_profile_id = prof_new_id
                                     now_date = DateTime.now
                                     #finished success. update database
-                                    attribute = {profile: new_profile_id, device_type: model_data[:body]["model"], huadata: {body: new_id_iot}, updated: now_date}
+                                    attribute = {profile: new_profile_id, device_type: model_data[:body]["model"], huadata: resss, updated: now_date}
                                     answ_mongo = mongo_client.modify_attr_mongo_universal(curr_dev["imei"].to_i, attribute)
                                     if answ_mongo[:code] != 200
                                       not_processed_list.append({:imei => curr_dev["imei"], :error => "Critical error. Mongo not updated", :mongo_err => answ_mongo})

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

@@ -54,6 +54,9 @@ class HuaIot
   def get_token(app_id, secret)
     internal_func.printer_texter("get_token: start. Step1, iput: app_id: #{app_id.to_s}, secret: #{secret.to_s}", "debug")
     out_resp = {}
+    fff = {}
+    data = {}
+    url_string = ""
     begin
       path = "/iocm/app/sec/v1.1.0/login"
       url_string = "https://" + platformip + ":" + platformport + path
@@ -73,16 +76,19 @@ class HuaIot
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
+      p res.code
+      p res.message
+      p res.body.to_s
       out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
       fff = {:func => "get_token",
              :iot_fun => "",
              :req_header => {:content_type => 'application/x-www-form-urlencoded',
                              :platform => "Huawei oceanconnect"
              }}
-      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     rescue
       out_resp = {:code => 500, :message => "failed get token"}
     end
+    client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     jjj = {:procedure => "get_token", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
     out_resp
@@ -93,6 +99,9 @@ class HuaIot
 
     internal_func.printer_texter("token_logout Step1 token: #{token}", "debug")
     out_resp = {}
+    fff = {}
+    data = {}
+    url_string = ""
     begin
       path = "/iocm/app/sec/v1.1.0/logout"
       url_string = "https://" + platformip + ":" + platformport + path
@@ -116,10 +125,14 @@ class HuaIot
              :iot_fun => "logout",
              :platform => "Huawei oceanconnect"
       }
-      client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
+      p res.code
+      p res.message
+      p res.body.to_s
+
     rescue
       out_resp = {:code => 500, :message => "failed logout token"}
     end
+    client_iot_mongo.audit_iot_logger(fff, url_string, data, out_resp)
     jjj = {:procedure => "token_logout", :answ => out_resp}
     internal_func.printer_texter(jjj, "debug")
     out_resp

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

@@ -540,7 +540,7 @@ class MongoIot
         result_ps.append(row)
       }
       dattaa = result_ps[0]
-      if dattaa!=nil
+      if dattaa != nil
         out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
       else
         out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
@@ -566,9 +566,9 @@ class MongoIot
         }
         dattaa = result_ps[0]
         if dattaa!=nil
-          out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
+          out_resp = {:code => 200, :result => "get_device_type_info_universal: Request completed successfully", :body => dattaa}
         else
-          out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+          out_resp = {:code => 404, :result => "get_device_type_info_universal: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
         end
       else
         result_ps2 = []
@@ -578,9 +578,9 @@ class MongoIot
         }
         dattaa = result_ps2[0]
         if dattaa!=nil
-          out_resp = {:code => 200, :result => "get_device_type_info_by_model: Request completed successfully", :body => dattaa}
+          out_resp = {:code => 200, :result => "get_device_type_info_universal: Request completed successfully", :body => dattaa}
         else
-          out_resp = {:code => 404, :result => "get_device_type_info_by_model: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
+          out_resp = {:code => 404, :result => "get_device_type_info_universal: Device info not found", :body => {"model" => device_model, "ManufacturerID" => "unknown", "ManufacturerNAME" => "unknown", "device_type" => "unknown"}}
         end
       end
 

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end
 

metadata

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