invoicing_payments_processing 1.1.63 → 1.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9dee57e2b7e6dc8635871fe89ec8dbe98278e8
-  data.tar.gz: dc3a121367f28260594a13f3996adec7b0335df9
+  metadata.gz: 504ea9259de82ef1ffc339b33a7fca1a4273b6a9
+  data.tar.gz: be390eb676c4cd0eeb5398681e6a6d02d2bcd272
 SHA512:
-  metadata.gz: 104338f6525e2c8b45a0b120cd6e5ac2ee71573b2c95f7885c6c6da11236ed25e89d766f8528ea19f6c92d89b0ce765b5f6eeb76579e69fc5507d33d6d6b9590
-  data.tar.gz: 0a8d4411793c7dc01c02cd0e642487193d35eca8f22ea27985da375d5f63a1f43e866206b80ff0ea1e30c9bd25d18805c3a7c0d359aafa16fa9a75fa54a1bf66
+  metadata.gz: 49240d883710395e708b20b382f95eb3b9c1fc1c3a1f87abcfc2afb9cd6b0088c74fcc0413dd23213b07fbbdf10987681725b19f265f532e08b741f91cfc7997
+  data.tar.gz: 9d6a4fbbae677537d13699075debbebf4e5ffe54b2dba6fbc7b51c5f80c9dbb7ee6d2086c1e3d3e163a7d18a474e04e56b0bc3a51c62b6c000c66bee840a0322

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
@@ -137,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

@@ -138,7 +138,9 @@ module BlackStack
 			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) &&
@@ -149,14 +151,36 @@ module BlackStack
 				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.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}:."

metadata

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