imperituroard 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d355c409ea8712d63e24193ade8edc75da42d22c
-  data.tar.gz: 57d1a26a82303b7ff92dcae72080d8483b04f760
+  metadata.gz: 1a07941a7445bf4aa9aa71e24b29e541ffbc92d4
+  data.tar.gz: 1efa8e5bc158c4450aaadf8928cac6930a673bf9
 SHA512:
-  metadata.gz: 0777e7b6d50cdf31b7a0e01469510ea12ab8bc33d2f94566a2c8663021305e5018b10729c84caf4c5ddc571edc63ba622430682e8fbf36b6ca8a8dd4284523d1
-  data.tar.gz: a3ac19f8a9d18a3faeb807bd445aa558291b016f9676ffff9ae66f11124a42ad40420993cab190d3a47498a153ac29408a620cf1ce5e0a415408238934e64d48
+  metadata.gz: 9248cfe42be47e1d1838db5ee49663a345a34d71ba42cb22e212ee8ff22ccf7b1ac14baeb389e242f2bdf43fad35e72304057e00fc6e209cb00de5badc67a55d
+  data.tar.gz: 35a571da88e98b2dd14554a6725006c1c9d02d68d9c7657635b0864a42a02f565306848ca9c70f5f4a96279b18ab8e9f869e316e0746c8b112ef860298c58baa

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

@@ -19,19 +19,17 @@ class MongoIot
   end
 
   def audit_logger(proc_name, src_ip, input_json, output_json)
-    begin
     collection = client[:audit]
     doc = {
-        proc_name: proc_name,
-        sender: {src_ip: src_ip},
-        input_params: input_json,
-        output_params: output_json
+        :proc_name => proc_name,
+        :sender => {:src_ip => src_ip},
+        :input_params => input_json,
+        :output_params => output_json
     }
+    p doc
     result = collection.insert_one(doc)
     p result
-    rescue
-      continue
-    end
+
   end
 
   def get_profiles_by_login(login)

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/imperituroard.rb

@@ -84,6 +84,10 @@ class Iot
     @mongo_client = MongoIot.new(mongoip, mongoport, mongo_database)
   end
 
+  #error list
+
+  #:code => 507, :result => "Unknown SDK error"
+
 
   #1. Add device to profile
   #login - login for client identification
@@ -101,7 +105,10 @@ class Iot
   #}
   #massive commands
   #+
-  def add_device_to_profile(login, profile, imei_list)
+  def add_device_to_profile(login, imei_list)
+    input_json = {:login => login, :imei_list =>imei_list}
+
+    begin
     imei = []
     list1 = {}
     for_insert = []
@@ -109,7 +116,7 @@ class Iot
       imei.append(t["imei"])
       list1[t["imei"]] = t
     end
-    get_login_info = mongo_client.check_login_profile_permiss(login, profile)[:code]
+    get_login_info = mongo_client.check_login_profile_permiss(login, "profile")[:code]
     if get_login_info==200
       list_exists = mongo_client.check_imei_exists(imei)
       for_upload = imei - list_exists
@@ -119,6 +126,10 @@ class Iot
       mongo_client.imei_insert_list(for_insert)
     else get_login_info
     end
+    rescue
+     return  {:code => 507, :result => "Unknown SDK error"}
+    end
+    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
   end
 
 
@@ -128,9 +139,11 @@ class Iot
   # imei_list =[41234,23452345,132412]
   #+
   def device_find(login, imei_list)
+    input_json = {:login => login, :imei_list =>imei_list}
 
     ime_list_approved = []
     ime_list_notapproved = []
+
     begin
       for t in imei_list
         prof_name1 = mongo_client.get_profile_name_from_imei(t)
@@ -144,10 +157,13 @@ class Iot
         end
       end
       data = mongo_client.get_imei_info_from_db(ime_list_approved)
-      {:code=>507, :result => "Unknown error", :data => data}
+      {:code => 507, :result => "Unknown SDK error", :data => data}
     rescue
-      {:code=>507, :result => "Unknown error"}
+      {:code => 507, :result => "Unknown SDK error"}
     end
+
+    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
+
   end
 
   #3 device modify, change imei
@@ -158,6 +174,8 @@ class Iot
   #im_list = [{:imei_old=>7967843245667, :imei_new=>7967843245665}]
   #+
   def imei_replace(login, im_list)
+    input_json = {:login => login, :imei_list =>im_list}
+    begin
     for a in im_list
       p a
       prof_name1 = mongo_client.get_profile_name_from_imei(a[:imei_old])
@@ -167,6 +185,12 @@ class Iot
         mongo_client.device_modify_any_attr_mongo(a[:imei_old],{:imei=>a[:imei_new]})
       end
     end
+    rescue
+      {:code => 507, :result => "Unknown SDK error"}
+    end
+
+    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
+
   end
 
 
@@ -178,11 +202,22 @@ class Iot
   #login="test"
   #+
   def device_remove(login, imei)
+
+    input_json = {:login => login, :imei_list =>imei}
+    resp = {}
+
+    begin
+
     prof_name = mongo_client.get_profile_name_from_imei(imei)
     permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
     if permiss==200
-      mongo_client.device_remove_single_mongo(imei)
+      resp = mongo_client.device_remove_single_mongo(imei)
+    end
+    rescue
+      {:code => 507, :result => "Unknown SDK error"}
     end
+    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
+    resp
   end
 
 
@@ -193,15 +228,24 @@ class Iot
   #newdevice_list=[{:imei=>7967843245665, :address=>"Golubeva51"}]
   #+
   def device_add_address(login, newdevice_list)
+    input_json = {:login => login, :devices => newdevice_list}
+    begin
+    resp = {}
     for p in newdevice_list
       prof_name = mongo_client.get_profile_name_from_imei(p[:imei])
+
       p "prof_name"
       p prof_name
       permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
       if permiss==200
-        mongo_client.device_modify_attr_mongo(p[:imei],p[:address])
+        resp = mongo_client.device_modify_attr_mongo(p[:imei],p[:address])
       end
     end
+      return resp
+    rescue
+      {:code => 507, :result => "Unknown SDK error"}
+    end
+    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
   end
 
   #6 add service by SPA
@@ -212,6 +256,10 @@ class Iot
   #newdevice_list=[{:imei=>7967843245665, :attributes=>{:address=>"Golubeva51", :profile=>"wqeqcqeqwev", :msisdn=>375298766719, :imsi=>25702858586756875}}]
   #+
   def add_service(login, device_list)
+    input_json = {:login => login, :devices => device_list}
+
+    begin
+
     for g in device_list
       prof_name1 = mongo_client.get_profile_name_from_imei(g[:imei])
       p prof_name1
@@ -236,6 +284,12 @@ class Iot
         mongo_client.device_modify_any_attr_mongo(g[:imei],attr)
       end
     end
+    rescue
+      {:code => 507, :result => "Unknown SDK error"}
+    end
+
+    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
+
   end
 
 

metadata

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