imperituroard 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c27b1af6fc8da6333b67a5c283bb1ae02a7a475
-  data.tar.gz: 1191a3d14976315a5d03b4c4efd10208a36e65f9
+  metadata.gz: 46aa713f31f0c1e5b2d3f03b38f982e3e8c81f49
+  data.tar.gz: b467695375d37a96b7b83d367ecae06f1cee0f9a
 SHA512:
-  metadata.gz: fe7261a30e0f300ad63eda191ffe88ec4fae8fac984fa5dc460df5db13da1f096df2b1b378220dee2ec9d4abd9541fb22edeec1f0731953540e863fbb7c99955
-  data.tar.gz: 4abebbab6074f3dd1ae35d5bb66cab71eb424950d3aafb640669200f4ff976cdf1f84231c3c77ff96c4c4262b0b037e907232c838cb2c2eb68842d7462801616
+  metadata.gz: a3fbecc2ba5f4c8d2ff27596a3722ff478a2353802c7528a782fb9ba4f517b7adb1594026be032afb3e1a18706b381c9806dfc936c4e1fd7b934675433c3b62e
+  data.tar.gz: 36a662f1bb948831b07e42d061364909bf14ada71f7eabd2ea49c7e9adda2efd55de9dae9f29906fe691b08f2f7c4a12e5e1782f303686cd5e45800b047bb041

data/lib/imperituroard/phpipamcps.rb

@@ -6,6 +6,7 @@ require 'savon'
 
 class Pcps
   attr_accessor :wsdl, :endpoint, :namespace, :clientcps
+
   def initialize(wsdl, endpoint, namespace)
     @wsdl = wsdl
     @endpoint = endpoint
@@ -22,7 +23,7 @@ class Pcps
 
   def avp_attr_list(username)
 
-    message2 = { :networkId => username }
+    message2 = {:networkId => username}
     response = clientcps.call(:get_subscriber) do
       message(message2)
     end
@@ -96,7 +97,7 @@ class Pcps
 
 
   def get_current_attributes(msisdn)
-    message2 = { :networkId => msisdn }
+    message2 = {:networkId => msisdn}
     response = clientcps.call(:get_subscriber) do
       message(message2)
     end
@@ -131,10 +132,10 @@ class Pcps
       end
     end
 
-    added_res =  add_attribute(res_list, new_msisdn)
+    added_res = add_attribute(res_list, new_msisdn)
 
     if added_res == "0"
-     ans = del_attribute(old_msisdn)
+      ans = del_attribute(old_msisdn)
       p ans
     end
 
@@ -146,5 +147,4 @@ class Pcps
   end
 
 
-
 end

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

@@ -62,6 +62,8 @@ class MongoIot
   end
 
   def get_imei_info_from_db(imeilist)
+    p imeilist
+    p "imeilist"
     begin
       req2 = []
       result_ps = []
@@ -119,7 +121,7 @@ class MongoIot
         p "sgsgsd"
         for j in get_login_info[:body]
           p j
-          if j["profile_id"]==dst_profile["profile_id"]
+          if j["profile_id"].to_i==dst_profile["profile_id"].to_i
             access=0
           end
           if access==0
@@ -145,18 +147,18 @@ class MongoIot
     p get_login_info
     access=1
     if get_login_info[:body]!=[]
-        p "sgsgsd"
-        for j in get_login_info[:body]
-          p j
-          if j["profile_id"]==profile_id
-            access=0
-          end
-          if access==0
-            return {:code => 200, :result => "Permission granted"}
-          else
-            return {:code => 400, :result => "Access denied. This incident will be reported."}
-          end
+      p "sgsgsd"
+      for j in get_login_info[:body]
+        p j
+        if j["profile_id"].to_i==profile_id.to_i
+          access=0
+        end
+        if access==0
+          return {:code => 200, :result => "Permission granted"}
+        else
+          return {:code => 400, :result => "Access denied. This incident will be reported."}
         end
+      end
     else
       {:code => 500, :result => "Login not found"}
     end
@@ -179,7 +181,7 @@ class MongoIot
     p not_ex
     p res_exists
     {:code => 200, :result => "check_imei_exists: Request completed successfully",
-            :body => {:exists => res_exists, :not_exists => not_ex}}
+     :body => {:exists => res_exists, :not_exists => not_ex}}
   end
 
 
@@ -248,12 +250,18 @@ class MongoIot
 
   def device_remove_single_mongo(imei)
 
-    collection = client[:device_imei]
-    doc = {
-        "imei" => imei
-    }
-    result = collection.delete_many(doc)
-    p result
+    begin
+      collection = client[:device_imei]
+      doc = {
+          "imei" => imei
+      }
+      result = collection.delete_many(doc)
+      p result
+      return {:code => 200, :result => "device_remove_single_mongo: Request completed successfully"}
+    rescue
+      return {:code => 507, :result => "device_remove_single_mongo: Unknown SDK error"}
+    end
+
   end
 
   def device_modify_attr_mongo(imei, address)
@@ -264,9 +272,9 @@ class MongoIot
       }
       sett = {'$set' => {address: address}}
       result = collection.update_one(doc, sett)
-      p result
+      return {:code => 200, :result => "device_modify_attr_mongo: Request completed successfully"}
     rescue
-      continue
+      return {:code => 507, :result => "device_remove_single_mongo: Unknown SDK error"}
     end
   end
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/imperituroard.rb

@@ -23,7 +23,7 @@ module Imperituroard
   # Your code goes here...
 end
 
-module Phpipam
+module PhpipamModule
   def test(ggg)
     p ggg
   end
@@ -81,7 +81,7 @@ class Pipam
     end
   end
 
-  include Phpipam
+  include PhpipamModule
 end
 
 class Iot
@@ -131,44 +131,50 @@ class Iot
     begin
       thr1 = Thread.new do
 
-      imei = []
-      list1 = {}
-      for_insert = []
-      not_processed_list = []
-      processed_list = []
+        imei = []
+        list1 = {}
+        for_insert = []
+        not_processed_list = []
+        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"})
-      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"})
+        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"})
         end
-        rescue
-          not_processed_list.append({:imei=>list1[jj], :error => "Unknown error"})
-          end
-      end
 
-      begin
-        if for_insert!=[]
-      mongo_client.imei_insert_list(for_insert)
-      resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
-        else
-          resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+        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
         end
-      rescue
-        resp_out = {:code => 505, :result => "Error with database communication"}
+
+        begin
+          if for_insert!=[]
+            ##Logic for IOT Platform connection###
+
+            #########end iot platform logic#######
+
+            mongo_client.imei_insert_list(for_insert)
+            resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+          else
+            resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+
+          end
+        rescue
+          resp_out = {:code => 505, :result => "Error with database communication"}
         end
       end
     rescue
@@ -232,93 +238,207 @@ class Iot
     resp
   end
 
-  #3 device modify, change imei
+  #!3 device modify, change imei
   #login
   #imei_old
   #imei_new
   #massive commands
-  #im_list = [{:imei_old=>7967843245667, :imei_new=>7967843245665}]
-  #+
-  def imei_replace(login, im_list)
+  #im_list = [{"imei_old"=>7967843245667, "imei_new"=>7967843245665}]
+  #++
+  def imei_replace(login, im_list, remote_ip)
     input_json = {:login => login, :imei_list => im_list}
+
+    li_new_imei = []
+    list1 = {}
+    not_processed_list = []
+    approved_list = []
+    resp_out = {}
+
+    for pr1 in im_list
+      p "pr1"
+      p pr1
+      li_new_imei.append(pr1["imei_new"])
+      list1[pr1["imei_new"]]=pr1["imei_old"]
+    end
+
+    p list1
+
     begin
-      for a in im_list
-        p a
-        prof_name1 = mongo_client.get_profile_name_from_imei(a[:imei_old])
-        p prof_name1
-        permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
-        if permiss1==200
-          mongo_client.device_modify_any_attr_mongo(a[:imei_old], {:imei => a[:imei_new]})
+
+      thr3 = Thread.new do
+
+        list_checked = mongo_client.check_imei_exists(li_new_imei)
+        for ss in list_checked[:body][:exists]
+          not_processed_list.append({:record => {:imei_old => list1[ss], :imei_new => ss}, :error => "New IMEI exists in database"})
         end
+
+        step2_list = list_checked[:body][:not_exists]
+
+        for a in step2_list
+          begin
+            p "list1[a]"
+            p list1
+            p a
+            p list1[a]
+            prof_name1 = mongo_client.get_profile_name_from_imei(list1[a])
+
+            p prof_name1
+            if prof_name1[:code]==200
+
+              p "if prof_name1[:code]==200"
+
+              permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1[:body]["profile"])[:code]
+              p "permiss1"
+              p permiss1
+              if permiss1==200
+
+                ##Logic for IOT Platform connection###
+
+                #########end iot platform logic#######
+
+                mongo_client.device_modify_any_attr_mongo(list1[a], {:imei => a})
+
+                approved_list.append({:imei_old => list1[a], :imei_new => a})
+
+
+              else
+                not_processed_list.append({:record => {:imei_old => list1[a], :imei_new => a}, :error => "Old IMEI modification denied"})
+              end
+            else
+              not_processed_list.append({:record => {:imei_old => list1[a], :imei_new => a}, :error => "Old IMEI not exists in database"})
+            end
+          rescue
+            not_processed_list.append({:record => {:imei_old => list1[a], :imei_new => a}, :error => "Unknown error"})
+          end
+        end
+
+        if approved_list!=[]
+          resp_out = {:code => 200, :result => "Request completed successfully", :data => {:approved_list => approved_list, :unapproved_list => not_processed_list}}
+        else
+          resp_out = {:code => 202, :result => "Nothing to do", :data => {:approved_list => approved_list, :unapproved_list => not_processed_list}}
+        end
+
       end
+
+
     rescue
-      {:code => 507, :result => "Unknown SDK error"}
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
 
-    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
+    thr3.join
+    mongo_client.audit_logger("imei_replace", remote_ip, input_json, resp_out)
+
+    resp_out
 
   end
 
 
-  #4 remove device
+  #!4 remove device
   #login
   #imei
   # not massive commands
   #imei=11341341234
   #login="test"
-  #+
-  def device_remove(login, imei)
+  #++
+  def device_remove(login, imei, remote_ip)
 
     input_json = {:login => login, :imei_list => imei}
-    resp = {}
+    resp_out = {}
 
     begin
-
+      thr4 = Thread.new do
       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
-        resp = mongo_client.device_remove_single_mongo(imei)
+      if prof_name[:code]==200
+        permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
+        if permiss[:code]==200
+
+          ##Logic for IOT Platform connection###
+
+          #########end iot platform logic#######
+
+          resp = mongo_client.device_remove_single_mongo(imei)
+
+          if resp[:code]==200
+            resp_out = {:code => 200, :result => "Request completed successfully"}
+          else
+            resp_out=resp
+          end
+        else
+          resp_out=permiss
+        end
+      else
+        resp_out=prof_name
+      end
       end
+
     rescue
-      {:code => 507, :result => "Unknown SDK error"}
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
-    resp
+    thr4.join
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out)
+    resp_out
   end
 
 
-  #5 add address to device
+  #!5 add address to device
   #login
   #imei = newdevice_list
   #address = newdevice_list
   #newdevice_list=[{:imei=>7967843245665, :address=>"Golubeva51"}]
-  #+
-  def device_add_address(login, newdevice_list)
-    add_functions_connector.telegram_message(newdevice_list.to_s)
+  #++
+  def device_add_address(login, newdevice_list, remote_ip)
+    #add_functions_connector.telegram_message(newdevice_list.to_s)
     p newdevice_list
     p "gas"
     p MyJSON.valid?(newdevice_list[0].to_s)
     p "sdfsdfgs"
     input_json = {:login => login, :devices => newdevice_list}
+    resp_out = {}
+    not_processed = []
+    processed = []
     begin
-      resp = {}
+      thr5 = Thread.new do
       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
-          resp = mongo_client.device_modify_attr_mongo(p[:imei], p[:address])
+        if prof_name[:code]==200
+          p "prof_name"
+          p prof_name
+          permiss = mongo_client.check_login_profile_permiss(login, prof_name[:body]["profile"])
+          if permiss[:code]==200
+
+            ##Logic for IOT Platform connection###
+
+            #########end iot platform logic#######
+
+
+            resp = mongo_client.device_modify_attr_mongo(p[:imei], p[:address])
+            if resp[:code]==200
+              processed.append({:imei=>p[:imei]})
+            end
+          else
+            not_processed.append({:imei=>p[:imei], :address=>p[:address], :error=>permiss})
+          end
+        else
+          not_processed.append({:imei=>p[:imei], :address=>p[:address], :error=>prof_name})
         end
       end
-      return resp
+
+      if processed!=[]
+        resp_out = {:code => 200, :result => "Request completed successfully", :body => {:imei_processed => processed, :error_list => not_processed}}
+      else
+        resp_out = {:code => 202, :result => "Nothing processed", :body => {:imei_processed => processed, :error_list => not_processed}}
+      end
+      end
     rescue
-      {:code => 507, :result => "Unknown SDK error"}
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
+    thr5.join
+    mongo_client.audit_logger("device_add_address", remote_ip, input_json, resp_out)
+    resp_out
   end
 
+
   #6 add service by SPA
   #imei
   #profile
@@ -326,7 +446,12 @@ class Iot
   #msisdn
   #newdevice_list=[{:imei=>7967843245665, :attributes=>{:address=>"Golubeva51", :profile=>"wqeqcqeqwev", :msisdn=>375298766719, :imsi=>25702858586756875}}]
   #+
-  def add_service(login, device_list)
+  def add_service(login, device_list, remote_ip)
+
+    resp_out = {}
+
+    not_processed = []
+    processed = []
 
 
     input_json = {:login => login, :devices => device_list}
@@ -334,35 +459,69 @@ class Iot
     begin
 
       for g in device_list
+        p g
+
         prof_name1 = mongo_client.get_profile_name_from_imei(g[:imei])
         p prof_name1
-        permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
-        p permiss1
-        permiss2 = mongo_client.check_login_profile_permiss(login, g[:attributes][:profile])[:code]
-        if permiss1==200 && permiss2==200
 
-          attr = g[:attributes]
-          #mod_attr = {}
+        if prof_name1[:code]==200
+          p prof_name1
+          permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1[:body]["profile"])
+          p "permiss1"
+          p permiss1
+          if permiss1[:code]==200
+
+            if g[:attributes].key?(:profile)
+              permiss2 = mongo_client.check_login_profile_permiss(login, g[:attributes][:profile])[:code]
+
+              if permiss2==200
+
+                attr = g[:attributes]
+                #mod_attr = {}
+
+                if attr.key?(:profile)
+                  if attr[:profile].is_a? Integer
+                    p "Ok"
+                  else
+                    p new = mongo_client.get_profile_id_by_name(attr[:profile])
+                    attr[:profile] = new["profile_id"]
+                  end
+                end
+                p attr
+
+                mongo_client.device_modify_any_attr_mongo(g[:imei], attr)
+
+                processed.append(g[:imei])
+
+              else
+                not_processed.append({:imei=>g[:imei], :description=> "New profile permission error", :error=>permiss2 })
+              end
 
-          if attr.key?(:profile)
-            if attr[:profile].is_a? Integer
-              p "Ok"
             else
-              p new = mongo_client.get_profile_id_by_name(attr[:profile])
-              attr[:profile] = new["profile_id"]
+              attr = g[:attributes]
+              mongo_client.device_modify_any_attr_mongo(g[:imei], attr)
+
+              processed.append(g[:imei])
+
             end
+
+
+          else
+            not_processed.append({:imei=>g[:imei], :description=> "Old profile permission error", :error=>permiss1 })
           end
-          p attr
 
-          mongo_client.device_modify_any_attr_mongo(g[:imei], attr)
+        else
+          not_processed.append({:imei=>g[:imei],:error=>prof_name1})
         end
+
       end
+      resp_out = {:code => 200, :result => "Request completed successfully", :body => {:imei_processed => processed, :error_list => not_processed}}
+
     rescue
-      {:code => 507, :result => "Unknown SDK error"}
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
-
-    mongo_client.audit_logger("device_remove", "127.0.0.1", input_json, "resp")
-
+    mongo_client.audit_logger("device_remove", remote_ip, input_json, resp_out)
+    resp_out
   end
 
 

metadata

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