invoicing_payments_processing 1.1.62 → 1.1.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4274c11ebe44a85852da2cd471b1d2ccbd088266
-  data.tar.gz: b6b303e495c9ada9185cb9abc26d270debc6487f
+  metadata.gz: 2017f7ce80ba1e39b308c00c9a771c4b310fb753
+  data.tar.gz: f085954e5f6fe93aee0dad9c32ff0f1ad1ca1953
 SHA512:
-  metadata.gz: c144e34feb9b8ae90c4514a27e3fe9d042d1a50ca3ecd7577307e26dd8858c7689cf7dd8d647b8cf28193d33f51d7da8bcf057ffb29a0c9fb336de50dea5cab3
-  data.tar.gz: 187387a945ab22e3e38b1f35a5884b10bcddb50ba5b218b1730dce093ab67b751cb014b887c77bbd66b567515e3ac81390cd3bf6d65a4606994a5300a0862c9d
+  metadata.gz: 8adc9a2686330b4361a774257fad71305957d2a9e6a7a5f082f4d1ede26edaade1475bd0251230e173720e2611b23aa4730db3fe9293ab61714e5e7405532852
+  data.tar.gz: a72f0bb3d39581d8a99bf9a0dcb6d52428cdc021685a60d19c0e0412cd2b85092d0583d3155e6011ca21c4bd1c87e15292d94cede5f4b869fa2757a71bda7e0d

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -6,7 +6,30 @@ module BlackStack
     class Client < Sequel::Model(:client)
       one_to_many :paypal_subscriptions, :class=>:'BlackStack::PayPalSubscription', :key=>:id_client
       one_to_many :customplans, :class=>:'BlackStack::CustomPlan', :key=>:id_client
-      one_to_many :movements, :class=>:'BlackStack::Movement', :key=>:id_client
+
+      # This method replace the line:
+      # one_to_many :movements, :class=>:'BlackStack::Movement', :key=>:id_client
+      # 
+      # Because when you have a large number of records in the table movement, for a client, 
+      # then the call to this attribute client.movements can take too much time and generates
+      # a query timeout exception.
+      # 
+      # The call to this method may take too much time, but ti won't raise a query timeout.
+      # 
+      def movements
+        i = 0 
+        ret = []
+        BlackStack::Movement.where(:id_client=>self.id).each { |o| 
+          ret << o
+          i += 1
+          if i == 1000
+            i = 0
+            GC.start
+            DB.disconnect
+          end
+        }
+        ret
+      end
 
       # how many minutes ago should have updated the table stat_balance with the amount and credits of this client, for each product.
       def stat_balance_delay_minutes
@@ -137,7 +160,7 @@ module BlackStack
 				credits_paid = 0
 
 				#total_credits = 0.to_f - BlackStack::Balance.new(self.id, product_code).credits.to_f
-				#total_amount = 0.to_f - BlackStack::Balance.new(self.id, product_code).amount.to_f
+				#total_amount = 0.to_f - BlackStack::Balance.new(self.id, product_code).amount.to_f        
 
 				self.movements.select { |o| 
 					o.product_code.upcase == product_code.upcase

data/lib/invoicing_payments_processing.rb

@@ -63,7 +63,7 @@ module BlackStack
 
     def self.plan_descriptor(item_number)
       plan = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |h| h[:item_number].to_s == item_number.to_s }.first
-      raise "Plan not found" if plan.nil?
+      raise "Plan not found (#{item_number.to_s})" if plan.nil?
       plan
     end
   

data/lib/movement.rb

@@ -126,30 +126,66 @@ module BlackStack
 		# 
 		def credits_consumed(registraton_time=nil)
       # le agrego 365 dias a la fecha actual, para abarcar todas las fechas ocurridas hasta hoy seguro
-      registraton_time = (Time.now() + 365*24*60*60).to_time if registraton_time.nil? 
+      if registraton_time.nil?
+        registraton_time = (Time.now() + 365*24*60*60)
+      else
+        registraton_time = registraton_time.to_time if registraton_time.class != Time
+      end
+			# move time to the first second of the next day.
+			# example: '2020-11-12 15:49:43 -0300' will be converted to '2020-11-13 00:00:00 -0300'
+			registraton_time = (Date.strptime(registraton_time.strftime("%Y-%m-%d"), "%Y-%m-%d").to_time + 24*60*60)			
 			# the movment must be a payment or a bonus
 			raise 'Movement must be either a payment or a bonus' if self.type != MOVEMENT_TYPE_ADD_PAYMENT && self.type != MOVEMENT_TYPE_ADD_BONUS
 #puts
+#puts "id:#{self.id.to_guid}:."
 #puts "product_code:#{self.product_code}:."
 			# itero los pagos y bonos hechos por este mismo producto, desde el primer dia hasta este movimiento.
-			paid = 0
+=begin
+			paid1 = 0
 			self.client.movements.select { |o| 
 				(o.type == MOVEMENT_TYPE_ADD_PAYMENT || o.type == MOVEMENT_TYPE_ADD_BONUS) &&
         o.credits.to_f < 0 &&
         o.product_code.upcase == self.product_code.upcase &&
-        o.create_time.to_time <= registraton_time.to_time
+        o.create_time.to_time < registraton_time.to_time
       }.sort_by { |o| o.create_time }.each { |o|
-				paid += (0.to_f - o.credits.to_f)
+				paid1 += (0.to_f - o.credits.to_f)
 				break if o.id.to_guid == self.id.to_guid
 			}
+#puts "paid1:#{paid1.to_s}:."
+=end
+      q = 
+        "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
+        "from movement m with (nolock) " +
+        "where isnull(m.type, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}) in (#{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS.to_s}) " +
+        "and m.id_client='#{self.client.id.to_guid}' " +
+        "and isnull(m.credits,0) < 0 " +
+        "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
+        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " +
+        "and m.create_time <= (select m2.create_time from movement m2 with (nolock) where m2.id='#{self.id.to_guid}') "
+      paid = 0 - DB[q].first[:n]
+#puts "q:#{q.to_s}:."
 #puts "paid:#{paid.to_s}:."
+=begin
       # calculo los credito para este producto, desde el primer dia; incluyendo cosumo, expiraciones, ajustes.
-      consumed = self.client.movements.select { |o| 
+      consumed1 = self.client.movements.select { |o| 
         o.credits.to_f > 0 &&
         o.product_code.upcase == self.product_code.upcase &&
-        o.create_time.to_time <= registraton_time.to_time
+        o.create_time.to_time < registraton_time.to_time
       }.inject(0) { |sum, o| sum.to_f + o.credits.to_f }.to_f
-#puts "consumed:#{consumed.to_s}:."			
+#puts "consumed1:#{consumed1.to_s}:."     
+=end
+      q = 
+        "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
+        "from movement m with (nolock) " +
+        "where m.id_client='#{self.client.id.to_guid}' " +
+        "and isnull(m.credits,0) > 0 " +
+        "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
+        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " #+
+#        "and m.id <> '#{self.id.to_guid}' "
+      consumed = DB[q].first[:n]
+#puts "q:#{q.to_s}:."
+#puts "consumed:#{consumed.to_s}:."     
+
       # calculo los creditos de este movimiento que voy a cancelar
       credits = 0.to_f - self.credits.to_f
 #puts "credits:#{credits.to_s}:."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.62
+  version: 1.1.67
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket