cats_core 1.4.22 → 1.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a896be87ee316cd08b40a298effac694bfb59e1207699c50675b4242e0f630
-  data.tar.gz: 3b6d584ce3eacbf6a0f3ffda03c399d84db2c5bf3931666107cf9d7fd014e3ca
+  metadata.gz: 3c58aa13420d9d6df2e5954237e8d8fbfef4db3d620636a49bba9ba2c6d30eb2
+  data.tar.gz: 6ff8e9bc22538cef900ed1e4ef1d80620699f5b94df2bbf8771f37cf4b0367b1
 SHA512:
-  metadata.gz: 234470131214a8e68da2123957a811c55c41c38079c34ec9dde9b9313c0d85c7b88607da5b0a3d7a2dd98f1c2f39942f5790a858d21eb76595a9f0572578d3a5
-  data.tar.gz: 4f3e4040eff76a430bbcaf24ec3bae51dc54905831f744f23802905c4d6df80cc440184de47c9398be98051be81519010cf4ca9e3818817a3b1fc67b9cd3dda8
+  metadata.gz: caf7a1b4209a0405e22dbf86736424ce82f577ded281348911faed27a1cbc9e232c35eea14cdb768d2655aaa8dcce9fda5362ac3c60ec088b13522a191eeabbc
+  data.tar.gz: 2992ab176cd20d2e82a56ac9fc178d5aa06cc8870aa67c5c545f42804c9d31dc082203ef5cdebae968b69aee147689056d06401cffe35f4d566d0c5026bf470c

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

@@ -10,13 +10,21 @@ module Cats
       end
 
       def confirm
-        authorization = DispatchAuthorization.find(params[:id])
-        authorization.confirm
+        service = AuthorizationService.new
+        authorization = service.confirm(params[:id])
         render json: { success: true, data: serialize(authorization) }
       rescue StandardError => e
         render json: { success: false, error: e.message }
       end
 
+      def storekeeper_authorizations
+        storekeeper = User.find(params[:id])
+        stores = storekeeper.stores
+        authorizations = DispatchAuthorization.joins(:dispatch)
+                                              .where(store: stores, dispatch: { dispatch_status: Dispatch::APPROVED })
+        render json: { success: true, data: serialize(authorizations) }
+      end
+
       private
 
       def model_params

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

@@ -43,6 +43,11 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
+      def filter
+        query = Dispatch.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       def search
         data = @service.search(current_user, params[:status])
         render json: { success: true, data: serialize(data) }

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

@@ -5,12 +5,12 @@ module Cats
 
       def index
         super do
-          LostCommodity.where(dispatch_id: params[:id])
+          LostCommodity.where(receipt_authorization_id: params[:id])
         end
       end
 
       def model_params
-        params.require(:payload).permit(:dispatch_id, :quantity, :commodity_status, :remark)
+        params.require(:payload).permit(:receipt_authorization_id, :quantity, :remark)
       end
     end
   end

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

@@ -20,8 +20,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :lost_quantity, :remark, :status,
-                                        :authorized_by_id)
+        params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :remark, :status, :authorized_by_id)
       end
     end
   end

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class ReceiptsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          Receipt.where(receipt_authorization_id: params[:id])
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :quantity, :remark)
+      end
+    end
+  end
+end

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

@@ -20,6 +20,9 @@ module Cats
       delegate(:full_name, to: :authorized_by, prefix: :authorizer)
       delegate(:name, to: :store, prefix: true)
       delegate(:reference_no, to: :dispatch, prefix: true)
+      delegate(:dispatch_status, to: :dispatch)
+      delegate(:plate_no, to: :dispatch)
+      delegate(:driver_name, to: :dispatch)
 
       def validate_dispatch_status
         return unless dispatch
@@ -42,12 +45,21 @@ module Cats
       end
 
       def confirm
-        # Check if all transactions are committed first.
         if instance_of?(DispatchAuthorization)
           raise(StandardError, 'Authorization does not have transactions.') if transactions.blank?
 
-          count = transactions.where(status: Transaction::DRAFT).count
-          raise(StandardError, 'There are uncommitted transactions.') if count.positive?
+          transactions.each(&:commit)
+          # count = transactions.where(status: Transaction::DRAFT).count
+          # raise(StandardError, 'There are uncommitted transactions.') if count.positive?
+        elsif instance_of?(ReceiptAuthorization)
+          raise(StandardError, 'Authorization does not have receipts.') unless receipts.count.positive?
+
+          total_received = receipts.sum(:quantity)
+          total_lost = lost_commodities.sum(:quantity)
+          diff = quantity - (total_received + total_lost)
+          raise(StandardError, "A quantity of #{diff} is unaccounted for.") unless diff.zero?
+
+          self.received_quantity = total_received
         end
         self.status = CONFIRMED
         save!

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

@@ -3,12 +3,13 @@ module Cats
     class Dispatch < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
+      READY_TO_START = 'Ready to Start'.freeze
       STARTED = 'Started'.freeze
       ARRIVED = 'Arrived'.freeze
       UNLOADED = 'Unloaded'.freeze
       RECEIVED = 'Received'.freeze
 
-      DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
+      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
 
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
@@ -60,14 +61,16 @@ module Cats
         save!
       end
 
+      def all_authorizations_confirmed?
+        statuses = dispatch_authorizations.map(&:status).uniq
+        return true if statuses.length == 1 && statuses[0] == Authorization::CONFIRMED
+
+        false
+      end
+
       def start
-        Dispatch.transaction do
-          # Commit transactions
-          self.quantity = dispatch_transactions.sum(:quantity)
-          self.dispatch_status = STARTED
-          save!
-          dispatch_transactions.each(&:commit)
-        end
+        self.dispatch_status = STARTED
+        save!
       end
 
       def self.search_commodity(batch_no)

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

@@ -1,10 +1,9 @@
 module Cats
   module Core
     class LostCommodity < ApplicationRecord
-      belongs_to :dispatch
+      belongs_to :receipt_authorization
 
-      validates :quantity, presence: true
-      validates :commodity_status, presence: true, inclusion: { in: Commodity::COMMODITY_STATUSES }
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Cats
+  module Core
+    class Receipt < ApplicationRecord
+      belongs_to :receipt_authorization
+
+      validates :commodity_status, presence: true, inclusion: { in: Commodity::COMMODITY_STATUSES }
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+    end
+  end
+end

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

@@ -1,26 +1,22 @@
 module Cats
   module Core
     class ReceiptAuthorization < Authorization
+      has_many :receipts
+      has_many :lost_commodities
       has_many :receipt_transactions
 
-      validates :lost_quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :received_quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validate :validate_total_quantity
 
       def validate_total_quantity
         return unless dispatch && quantity
 
-        received = dispatch.receipt_authorizations.sum(:quantity) + dispatch.receipt_authorizations.sum(:lost_quantity)
+        received = dispatch.receipt_authorizations.sum(:quantity)
         diff = dispatch.quantity - received
         diff += quantity_was if quantity_was
-        diff += lost_quantity_was if lost_quantity_was
 
         errors.add(:quantity, "authorized is higher than dispatch quantity (Max = #{diff}).") if quantity > diff
       end
-
-      def confirm
-        self.status = CONFIRMED
-        save!
-      end
     end
   end
 end

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

@@ -9,6 +9,7 @@ module Cats
       validate :validate_receipt, :validate_quantity
 
       delegate(:code, to: :destination, prefix: true)
+      delegate(:dispatch_reference_no, to: :receipt_authorization)
 
       def validate_receipt
         return unless receipt_authorization

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

@@ -2,7 +2,7 @@ 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
+                 :authorizer_full_name, :dispatch_status, :plate_no, :driver_name
     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

@@ -1,8 +1,8 @@
 module Cats
   module Core
     class ReceiptAuthorizationSerializer < ActiveModel::Serializer
-      attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :lost_quantity, :remark,
-                 :status, :authorized_by_id, :authorizer_full_name
+      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_authorization_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_authorization.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,13 +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 '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'
@@ -117,13 +117,22 @@ Cats::Core::Engine.routes.draw do
     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,

data/db/migrate/20210727074646_create_cats_core_receipt_authorizations.rb

@@ -10,7 +10,7 @@ class CreateCatsCoreReceiptAuthorizations < ActiveRecord::Migration[6.1]
                    index: { name: 'store_on_ra_indx' },
                    foreign_key: { to_table: :cats_core_stores } 
       t.float :quantity, null: false
-      t.float :lost_quantity, null: false, default: 0
+      t.float :received_quantity, null: false, default: 0
       t.string :status, null: false, default: 'Authorized'
       t.string :remark
       t.references :authorized_by,

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/lib/cats/core/version.rb

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

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

@@ -33,11 +33,27 @@ FactoryBot.define do
       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

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

@@ -1,19 +1,25 @@
 FactoryBot.define do
   factory :receipt_authorization, class: 'Cats::Core::ReceiptAuthorization' do
-    dispatch do
-      dispatch = create(:dispatch, :with_transaction)
-      dispatch.start
-      dispatch
-    end
+    association :dispatch, :started
     store
     quantity { 100 }
-    lost_quantity { 0 }
+    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
-      status { Cats::Core::ReceiptAuthorization::CONFIRMED }
+      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/receipts.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :receipt, class: 'Cats::Core::Receipt' do
+    receipt_authorization
+    commodity_status { Cats::Core::Commodity::GOOD }
+    quantity { 50 }
+    remark { FFaker::Name.name }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.22
+  version: 1.4.23
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -246,6 +246,7 @@ files:
 - app/controllers/cats/core/notifications_controller.rb
 - app/controllers/cats/core/receipt_authorizations_controller.rb
 - app/controllers/cats/core/receipt_transactions_controller.rb
+- app/controllers/cats/core/receipts_controller.rb
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/round_plans_controller.rb
 - app/controllers/cats/core/routes_controller.rb
@@ -292,6 +293,7 @@ files:
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
+- app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_authorization.rb
 - app/models/cats/core/receipt_transaction.rb
 - app/models/cats/core/rhn_request.rb
@@ -350,6 +352,7 @@ files:
 - app/serializers/cats/core/unit_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
+- app/services/cats/core/authorization_service.rb
 - app/services/cats/core/dispatch_plan_service.rb
 - app/services/cats/core/dispatch_service.rb
 - app/services/cats/core/menu_service.rb
@@ -396,6 +399,7 @@ files:
 - db/migrate/20210719133710_create_cats_core_stacking_rules.rb
 - db/migrate/20210724074657_create_cats_core_notifications.rb
 - db/migrate/20210727074646_create_cats_core_receipt_authorizations.rb
+- db/migrate/20210727105834_create_cats_core_receipts.rb
 - db/migrate/20210728041505_create_cats_core_lost_commodities.rb
 - db/migrate/20210814160628_create_cats_core_receipt_transactions.rb
 - db/migrate/20210814175406_create_cats_core_stack_transactions.rb
@@ -465,6 +469,7 @@ files:
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_authorizations.rb
 - spec/factories/cats/core/receipt_transactions.rb
+- spec/factories/cats/core/receipts.rb
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb