cats_core 1.4.20 → 1.4.23

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

@@ -12,41 +12,11 @@ module Cats
       validates :transaction_date, :quantity, :status, presence: true
       validates :quantity, numericality: { greater_than: 0 }
       validates :status, inclusion: { in: STATUSES }
-      validate :validate_quantity, unless: :skip_quantity_validation
-
-      def validate_quantity
-        return unless quantity.present? && source.present? && dispatch.present?
-
-        dispatched = self.class.joins(:source, :dispatch).where(
-          source: { store_id: source.store_id },
-          dispatch: { dispatch_plan_item_id: dispatch.dispatch_plan_item_id }
-        ).sum(:quantity)
-        dispatched -= quantity_was if quantity_was
-
-        # Get quantity in hub authorization for source
-        authorized = dispatch.dispatch_plan_item.hub_authorizations.where(store_id: source.store_id).sum(:quantity)
-        available = authorized - dispatched
-
-        errors.add(:quantity, "exceeds authorized quantity (Max = #{available}).") if quantity > available
-      end
 
       def commit
         raise(NotImplementedError, 'Method should be implemented in child classes.')
       end
 
-      def skip_quantity_validation
-        # Quantity validation should be skipped if we are commiting transactions.
-        (
-          instance_of?(Cats::Core::DispatchTransaction) &&
-          dispatch &&
-          status == COMMITTED
-        ) || (
-          instance_of?(Cats::Core::ReceiptTransaction) &&
-          receipt &&
-          receipt.status == Cats::Core::Receipt::STACKING
-        )
-      end
-
       def set_status
         return unless new_record?
 

data/app/serializers/cats/core/dispatch_authorization_serializer.rb

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class DispatchAuthorizationSerializer < ActiveModel::Serializer
+      attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :authorized_by_id,
+                 :authorizer_full_name, :dispatch_status, :plate_no, :driver_name
+    end
+  end
+end

data/app/serializers/cats/core/dispatch_plan_item_serializer.rb

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class DispatchPlanItemSerializer < ActiveModel::Serializer
-      attributes :id, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
+      attributes :id, :reference_no, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
                  :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status,
                  :status, :commodity_id, :commodity_name, :commodity_batch_no
     end

data/app/serializers/cats/core/dispatch_transaction_serializer.rb

@@ -1,8 +1,7 @@
 module Cats
   module Core
     class DispatchTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :source_id, :source_code, :dispatch_id, :dispatch_reference_no, :quantity,
-                 :transaction_date, :status
+      attributes :id, :source_id, :source_code, :dispatch_authorization_id, :quantity, :transaction_date, :status
     end
   end
 end

data/app/serializers/cats/core/lost_commodity_serializer.rb

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class LostCommoditySerializer < ActiveModel::Serializer
-      attributes :id, :dispatch_id, :quantity, :commodity_status, :remark
+      attributes :id, :receipt_authorization_id, :quantity, :remark
     end
   end
 end

data/app/serializers/cats/core/receipt_authorization_serializer.rb

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class ReceiptAuthorizationSerializer < ActiveModel::Serializer
+      attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :received_quantity,
+                 :remark, :status, :authorized_by_id, :authorizer_full_name
+    end
+  end
+end

data/app/serializers/cats/core/receipt_serializer.rb

@@ -1,8 +1,7 @@
 module Cats
   module Core
     class ReceiptSerializer < ActiveModel::Serializer
-      attributes :id, :dispatch_id, :dispatch_reference_no, :commodity_status, :quantity, :status, :remark,
-                 :prepared_by_id, :prepared_by_email
+      attributes :id, :receipt_authorization_id, :commodity_status, :quantity, :remark
     end
   end
 end

data/app/serializers/cats/core/receipt_transaction_serializer.rb

@@ -1,12 +1,8 @@
 module Cats
   module Core
     class ReceiptTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :receipt_id, :dispatch_reference, :destination_id, :destination_code, :quantity,
+      attributes :id, :receipt_authorization_id, :dispatch_reference_no, :destination_id, :destination_code, :quantity,
                  :transaction_date, :status
-
-      def dispatch_reference
-        object.receipt.dispatch.reference_no
-      end
     end
   end
 end

data/app/services/cats/core/authorization_service.rb

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class AuthorizationService
+      # A method to confirm a dispatch authorization. This method
+      # also checks if all authorizations under a dispatch are confirmed
+      # and if so it sets the dispatch status to READY_TO_START.
+      def confirm(id)
+        authorization = DispatchAuthorization.find(id)
+
+        ActiveRecord::Base.transaction do
+          authorization.confirm
+
+          # Check if all authorizations under the dispatch are confirmed.
+          dispatch = authorization.dispatch
+          if dispatch.all_authorizations_confirmed?
+            dispatch.quantity = dispatch.dispatch_transactions.sum(:quantity)
+            dispatch.dispatch_status = Dispatch::READY_TO_START
+            dispatch.save!
+          end
+        end
+        authorization
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -96,12 +96,13 @@ Cats::Core::Engine.routes.draw do
   post '/dispatch_plan_items/filter', controller: :dispatch_plan_items, action: :filter
   get '/dispatch_plan_items/:id/dispatches', controller: :dispatches, action: :index, as: :dispatches_plan_item
 
+  post '/dispatches/filter', controller: :dispatches, action: :filter
   get '/dispatches/search', controller: :dispatches, action: :search, as: :search_dispatches
   resources :dispatches, except: %i[index destroy] do
     member do
-      get 'transactions', controller: :dispatch_transactions, action: :index
+      get 'dispatch_authorizations', controller: :dispatch_authorizations, action: :index
+      get 'receipt_authorizations', controller: :receipt_authorizations, action: :index
       get 'receipts', controller: :receipts, action: :index
-      get 'lost', controller: :lost_commodities, action: :index
       get 'commodity'
       post 'approve'
       post 'start'
@@ -109,6 +110,29 @@ Cats::Core::Engine.routes.draw do
     end
   end
 
+  resources :dispatch_authorizations, except: %i[index destory] do
+    member do
+      get 'transactions', controller: :dispatch_transactions, action: :index
+      post 'confirm', controller: :dispatch_authorizations, action: :confirm
+    end
+  end
+
+  get(
+    '/storekeeper/:id/authorizations',
+    controller: :dispatch_authorizations,
+    action: :storekeeper_authorizations,
+    as: :storekeeper_authorizations
+  )
+  resources :receipt_authorizations, except: %i[index destroy] do
+    member do
+      get 'transactions', controller: :receipt_transactions, action: :index
+      get 'lost', controller: :lost_commodities, action: :index
+      get 'receipts', controller: :receipts, action: :index
+      post 'confirm', controller: :receipt_authorizations, action: :confirm
+    end
+  end
+
+  resources :receipts, except: %i[index destroy]
   post(
     'dispatch_transactions/allocation',
     controller: :dispatch_transactions,
@@ -116,13 +140,6 @@ Cats::Core::Engine.routes.draw do
     as: :allocation_transaction
   )
   resources :dispatch_transactions, except: %i[index new edit destroy]
-  resources :receipts, except: %i[index new edit destroy] do
-    member do
-      get 'transactions', controller: :receipt_transactions, action: :index
-      post 'start_stacking'
-      post 'finish_stacking'
-    end
-  end
   resources :receipt_transactions, except: %i[index new edit destroy]
   resources :lost_commodities, except: %i[index destroy]
   get '/plans/:id/round_plans', controller: :round_plans, action: :index, as: :round_plans_plan

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_dispatch_plan_items do |t|
+      t.string :reference_no, null: false, unique: true
       t.references :dispatch_plan,
                    null: false,
                    index: { name: 'dpi_on_dp_indx' },

data/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -14,6 +14,10 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
       t.string :driver_name, null: false
       t.string :driver_phone, null: false
       t.float :quantity, null: false, default: 0
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_dispatches_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures } 
       t.string :commodity_status, null: false, default: 'Good'
       t.string :remark
       t.references :prepared_by,

data/db/migrate/20210718055414_create_cats_core_dispatch_authorizations.rb

@@ -0,0 +1,22 @@
+class CreateCatsCoreDispatchAuthorizations < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_dispatch_authorizations do |t|
+      t.references :dispatch,
+                   null: false,
+                   index: { name: 'dispatch_on_da_indx' },
+                   foreign_key: { to_table: :cats_core_dispatches }
+      t.references :store,
+                   null: false,
+                   index: { name: 'store_on_da_indx' },
+                   foreign_key: { to_table: :cats_core_stores }
+      t.float :quantity, null: false
+      t.string :status, null: false, default: 'Authorized'
+      t.references :authorized_by,
+                   null: false,
+                   index: { name: 'ab_on_da_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210718202957_create_cats_core_dispatch_transactions.rb

@@ -5,15 +5,21 @@ class CreateCatsCoreDispatchTransactions < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'stack_on_dt_indx' },
                    foreign_key: { to_table: :cats_core_stacks }
-      t.references :dispatch,
+      t.references :dispatch_authorization,
                    null: false,
-                   index: { name: 'dispatch_on_dt_indx' },
-                   foreign_key: { to_table: :cats_core_dispatches }
+                   index: { name: 'da_on_dt_indx' },
+                   foreign_key: { to_table: :cats_core_dispatch_authorizations }
       t.date :transaction_date, null: false
       t.float :quantity, null: false
       t.string :status, null: false, default: 'Draft'
 
       t.timestamps
     end
+    add_index(
+      :cats_core_dispatch_transactions,
+      [:source_id, :dispatch_authorization_id],
+      unique: true,
+      name: 'sda_on_dt_uniq_indx'
+    )
   end
 end

data/db/migrate/20210727074646_create_cats_core_receipt_authorizations.rb

@@ -0,0 +1,24 @@
+class CreateCatsCoreReceiptAuthorizations < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_receipt_authorizations do |t|
+      t.references :dispatch,
+                   null: false,
+                   index: { name: 'dispatch_on_receipt_authorizations_indx' },
+                   foreign_key: { to_table: :cats_core_dispatches }
+      t.references :store,
+                   null: false,
+                   index: { name: 'store_on_ra_indx' },
+                   foreign_key: { to_table: :cats_core_stores } 
+      t.float :quantity, null: false
+      t.float :received_quantity, null: false, default: 0
+      t.string :status, null: false, default: 'Authorized'
+      t.string :remark
+      t.references :authorized_by,
+                   null: false,
+                   index: { name: 'ab_on_receipt_authorizations_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210727105834_create_cats_core_receipts.rb

@@ -0,0 +1,15 @@
+class CreateCatsCoreReceipts < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_receipts do |t|
+      t.references :receipt_authorization,
+                   null: false,
+                   index: { name: 'ra_on_receipts_indx' },
+                   foreign_key: { to_table: :cats_core_receipt_authorizations }
+      t.string :commodity_status, null: false
+      t.float :quantity, null: false
+      t.string :remark
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210728041505_create_cats_core_lost_commodities.rb

@@ -1,12 +1,11 @@
 class CreateCatsCoreLostCommodities < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_lost_commodities do |t|
-      t.references :dispatch,
+      t.references :receipt_authorization,
                    null: false,
-                   index: { name: 'lc_on_dispatch_indx' },
-                   foreign_key: { to_table: :cats_core_dispatches }
+                   index: { name: 'ra_on_lc_indx' },
+                   foreign_key: { to_table: :cats_core_receipt_authorizations }
       t.float :quantity, null: false
-      t.string :commodity_status, null: false
       t.string :remark
 
       t.timestamps

data/db/migrate/20210814160628_create_cats_core_receipt_transactions.rb

@@ -1,10 +1,10 @@
 class CreateCatsCoreReceiptTransactions < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_receipt_transactions do |t|
-      t.references :receipt,
+      t.references :receipt_authorization,
                    null: false,
-                   index: { name: 'receipt_on_rt_indx' },
-                   foreign_key: { to_table: :cats_core_receipts }
+                   index: { name: 'receipt_authorization_on_rt_indx' },
+                   foreign_key: { to_table: :cats_core_receipt_authorizations }
       t.references :destination,
                    null: false,
                    index: { name: 'stack_on_rt_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.20'.freeze
+    VERSION = '1.4.23'.freeze
   end
 end

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

@@ -0,0 +1,26 @@
+FactoryBot.define do
+  factory :dispatch_authorization, class: 'Cats::Core::DispatchAuthorization' do
+    transient do
+      s { create(:store) }
+      stack { create(:stack, quantity: 100, store: s) }
+    end
+    dispatch
+    store { s }
+    quantity { 100 }
+    status { Cats::Core::ReceiptAuthorization::AUTHORIZED }
+    authorized_by factory: :user
+
+    trait :approved do
+      after(:create) do |obj|
+        obj.dispatch.approve
+      end
+    end
+
+    trait :with_transaction do
+      after(:create) do |obj, options|
+        obj.dispatch.approve
+        create(:dispatch_transaction, dispatch_authorization: obj, source: options.stack, quantity: 100)
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
+    reference_no { FFaker::Name.name }
     source factory: :location
     destination factory: :location
     dispatch_plan

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

@@ -4,14 +4,9 @@ FactoryBot.define do
       stack { create(:stack) }
     end
     source { stack }
-    dispatch do
-      plan_item = create(:dispatch_plan_item, quantity: 100)
-      plan_item.dispatch_plan.approve
-      create(:hub_authorization, dispatch_plan_item: plan_item, quantity: 100, store: stack.store)
-      create(:dispatch, dispatch_plan_item: plan_item, transaction?: false)
-    end
+    association :dispatch_authorization, :approved
     transaction_date { Date.today }
-    quantity { 10 }
+    quantity { 100 }
     status { Cats::Core::Transaction::DRAFT }
   end
 end

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :dispatch, class: 'Cats::Core::Dispatch' do
     transient do
       stack { create(:stack, quantity: 100) }
-      transaction? { true }
     end
     reference_no { FFaker::Name.name }
     dispatch_plan_item do
@@ -11,6 +10,7 @@ FactoryBot.define do
       create(:hub_authorization, dispatch_plan_item: plan_item, quantity: 100, store: stack.store)
       plan_item
     end
+    unit factory: :unit_of_measure
     transporter
     plate_no { FFaker::Name.name }
     driver_name { FFaker::Name.name }
@@ -19,8 +19,43 @@ FactoryBot.define do
     prepared_by factory: :user
     dispatch_status { Cats::Core::Dispatch::DRAFT }
 
-    after :create do |dispatch, options|
-      create(:dispatch_transaction, dispatch: dispatch, source: options.stack, quantity: 100) if options.transaction?
+    trait :with_authorization do
+      after(:create) do |dispatch, options|
+        create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
+      end
+    end
+
+    trait :with_transaction do
+      after(:create) do |dispatch, options|
+        authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
+        dispatch.approve
+        create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
+      end
+    end
+
+    trait :ready_to_start do
+      after(:create) do |dispatch, options|
+        authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
+        dispatch.approve
+        create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
+        authorization.confirm
+        dispatch.quantity = 100
+        dispatch.dispatch_status = Cats::Core::Dispatch::READY_TO_START
+        dispatch.save!
+      end
+    end
+
+    trait :started do
+      after(:create) do |dispatch, options|
+        authorization = create(:dispatch_authorization, dispatch: dispatch, store: options.stack.store)
+        dispatch.approve
+        create(:dispatch_transaction, dispatch_authorization: authorization, source: options.stack, quantity: 100)
+        authorization.confirm
+        dispatch.quantity = 100
+        dispatch.dispatch_status = Cats::Core::Dispatch::READY_TO_START
+        dispatch.save!
+        dispatch.start
+      end
     end
   end
 end

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

@@ -1,8 +1,7 @@
 FactoryBot.define do
   factory :lost_commodity, class: 'Cats::Core::LostCommodity' do
-    dispatch
+    receipt_authorization
     quantity { 100 }
-    commodity_status { Cats::Core::Commodity::DAMAGED }
     remark { FFaker::Name.name }
   end
 end

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

@@ -0,0 +1,25 @@
+FactoryBot.define do
+  factory :receipt_authorization, class: 'Cats::Core::ReceiptAuthorization' do
+    association :dispatch, :started
+    store
+    quantity { 100 }
+    received_quantity { 0 }
+    remark { FFaker::Name.name }
+    status { Cats::Core::ReceiptAuthorization::AUTHORIZED }
+    authorized_by factory: :user
+
+    trait :with_receipt do
+      after(:create) do |authorization|
+        create(:receipt, receipt_authorization: authorization, quantity: 100)
+      end
+    end
+
+    trait :confirmed do
+      after(:create) do |authorization|
+        create(:receipt, receipt_authorization: authorization, quantity: 100)
+        authorization.status = Cats::Core::Authorization::CONFIRMED
+        authorization.save!
+      end
+    end
+  end
+end

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

@@ -1,27 +1,7 @@
 FactoryBot.define do
   factory :receipt_transaction, class: 'Cats::Core::ReceiptTransaction' do
-    transient do
-      dispatch { create(:dispatch) }
-    end
-    transient do
-      stack { create(:stack) }
-    end
-
-    destination { stack }
-    receipt do
-      dispatch.approve
-      dispatch.start
-      receipt = create(:receipt, dispatch: dispatch)
-      dispatch.confirm
-      create(
-        :hub_authorization,
-        authorization_type: Cats::Core::HubAuthorization::DESTINATION,
-        dispatch_plan_item: dispatch.dispatch_plan_item,
-        store: stack.store,
-        quantity: 100
-      )
-      receipt
-    end
+    association :receipt_authorization, :confirmed
+    destination factory: :stack
     transaction_date { Date.today }
     quantity { 100 }
     status { Cats::Core::Transaction::DRAFT }

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

@@ -1,15 +1,8 @@
 FactoryBot.define do
   factory :receipt, class: 'Cats::Core::Receipt' do
-    dispatch do
-      dispatch = create(:dispatch)
-      dispatch.approve
-      dispatch.start
-      dispatch
-    end
-    quantity { 100 }
+    receipt_authorization
     commodity_status { Cats::Core::Commodity::GOOD }
-    status { Cats::Core::Receipt::DRAFT }
+    quantity { 50 }
     remark { FFaker::Name.name }
-    prepared_by factory: :user
   end
 end

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

@@ -10,6 +10,6 @@ FactoryBot.define do
     store
     commodity_status { Cats::Core::Commodity::GOOD }
     stack_status { Cats::Core::Stack::RESERVED }
-    quantity { 50 }
+    quantity { 100 }
   end
 end