invoicing_payments_processing 1.1.63 → 1.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9dee57e2b7e6dc8635871fe89ec8dbe98278e8
-  data.tar.gz: dc3a121367f28260594a13f3996adec7b0335df9
+  metadata.gz: 36b5fd6212a599f4855cbfce22cf021275bef49c
+  data.tar.gz: 98bf47011621c2518e1f377a80cadfbb3114d786
 SHA512:
-  metadata.gz: 104338f6525e2c8b45a0b120cd6e5ac2ee71573b2c95f7885c6c6da11236ed25e89d766f8528ea19f6c92d89b0ce765b5f6eeb76579e69fc5507d33d6d6b9590
-  data.tar.gz: 0a8d4411793c7dc01c02cd0e642487193d35eca8f22ea27985da375d5f63a1f43e866206b80ff0ea1e30c9bd25d18805c3a7c0d359aafa16fa9a75fa54a1bf66
+  metadata.gz: ff41e764185ebcc320595801cbddf48aecc34fc28dc48b8f82bdceb4660d63a74d88b25c51b53c93895685397dd38524fa023443fe040bcfab4300019ffb31b7
+  data.tar.gz: e6f2aa52eeb41fdd00f9f4b1635d81d73d5982f737312868615c1a076ac5a3dbf5b09da0658e2e0e92febf0fc7d6424fc90214e82f764d5efb7e7f9faf5d8fc5

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/invoice.rb

@@ -625,29 +625,31 @@ module BlackStack
 					end # if net_amount < 0
           # hago el reembolso de cada bono de este item
           # si el balance quedo en negativo, entonces aplico otro ajuste
-          h[:bonus_plans].each { |bonus|
-            i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
-            j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
-            item2 = BlackStack::InvoiceItem.new()
-            item2.id = guid()
-            item2.id_invoice = self.id
-            item2.unit_price = 0
-            item2.units = -i[:credits]
-            item2.amount = 0
-            item2.product_code = i[:product_code].to_s
-            item2.item_number = i[:item_number].to_s
-            item2.detail = 'Bonus Refund'
-            item2.description = j[:description].to_s
-            item2.save()
-            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
-            net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
-            net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
-            if net_amount <= 0 && net_credits < 0
-              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
-              adjust.id_invoice_item = item1.id
-              adjust.save     
-            end # if net_amount < 0            
-          }
+          if !h[:bonus_plans].nil?
+            h[:bonus_plans].each { |bonus|
+              i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
+              j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
+              item2 = BlackStack::InvoiceItem.new()
+              item2.id = guid()
+              item2.id_invoice = self.id
+              item2.unit_price = 0
+              item2.units = -i[:credits]
+              item2.amount = 0
+              item2.product_code = i[:product_code].to_s
+              item2.item_number = i[:item_number].to_s
+              item2.detail = 'Bonus Refund'
+              item2.description = j[:description].to_s
+              item2.save()
+              BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+              net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
+              net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
+              if net_amount <= 0 && net_credits < 0
+                adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+                adjust.id_invoice_item = item1.id
+                adjust.save     
+              end # if net_amount < 0            
+            }
+          end # if !h[:bonus_plans].nil?
           # release resources
           DB.disconnect
           GC.start

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

@@ -137,26 +137,55 @@ module BlackStack
 			# 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
       }.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
       }.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.63
+  version: 1.1.68
 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