imperituroard 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e97d149199ca8d19d1f44fd7efa93c83fb3735
-  data.tar.gz: c3fb37c6327ba5f80409e8a1de60eacef665b16d
+  metadata.gz: 77b3e174ab86faf541db078e594c9a5910a3ccb1
+  data.tar.gz: ba7fa9723abb400f77b7ae99b43313514fc72e62
 SHA512:
-  metadata.gz: 76330a50f5c3e066b16374ce5ec656c855bb6988987d608f3d42ff0cbf1e7677562c071ca4ccf3b693affa51d517710f874d0dadac3d9f93e7f4a6212d96ea17
-  data.tar.gz: 8f71b08f56d0cc2134048be60d81eb42f73d5f6fc8e2a5b909d876cf398be587f774407603b0beb77fc1c6951037734211482da73a3740c7ae5b2881c94c5f7a
+  metadata.gz: 60e8fe64d72851a8a09ba3fd74a5a8917587e09fb03cf427289aa543237f5c9e7e8e6162c6f405ea93220d48044d40b619fbaa6d1f73c46c337c5cdb39757863
+  data.tar.gz: 9939203fac5d5fc902a9c1abf361a02d3bccb883d3442bf7117d1d3198d6b21fd7d6eeba532b0c01df3803d576c2790bf849b63fe9f580a2911bbe457b41e11b

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

@@ -46,31 +46,81 @@ class InternalFunc
 
   def if_digit_or_string(data)
 
+
     input_params = {:data => data}
     output_params = {}
+
+    data = data.to_s
     str_incr = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
                 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
     ]
     d_a_t_a = data.split('')
-
     is_string = 0
-
     for ddd in d_a_t_a
       if str_incr.include?(ddd)
         is_string = 1
       end
     end
-
     if is_string == 0
       output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => false}}
     else
       output_params = {:code => 200, :result => "if_digit_or_string: Request processed", :body => {:string => true}}
     end
-
     output_params
 
   end
 
+  #make answer in format that soapgw receive
+  def iot_create_dev_soapgw_answer(input_params, output_answer)
+
+    output_info = {}
+    begin
+
+    if output_answer[:code] != 200
+      deviceserr = []
+      failednum = input_params[:imei_list].length
+      for gg in input_params[:imei_list]
+        deviceserr.append({:failedimei => gg["imei"]})
+      end
+      output_info = { :code => output_answer[:code],
+                      :result => output_answer[:result],
+                      :processednum => 0,
+                      :failednum => failednum,
+                      :deviceserr => deviceserr
+      }
+
+    else
+      deviceserr = []
+      failednum = output_answer[:body][:error_list].length
+      processednum = output_answer[:body][:imei_processed].length
+      for gg in output_answer[:body][:error_list]
+        deviceserr.append({:failedimei => gg["imei"]})
+      end
+      output_info = { :code => output_answer[:code],
+                      :result => output_answer[:result],
+                      :processednum => processednum,
+                      :failednum => failednum,
+                      :deviceserr => deviceserr
+      }
+    end
+
+    rescue
+      output_info = { :code => 500,
+                      :result => "iot_create_dev_soapgw_answer: Unknown SDK error",
+                      :processednum => 0,
+                      :failednum => 0,
+                      :deviceserr => []
+      }
+    end
+
+    # example = { :code => :integer,
+    #   :result => :string,
+    #   :processednum => :integer,
+    #   :failednum => :integer,
+    #   :deviceserr => [{:failedimei=>:integer}]
+    # }
+    output_info
+  end
 
 
   def test()

data/lib/imperituroard/{iot.rb → projects/iot.rb}

@@ -4,8 +4,8 @@ require 'imperituroard/projects/iot/mongoconnector'
 require 'imperituroard/projects/iot/hua_oceanconnect_adapter'
 require 'imperituroard/projects/iot/add_functions'
 require 'imperituroard/projects/iot/internal_functions'
-require "imperituroard/phpipamdb"
-require "imperituroard/phpipamcps"
+require "imperituroard/projects/wttx/phpipamdb"
+require "imperituroard/projects/wttx/phpipamcps"
 require 'json'
 require 'ipaddr'
 require 'date'
@@ -120,10 +120,16 @@ class IotFunctions_2
                                                                                 model_data[:body]["model"]
                     )
                     if resss[:code]=="200"
-                      s1 = aaa
-                      s1[:huadata] = resss
-                      s1[:created] = DateTime.now
-                      added_on_iot_platf.append(s1)
+
+                      if resss[:body].key?("error_code") && resss[:body]["error_code"] != 200
+                        not_processed_list.append({:imei => aaa["imei"], :error => resss})
+                      else
+                        s1 = aaa
+                        s1[:huadata] = resss
+                        s1[:created] = DateTime.now
+                        added_on_iot_platf.append(s1)
+                      end
+
                     else
                       not_processed_list.append({:imei => aaa["imei"], :error => resss})
                     end
@@ -158,6 +164,9 @@ class IotFunctions_2
     end
     thr1.join
 
+
+    resp_out[:body][:tosoapgw] = internal_func.iot_create_dev_soapgw_answer(input_json, resp_out)
+
     mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out, real_ip)
     resp_out
   end
@@ -802,12 +811,9 @@ class IotFunctions_2
       else
         output_answ = {:code => 505, :result => "Unknown SDK error"}
       end
-
     rescue
-
       output_answ = {:code => 507, :result => "Unknown SDK error"}
     end
-
     mongo_client.audit_logger("get_info_data_profile_2", remote_ip, input_params, output_answ, real_ip)
     output_answ
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/imperituroard.rb

@@ -3,10 +3,11 @@ $LOAD_PATH.unshift File.expand_path("../projects/wttx", __dir__)
 $LOAD_PATH.unshift File.expand_path("../projects/mhub", __dir__)
 $LOAD_PATH.unshift File.expand_path("../projects/mhub/subs/dabrab", __dir__)
 $LOAD_PATH.unshift File.expand_path("../platforms/cps", __dir__)
+$LOAD_PATH.unshift File.expand_path("../projects", __dir__)
 
 require "imperituroard/version"
-require "imperituroard/phpipamdb"
-require "imperituroard/phpipamcps"
+require "imperituroard/projects/wttx/phpipamdb"
+require "imperituroard/projects/wttx/phpipamcps"
 require "imperituroard/projects/iot/mongoconnector"
 require "imperituroard/projects/iot/hua_oceanconnect_adapter"
 require "imperituroard/projects/iot/add_functions"
@@ -15,7 +16,7 @@ require 'imperituroard/projects/mhub/infobip'
 require 'imperituroard/projects/mhub/sk'
 require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
 require 'imperituroard/projects/mhub/subs/dabrab/dabrab_platform'
-require 'imperituroard/iot'
+require 'imperituroard/projects/iot'
 require 'imperituroard/platforms/cps/qps_connector'
 require 'json'
 require 'ipaddr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,11 +159,9 @@ files:
 - lib/.DS_Store
 - lib/imperituroard.rb
 - lib/imperituroard/.DS_Store
-- lib/imperituroard/iot.rb
-- lib/imperituroard/phpipamcps.rb
-- lib/imperituroard/phpipamdb.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
+- lib/imperituroard/projects/iot.rb
 - lib/imperituroard/projects/iot/add_functions.rb
 - lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb
 - lib/imperituroard/projects/iot/internal_functions.rb
@@ -172,6 +170,8 @@ files:
 - lib/imperituroard/projects/mhub/sk.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb
+- lib/imperituroard/projects/wttx/phpipamcps.rb
+- lib/imperituroard/projects/wttx/phpipamdb.rb
 - lib/imperituroard/projects/wttx/updatepostcps.rb
 - lib/imperituroard/version.rb
 homepage: https://rubygems.org/