imperituroard 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51bce400dffd4ca919cb7295742c17015350408
-  data.tar.gz: 68b2e9f01ba2b35953ddf8f47a91bdeb153144b1
+  metadata.gz: 0c14a6e4b874b88dee7fcb385a9bdc1a3421171c
+  data.tar.gz: e0db9b2f11a898a8eda22a0075da8f88c5902f6b
 SHA512:
-  metadata.gz: b660a1144c483fdf9f49cd46790e33b54d525c7a81eebe664d8dc623b8bb769ef8a0811e92de4e4e2d3d138f8ee99a585e0a75be466b80eee25f5fee1a29e291
-  data.tar.gz: a8f58183102edd7bbd8a003bb4b557ddc27264f7bed4a8e96e566ad1b26a17a053b95e6f048031da5ea3553dc78c41929b584ea0bf70d26b1043cb030a290cce
+  metadata.gz: 3c01ba2b79798b63b81137c34d410834b0d1814101c4b70dfb788b974b6835a07954c36e30f70a0dbc28d2aa46c3857542502527daf8fb978f0915ed953648e0
+  data.tar.gz: 013d5fa3179ac944216c3c7ae87e96bbc54c3c65d03c069a45fa21b03bbb558ecf3a35725ef9704b74e132601e68ad718871fb44b4f3524c4e8449e49a793340

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

@@ -213,6 +213,7 @@ class HuaIot
       request['Authorization'] = 'Bearer ' + token
       request['app_key'] = app_id
       res = https.request(request)
+      p "res.code"
       p res.code
       p res.body
       if res.body != nil
@@ -509,7 +510,6 @@ class HuaIot
     p uri.port
     p uri.path
 
-
     cert_file = "/Users/imperituroard/Desktop/cert.crt"
     key_file = "/Users/imperituroard/Desktop/key.pem"
 
@@ -526,7 +526,6 @@ class HuaIot
         :secret => "ppeMsOq6zdb2fSUH4GoRooS_FgEa"
     }
 
-
     #request['app_key'] = 'ppeMsOq6zdb2fSUH4GoRooS_FgEa'
     #request['Authorization'] = 'Bearer ppeMsOq6zdb2fSUH4GoRooS_FgEa'
     request.content_type = 'application/x-www-form-urlencoded'
@@ -535,9 +534,7 @@ class HuaIot
     res = https.request(request)
     p res.code
     p res.message
-
     p parse_token(res.body)
-
   end
 
   # App ID

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

@@ -135,8 +135,25 @@ class InternalFunc
   end
 
 
+  #procedure for check input imei
+  def imei_validate(imei)
 
+    input = {:imei => imei}
 
+    answer = {}
+    if imei.is_a? Integer
+
+      if imei.to_s.length>=14 && imei.to_s.length<=17
+        answer = {:code => 200, :result => "IMEI correct.", :checked => true}
+      else
+        answer = {:code => 401, :result => "invalid IMEI length.", :checked => false}
+      end
+    else
+      answer = {:code => 400, :result => "Invalid IMEI. Data is not integer", :checked => false}
+    end
+    printer_texter({:answer => answer, :input => input}, "debug")
+    answer
+  end
 
   def test()
     p "eeeeeeeeeeeeeeeeeeeeeeee"

data/lib/imperituroard/projects/iot.rb

@@ -72,27 +72,37 @@ class IotFunctions_2
           processed_list = []
 
           for ii in imei_list
-            list1[ii["imei"]] = ii
-            imei.append(ii["imei"])
-          end
-          list_checked = mongo_client.check_imei_exists(imei)
-          for ss in list_checked[:body][:exists]
-            not_processed_list.append({:imei => ss, :error => "Device exists in database"})
+            valid_resp = internal_func.imei_validate(ii["imei"])
+            if valid_resp[:checked]
+              list1[ii["imei"]] = ii
+              imei.append(ii["imei"])
+            else
+              not_processed_list.append({:imei => ii["imei"], :error => valid_resp[:result]})
+            end
           end
 
-          for jj in list_checked[:body][:not_exists]
-            begin
-              get_login_info = mongo_client.check_login_prof_perm_id_one(login, list1[jj]["profile"])[:code]
-              if get_login_info==200
-                for_insert.append(list1[jj])
-              else
-                not_processed_list.append({:imei => list1[jj], :error => "Permission denied for this profile"})
+          if imei != []
+            list_checked = mongo_client.check_imei_exists(imei)
+
+            for ss in list_checked[:body][:exists]
+              not_processed_list.append({:imei => ss, :error => "Device exists in database"})
+            end
+
+            for jj in list_checked[:body][:not_exists]
+              begin
+                get_login_info = mongo_client.check_login_prof_perm_id_one(login, list1[jj]["profile"])[:code]
+                if get_login_info==200
+                  for_insert.append(list1[jj])
+                else
+                  not_processed_list.append({:imei => list1[jj], :error => "Permission denied for this profile"})
+                end
+              rescue
+                not_processed_list.append({:imei => list1[jj], :error => "Unknown error"})
               end
-            rescue
-              not_processed_list.append({:imei => list1[jj], :error => "Unknown error"})
             end
           end
 
+
           begin
             added_on_iot_platf = []
             if for_insert!=[]
@@ -433,8 +443,12 @@ class IotFunctions_2
 
                 imei_data = mongo_client.get_imei_info_from_db([imei])
                 if imei_data[:body]!=[]
-                  ans = hua_aceanconnect_connector.remove_one_device_from_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"])
-                  p ans
+                  ans = {}
+                  if imei_data[:body][0]["huadata"]["body"]["deviceId"] != nil
+                    ans = hua_aceanconnect_connector.remove_one_device_from_iot(credentials[:body][:app_id], credentials[:body][:secret], imei_data[:body][0]["huadata"]["body"]["deviceId"])
+                  else
+                    ans = {:code => "204", :result => "Not processed by iot platform. deviceId not found in mongoDB"}
+                  end
                   if ans[:code]=="204" or ans[:code]=="200"
                     resp = mongo_client.device_remove_single_mongo(imei)
                   else

data/lib/imperituroard/version.rb

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

metadata

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