ps_utilities 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823ebc095fd0fe70b224f173aef9a951e1d1a9acd4bf14ad037895d0832f1ef6
-  data.tar.gz: 23e29507f3fc51e63cc9a640377bd2e3c437fd624652f387c9931aa93b09c720
+  metadata.gz: 691b905deebc1f4513478a0b2a9a1b85f15f079795056803f50bee45335c4862
+  data.tar.gz: c95a79e6f8391ad8bb37eca452cc74ca2d57f24cbdc318d7dcddb4a361f33624
 SHA512:
-  metadata.gz: 512c0c6e1b8c9d5da4426c7c5e15ee4a478c24fab18521d08371e4d1c71521a58873267a7b93f7808cacfced820914e658416cc58f1e0ba4ca91cf186709abc0
-  data.tar.gz: 35875ad1cee3a496c645c76f8bcedd1a689428e51642ab7cbcab8da28cd97301026dbc9f2aa884a1073d841cfcd999163e2e42afc2ce210f2a4fb70512bfff13
+  metadata.gz: 7d38a7ae66fc5ed211ab95383ff411177efc06edbc99006ac28af64f34eb6bc8e8c303e1b1e3244675b4467da49960f04a8b6c9ee87f9e7fa58ef3398f1582cd
+  data.tar.gz: 5fd41b3b3d7af19a1836852dfe2fc1b88e0740df0fd62eddf7f4015db2fa4bb417aedbf20bb9c51cea19ca78d09e10619dfe47f67c7b05309752d3530d972064

data/lib/ps_utilities/connection.rb

@@ -72,6 +72,8 @@ module PsUtilities
       else
         send(command, params)
       end
+      rescue ArgumentError => error
+        return {"error_message" => error.message}
     end
 
     private

data/lib/ps_utilities/pre_built_post.rb

@@ -51,6 +51,8 @@ module PsUtilities
     def update_students(params)
       action = "UPDATE"
       kids_api_array = build_kids_api_array(action, params)
+      return kids_api_array     if kids_api_array.empty?
+
       options  = { body: { students: { student: kids_api_array } }.to_json }
       answer = api(:post, "/ws/v1/student", options)
       return answer.parsed_response   if answer.code.to_s.eql? "200"
@@ -93,18 +95,20 @@ module PsUtilities
     #]
     # @note this is then sent to the API call with a body tag
     def build_kids_api_array(action, params)
-      students  = []
-      api_array = []
-      # students  = [params[:student]] if not params[:student].nil?  && params[:student].is_a?(Hash)
-      students  =  params[:students] #if not params[:students].nil? && params[:students].is_a?(Array)
-      if students.empty?
-        return {"errorMessage"=>{"message"=>"Bad student data - USE: {students: [{kid_data1}, {kid_data2}]}"}}
+      # ugly protection against bad data feeds - but it works
+      # TODO: refactor with an elegant assertion?
+      if params.nil? or not params.is_a?(Hash) or params[:students].nil? or not params[:students].is_a?(Array) or params[:students].empty? or not params[:students][0].is_a?(Hash)
+        raise ArgumentError, "PARAMS format is: {students: [{kid_data1}, {kid_data2}]} - NOT OK: #{params}"
+      end
+      if action.nil? or not action.is_a?(String) or action.empty? or not %[INSERT UPDATE].include?(action)
+        raise ArgumentError, "ACTION must be: 'INSERT' or 'UPDATE' - NOT OK: #{action}"
       end
+      api_array = []
+      students  =  params.dig(:students)
       students.each do |kid|
-        # kid[:las_extensions] = true if params[:las_extensions]
         api_array << build_kid_attributes(action, kid)
       end
-      return api_array
+      api_array
     end
 
     # prepare data to update student database extensions
@@ -180,6 +184,12 @@ module PsUtilities
     #     ]
     #   }
     def build_kid_attributes(action, kid)
+      if kid.nil? or not kid.is_a?(Hash) or kid.empty?
+        raise ArgumentError, "STUDENT format is: {students: [{kid_data1}, {kid_data2}]} - NOT OK: #{kid}"
+      end
+      if action.nil? or not action.is_a?(String) or action.empty? or not %[INSERT UPDATE].include?(action)
+        raise ArgumentError, "ACTION must be: 'INSERT' or 'UPDATE' - NOT OK: #{action}"
+      end
       # ALWAYS NEEDED INFO
       attribs                        = {action: action}
       attribs[:client_uid]           = kid[:student_id].to_s
@@ -190,7 +200,8 @@ module PsUtilities
       case action
       when 'INSERT'
         # must be set on creation (INSERT)
-        attribs[:local_id]  = kid[:oa_id].to_i
+        attribs[:local_id]           = kid[:local_id].to_i   if kid[:local_id]
+        attribs[:local_id]           = kid[:student_id].to_i if kid[:student_id]
         # to create an account both first and last name must be present
         attribs[:name][:last_name]   = kid[:last_name]   if kid[:last_name] or kid[:first_name]
         attribs[:name][:first_name]  = kid[:first_name]  if kid[:last_name] or kid[:first_name]

data/lib/ps_utilities/version.rb

@@ -1,5 +1,5 @@
 module PsUtilities
   module Version
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ps_utilities
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lee Weisbecker