invoicing_payments_processing 1.1.59 → 1.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18728dea987541ecbbed7da0945b9699d258d626
-  data.tar.gz: 324265ee99c3bd89c570527250b9d5b6b7a805fd
+  metadata.gz: 504ea9259de82ef1ffc339b33a7fca1a4273b6a9
+  data.tar.gz: be390eb676c4cd0eeb5398681e6a6d02d2bcd272
 SHA512:
-  metadata.gz: 7d430dad7ca8f9dabc486352d1a169b56ef994bf515784d851b70e0a556baa495b52060d3905affc26c98a0f4ee3e9be0f630c7ba48c0e616a791181fb223116
-  data.tar.gz: 58b118d7c14d2ad05c4025996fc8b56f94e17624d00fe087998b648486e261468e60582c6b8dd85145d8b0f327317f3f9be14b53afeaa040ee951a88a6222152
+  metadata.gz: 49240d883710395e708b20b382f95eb3b9c1fc1c3a1f87abcfc2afb9cd6b0088c74fcc0413dd23213b07fbbdf10987681725b19f265f532e08b741f91cfc7997
+  data.tar.gz: 9d6a4fbbae677537d13699075debbebf4e5ffe54b2dba6fbc7b51c5f80c9dbb7ee6d2086c1e3d3e163a7d18a474e04e56b0bc3a51c62b6c000c66bee840a0322

data/lib/balance.rb

@@ -9,14 +9,14 @@ module BlackStack
   		self.calculate()
   	end
   	
-    def calculate()
-      if !self.up_time.nil?
+    def calculate(use_stat_balance=true)
+      if !self.up_time.nil? || !use_stat_balance
         q = 
         "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
         "from movement with (nolock) " +
         "where id_client='#{self.client.id}' " +
         "and product_code='#{self.product_code}' " +
-  			"and create_time < '#{self.up_time.to_time.to_sql}' "
+  			"and create_time <= '#{self.up_time.to_time.to_sql}' "
       else
         q = 
         "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
@@ -24,7 +24,7 @@ module BlackStack
         "where x.id_client='#{self.client.id}' " +
         "and x.product_code='#{self.product_code}' "
       end
-      
+#puts "Balance.calculate:q:#{q}:."
       row = DB[q].first
       self.amount = row[:amount].to_f
       self.credits = row[:credits].to_f

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -6,7 +6,26 @@ 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
+        ret = []
+        BlackStack::Movement.where(:id_client=>self.id).each { |o| 
+          ret << o
+          print '.'
+          GC.start
+          DB.disconnect
+        }
+        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
@@ -28,7 +47,7 @@ module BlackStack
       # update the table stat_balance with the amount and credits of this client, for each product.
       def update_stat_balance(product_code=nil)
           c = self
-          product_descriptors = BlackStack::InvoicingPaymentsProcessing::products_descriptor        
+          product_descriptors = BlackStack::InvoicingPaymentsProcessing::products_descriptor.clone     
           product_descriptors.select! { |hprod| hprod[:code] == product_code } if !product_code.nil?
           product_descriptors.each { |hprod|
             row = DB[
@@ -51,7 +70,9 @@ module BlackStack
       end
 
       # crea/actualiza un registro en la tabla movment, reduciendo la cantidad de creditos y saldo que tiene el cliente, para el producto indicado en product_code. 
-      def consume(product_code, number_of_credits=1, description=nil)
+      def consume(product_code, number_of_credits=1, description=nil, datetime=nil)
+				dt = datetime.nil? ? now() : datetime.to_time.to_sql
+				
 				# create the consumtion
 				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
@@ -60,7 +81,7 @@ module BlackStack
 				cons = BlackStack::Movement.new
 				cons.id = guid()
 				cons.id_client = self.id
-				cons.create_time = now()
+				cons.create_time = dt
 				cons.type = BlackStack::Movement::MOVEMENT_TYPE_CANCELATION
 				cons.description = description.nil? ? 'Consumption' : description
 				cons.paypal1_amount = 0
@@ -135,7 +156,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/movement.rb

@@ -121,28 +121,66 @@ module BlackStack
 
 		# Returns the number of credits assigned in the movement that have been consumed.
 		# The movment must be a payment or a bonus
-		def credits_consumed()
+		#
+		# registraton_time: consider only movements before this time. If it is nil, this method will consider all the movements.
+		# 
+		def credits_consumed(registraton_time=nil)
+      # le agrego 365 dias a la fecha actual, para abarcar todas las fechas ocurridas hasta hoy seguro
+      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 "product_code:#{self.product_code}:."
+
 			# itero los pagos y bonos hechos por este mismo producto, desde el primer dia hasta este movimiento.
+=begin
 			paid = 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.product_code.upcase == self.product_code.upcase &&
+        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)
 				break if o.id.to_guid == self.id.to_guid
 			}
+=end
+      paid = 0 - DB[
+        "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')}' "
+      ].first[:n]
 #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| 
         o.credits.to_f > 0 &&
-        o.product_code.upcase == self.product_code.upcase
+        o.product_code.upcase == self.product_code.upcase &&
+        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}:."			
+=end
+      consumed = DB[
+        "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')}' "
+      ].first[:n]
+#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}:."
@@ -184,19 +222,28 @@ module BlackStack
 
 		# credits expiration
 		def expire(registraton_time=nil, desc='Expiration Because Allocation is Renewed')
-			credits_consumed = self.credits_consumed
+#puts
+#puts "registraton_time:#{registraton_time.to_s}:."
+			credits_consumed = self.credits_consumed(registraton_time)
+#puts "credits_consumed:#{credits_consumed.to_s}:."
 			# 
 			self.expiration_start_time = now()
 			self.expiration_tries = self.expiration_tries.to_i + 1
 			self.save
 			# 
-			total_credits = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code, registraton_time).credits.to_f
-			total_amount = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code, registraton_time).amount.to_f
+			balance = BlackStack::Balance.new(self.client.id, self.product_code, registraton_time)
+			balance.calculate(false)
+#puts "balance.credits.to_s:#{balance.credits.to_s}:."
+#puts "balance.amount.to_s:#{balance.amount.to_s}:."
+			total_credits = 0.to_f - balance.credits.to_f
+			total_amount = 0.to_f - balance.amount.to_f
 			#
 			credits = 0.to_i - self.credits.to_i
 			#
 			credits_to_expire = credits - credits_consumed.to_i #- (0.to_f - self.credits.to_f)).to_i
 			amount_to_expire = total_credits.to_f == 0 ? 0 : credits_to_expire.to_f * ( total_amount.to_f / total_credits.to_f )
+#puts "credits_to_expire.to_s:#{credits_to_expire.to_s}:."
+#puts "amount_to_expire.to_s:#{amount_to_expire.to_s}:."
 			#
 			exp = BlackStack::Movement.new
 			exp.id = guid()

metadata

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