cats_core 1.5.23 → 1.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0913c502d73b044d84e08daf43fb9fc7fb67df1a6fbda3ef7ca7748d610a1082'
-  data.tar.gz: 2f9cec73382125463e3624d48f5f7f852097d90120c98579347a32ecb87df085
+  metadata.gz: 78f6d9a4f2c81fd8ba524a604d6e8bf4fc8429807bce72b8af05e93b1496c321
+  data.tar.gz: ba5e35b1b7b4e6b84ca9fe72ed81a756ae42e5d8b7584b61048586c53cc29d21
 SHA512:
-  metadata.gz: d030d99a36bc3c42e0f1a906e10cde70bd4a52a816534cbfe87eed1050721f93d1eaf0e3a8a634cdcc199bf0188bd60a2aead8630aa797e6318b2a961f455861
-  data.tar.gz: a0c790f3e8def0e808fd71df23b9473e1d78d079a5d15231b2bbaccb321412ed6b02a23afd7d60f01e50ddb582eb1a950603623f2a66ee51c29947bf134a864f
+  metadata.gz: 91d369fba469a5457a771c39ebafe8253f8f249609ffeaf4f0c1a953e5a29ec6b7411bfca0b66cb406a2471298b549669a5a8f424f5fbd082121bd199a98d03d
+  data.tar.gz: 9bee3cbd46f8255981c1bf9dd338f82783edc82b90f885a4a12d09d983a0aaa38069a9aed56dbc49f162c68559dc45d30e421d8237e2227dcf57ab56d38fdcdd

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

@@ -5,7 +5,8 @@ module Cats
 
       def index
         super do
-          StackTransaction.joins({source: :store}, :unit)
+          StackTransaction.joins(source: :store)
+                          .includes(:unit)
                           .where(cats_core_stacks: {cats_core_stores: {warehouse_id: params[:id]}})
         end
       end
@@ -15,6 +16,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/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/app/serializers/cats/core/stack_transaction_serializer.rb

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class StackTransactionSerializer < ActiveModel::Serializer
+      attributes :id, :source_id, :destination_id, :quantity, :transaction_date, :status, :unit_id, :unit_abbreviation
+    end
+  end
+end

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.23".freeze
+    VERSION = "1.5.25".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.23
+  version: 1.5.25
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-29 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -428,6 +428,7 @@ files:
 - app/serializers/cats/core/round_plan_serializer.rb
 - app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/stack_serializer.rb
+- app/serializers/cats/core/stack_transaction_serializer.rb
 - app/serializers/cats/core/store_serializer.rb
 - app/serializers/cats/core/swap_serializer.rb
 - app/serializers/cats/core/transporter_serializer.rb