cats_core 1.5.22 → 1.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f009c7cb5782eac61ebe0e03b07db78fd40bfd88bdbe690b047bd3abf5ab3d6
-  data.tar.gz: 9985511c1fd14c0e3dc5d9764a2bd7842fc556c916f3d0b0ef629d5d6bc9f617
+  metadata.gz: e90178cd66acd3f96313a3663036ba07bbf157e092e672adc393d840f701cfde
+  data.tar.gz: 7236c8485554e65bc5058bc600bfe25b38465b5d760823c3e96aec29c37ae951
 SHA512:
-  metadata.gz: 663bc3e411d28fab8c1bfa5a18d5932aa81a4968f47602813382dd7e5082ba0e40d726de954427b0fb27b402900bbb8e12f86a1196c3e9ab726da91c860f5822
-  data.tar.gz: f532090a4b59dcecbe2b122bc3b941df3be5e5e64e2c6208569f4d7f181ba3feaa0e0c251e517878d0dd26a344aa7375f5307ed24fdc802d3426c31058f98cc0
+  metadata.gz: 80fff7d2dae7ed8e2d0fe77339bc0dbcd433d1fba6be6083e0c1e3b118c222912a957c0eee129908016a1fd7b25b1f4c4c931b8ef632fe12943d5b5facd620ce
+  data.tar.gz: '0765604991129318a519ad3960f32a43582f561492972264b027dda9846d87c1255c3009743a3f493386abda67ca9c373184f1d809b06ce5109017a1b96a6da4'

data/app/controllers/cats/core/dispatches_controller.rb

@@ -76,6 +76,13 @@ module Cats
         render json: {success: true, data: serialize(data)}
       end
 
+      def revert
+        data = set_object.revert
+        render json: {success: true, data: serialize(data)}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       private
 
       def set_service

data/app/controllers/cats/core/stack_transactions_controller.rb

@@ -15,6 +15,12 @@ module Cats
         render json: {success: true, data: serialize(query.result)}
       end
 
+      def commit
+        transaction = set_object
+        transaction.commit
+        render json: {success: true, data: serialize(transaction)}
+      end
+
       private
 
       def model_params

data/app/models/cats/core/dispatch.rb

@@ -54,6 +54,14 @@ module Cats
         save!
       end
 
+      def revert
+        raise(StandardError, "Dispatch has to be in approved state.") unless dispatch_status == Dispatch::APPROVED
+
+        self.dispatch_status = DRAFT
+        self.quantity = 0
+        save!
+      end
+
       def all_authorizations_confirmed?
         statuses = dispatch_authorizations.map(&:status).uniq
         return true if statuses.length == 1 && statuses[0] == Authorization::CONFIRMED

data/app/models/cats/core/dispatch_authorization.rb

@@ -36,7 +36,7 @@ module Cats
           return
         end
         stack_quantity = stacks.map { |s| UnitConversion.convert(s.unit, unit, s.quantity) }.sum
-        authorizations = DispatchAuthorization.where(dispatch: dispatch)
+        authorizations = DispatchAuthorization.where(dispatch: dispatch, store: store)
         authorized = authorizations.map { |a| UnitConversion.convert(a.unit, unit, a.quantity) }.sum
         authorized -= quantity_was if persisted?
 

data/app/models/cats/core/stack_transaction.rb

@@ -5,6 +5,8 @@ module Cats
       belongs_to :destination, class_name: "Cats::Core::Stack"
       belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
 
+      validate :validate_commodity
+
       def validate_quantity
         return unless quantity.present? && source.present?
 
@@ -15,6 +17,25 @@ module Cats
 
         errors.add(:quantity, "total is higher than source quantity (Max = #{available}).") if quantity > available
       end
+
+      def validate_commodity
+        return unless source && destination
+
+        return if source.commodity.batch_no == destination.commodity.batch_no
+
+        errors.add(:commodity, "batch number should be the same.")
+      end
+
+      def commit
+        StackTransaction.transaction do
+          source.quantity -= UnitConversion.convert(unit, source.unit, quantity)
+          source.save!
+          destination.quantity += UnitConversion.convert(unit, destination.unit, quantity)
+          destination.save!
+          self.status = COMMITTED
+          save!
+        end
+      end
     end
   end
 end

data/app/notifications/cats/core/dispatch_notification.rb

@@ -14,6 +14,7 @@ module Cats
           Commodity with the following details has been dispatched to you:
               Authorization no. = #{dispatch.dispatch_plan_item.reference_no}
               Dispatch Ref. = #{dispatch.reference_no}
+              Shipping Ref. = #{commodity.shipping_reference}
               Batch No. = #{commodity.batch_no}
               Commodity = #{commodity.name}
               Allocated Quantity = #{dispatch.dispatch_plan_item.quantity}

data/config/routes.rb

@@ -122,6 +122,7 @@ Cats::Core::Engine.routes.draw do
       get "receipts", controller: :receipts, action: :index
       get "commodity"
       post "approve"
+      post "revert"
       post "start"
       post "confirm"
       post "start_with_pin"
@@ -192,7 +193,11 @@ Cats::Core::Engine.routes.draw do
   resources :dispatch_transactions, except: %i[index new edit destroy]
   post "/receipt_transactions/filter", controller: :receipt_transactions, action: :filter
   resources :receipt_transactions, except: %i[index new edit destroy]
-  resources :stack_transactions, except: %i[index new edit destroy]
+  resources :stack_transactions, except: %i[index new edit destroy] do
+    member do
+      post "commit"
+    end
+  end
   resources :lost_commodities, except: %i[index destroy]
   get "/plans/:id/round_plans", controller: :round_plans, action: :index, as: :round_plans_plan
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.22".freeze
+    VERSION = "1.5.24".freeze
   end
 end

data/spec/factories/cats/core/stack_transactions.rb

@@ -1,10 +1,14 @@
 FactoryBot.define do
   factory :stack_transaction, class: "Cats::Core::StackTransaction" do
-    source factory: :stack
-    destination factory: :stack
+    transient do
+      unit_of_measure { create(:unit_of_measure) }
+      commodity { create(:commodity, unit: unit_of_measure) }
+    end
+    source { association :stack, commodity: commodity }
+    destination { association :stack, commodity: commodity }
     transaction_date { Date.today }
     quantity { 25 }
-    unit { source.unit }
+    unit { unit_of_measure }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.22
+  version: 1.5.24
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers