cats_core 1.4.23 → 1.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c58aa13420d9d6df2e5954237e8d8fbfef4db3d620636a49bba9ba2c6d30eb2
-  data.tar.gz: 6ff8e9bc22538cef900ed1e4ef1d80620699f5b94df2bbf8771f37cf4b0367b1
+  metadata.gz: 67116f414334d42cf370f7a2ec48cf137bd1ac0c8d1345e0ce5c99f8fc87c57c
+  data.tar.gz: 0fc96065462743887b84a6bc750f97d52bd1f047a32c71fa1b70bb3eda9148cb
 SHA512:
-  metadata.gz: caf7a1b4209a0405e22dbf86736424ce82f577ded281348911faed27a1cbc9e232c35eea14cdb768d2655aaa8dcce9fda5362ac3c60ec088b13522a191eeabbc
-  data.tar.gz: 2992ab176cd20d2e82a56ac9fc178d5aa06cc8870aa67c5c545f42804c9d31dc082203ef5cdebae968b69aee147689056d06401cffe35f4d566d0c5026bf470c
+  metadata.gz: 148225081058c17d1435f7888da4076ecfacb458a37154e64fd5eabe1fb3470cc3ff4fcafa696db893eb3d3a70ad90920cb25b408723fd4140b3a6e1f70d02ea
+  data.tar.gz: a7ee6bc61afe79bfbb22d65a02852ea00a0872971c023fd0783f30de6f33b59eb47a4807887b239aa8e54996eca58924fdae8321c73c1af2db078e193f39067d

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

@@ -10,8 +10,8 @@ module Cats
       end
 
       def confirm
-        service = AuthorizationService.new
-        authorization = service.confirm(params[:id])
+        authorization = DispatchAuthorization.find(params[:id])
+        authorization = authorization.confirm
         render json: { success: true, data: serialize(authorization) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -2,8 +2,8 @@ module Cats
   module Core
     class DispatchesController < ApplicationController
       include Common
-
-      before_action :set_service, only: %i[create_receipt_authorization approve start search confirm]
+      skip_before_action :authenticate, only: %i[start_with_pin]
+      before_action :set_service, only: %i[create_receipt_authorization approve start start_with_pin search confirm]
 
       def index
         super do
@@ -35,6 +35,13 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
+      def start_with_pin
+        dispatch = @service.start_with_pin(params[:id], start_with_pin_params[:pin])
+        render json: { success: true, data: serialize(dispatch) }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
       def confirm
         dispatch = set_object
         dispatch.confirm
@@ -68,6 +75,10 @@ module Cats
         params.require(:payload).permit(:reference_no, :dispatch_plan_item_id, :transporter_id, :plate_no, :unit_id,
                                         :driver_name, :driver_phone, :remark)
       end
+
+      def start_with_pin_params
+        params.require(:payload).permit(:pin)
+      end
     end
   end
 end

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

@@ -17,6 +17,23 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
+      def stack
+        service = AuthorizationService.new
+        authorization = ReceiptAuthorization.find(params[:id])
+        authorization = service.stack(authorization.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])
+        status = params[:status]
+        stores = storekeeper.stores
+        authorizations = ReceiptAuthorization.where(store: stores, status: status)
+        render json: { success: true, data: serialize(authorizations) }
+      end
+
       private
 
       def model_params

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

@@ -46,11 +46,19 @@ module Cats
 
       def confirm
         if instance_of?(DispatchAuthorization)
-          raise(StandardError, 'Authorization does not have transactions.') if transactions.blank?
-
-          transactions.each(&:commit)
-          # count = transactions.where(status: Transaction::DRAFT).count
-          # raise(StandardError, 'There are uncommitted transactions.') if count.positive?
+          ActiveRecord::Base.transaction do
+            raise(StandardError, 'Authorization does not have transactions.') if transactions.blank?
+
+            transactions.each(&:commit)
+            self.status = CONFIRMED
+            save!
+            if dispatch.all_authorizations_confirmed?
+              dispatch.generate_pin
+              dispatch.quantity = dispatch.dispatch_transactions.sum(:quantity)
+              dispatch.dispatch_status = Dispatch::READY_TO_START
+              dispatch.save!
+            end
+          end
         elsif instance_of?(ReceiptAuthorization)
           raise(StandardError, 'Authorization does not have receipts.') unless receipts.count.positive?
 
@@ -60,8 +68,16 @@ module Cats
           raise(StandardError, "A quantity of #{diff} is unaccounted for.") unless diff.zero?
 
           self.received_quantity = total_received
+          self.status = CONFIRMED
+          save!
+          generate_pin
         end
-        self.status = CONFIRMED
+        self
+      end
+
+      def generate_pin
+        pin = SecureRandom.hex(10)
+        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 1.hour }
         save!
       end
 

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

@@ -5,11 +5,10 @@ module Cats
       APPROVED = 'Approved'.freeze
       READY_TO_START = 'Ready to Start'.freeze
       STARTED = 'Started'.freeze
-      ARRIVED = 'Arrived'.freeze
-      UNLOADED = 'Unloaded'.freeze
       RECEIVED = 'Received'.freeze
+      STACKED = 'Stacked'.freeze
 
-      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
+      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, RECEIVED, STACKED].freeze
 
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
@@ -73,12 +72,24 @@ module Cats
         save!
       end
 
+      def receive
+        raise(StandardError, 'Dispatch is not started.') unless dispatch_status == Dispatch::STARTED
+
+        self.dispatch_status = RECEIVED
+        save!
+      end
+
+      def stack
+        self.dispatch_status = STACKED
+        save!
+      end
+
       def self.search_commodity(batch_no)
         commodity = Commodity.find_by(batch_no: batch_no)
         dispatches = Dispatch.includes(:dispatch_transactions)
                              .joins(:transporter)
                              .where(
-                               dispatch_status: [APPROVED, STARTED, ARRIVED, UNLOADED]
+                               dispatch_status: [APPROVED, STARTED]
                              )
         dispatches.map do |dispatch|
           {
@@ -92,6 +103,12 @@ module Cats
           }
         end
       end
+
+      def generate_pin
+        pin = SecureRandom.hex(10)
+        self.auth_details = { pin: pin, active: true, expires_at: DateTime.now + 1.hour }
+        save!
+      end
     end
   end
 end

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, :dispatch_status, :plate_no, :driver_name
+                 :authorizer_full_name, :dispatch_status, :plate_no, :driver_name, :status
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Cats
     class DispatchSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :dispatch_plan_item_id, :transporter_id, :transporter_name, :plate_no,
                  :driver_name, :driver_phone, :quantity, :remark, :prepared_by_id, :prepared_by_email,
-                 :dispatch_status, :destination
+                 :dispatch_status, :destination, :auth_details
 
       def destination
         object.dispatch_plan_item.destination.name

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

@@ -2,7 +2,7 @@ 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
+                 :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details
     end
   end
 end

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

@@ -1,23 +1,45 @@
 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
+      def driver_confirm(authorization_id, pin)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        if authorization.status == Authorization::AUTHORIZED
+          raise(StandardError, 'Authorization not confirmed by storekeeper.')
         end
+
+        raise(StandardError, 'No pin has been generated for receipt.') if authorization.auth_details.nil?
+
+        raise(StandardError, 'Incorrect pin.') unless pin == authorization.auth_details['pin']
+
+        raise(StandardError, 'Pin is not active.') unless authorization.auth_details['active']
+
+        if DateTime.now > authorization.auth_details['expires_at']
+          authorization.auth_details[:active] = false
+          authorization.save!
+          raise(StandardError, 'Pin has expired.')
+        end
+
+        authorization.driver_confirmed = true
+        authorization.save!
+        statuses = authorization.dispatch.receipt_authorizations.map(&:driver_confirmed).uniq
+        authorization.dispatch.receive if statuses.length == 1 && statuses[0]
+
+        authorization
+      end
+
+      def stack(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        unless authorization.dispatch.dispatch_status == Dispatch::RECEIVED
+          raise(StandardError, 'Dispatch is not received.')
+        end
+
+        total = authorization.transactions.sum(:quantity)
+        if total != authorization.received_quantity
+          raise(StandardError, 'Received quantity is not the same as quantity to be stacked.')
+        end
+
+        authorization.transactions.each(&:commit)
+        authorization.dispatch.stack
         authorization
       end
     end

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

@@ -37,6 +37,28 @@ module Cats
         dispatch
       end
 
+      def start_with_pin(dispatch_id, pin)
+        dispatch = Dispatch.find(dispatch_id)
+        raise(StandardError, 'Dispatch is already started.') if dispatch.dispatch_status == Dispatch::STARTED
+
+        raise(StandardError, 'No pin has been generated for dispatch.') if dispatch.auth_details.nil?
+
+        raise(StandardError, 'Incorrect pin.') unless pin == dispatch.auth_details['pin']
+
+        raise(StandardError, 'Pin is not active.') unless dispatch.auth_details['active']
+
+        if DateTime.now > dispatch.auth_details['expires_at']
+          dispatch.auth_details[:active] = false
+          dispatch.save!
+          raise(StandardError, 'Pin has expired.')
+        end
+        dispatch.start
+        send_notification(dispatch)
+        dispatch.auth_details = nil
+        dispatch.save!
+        dispatch
+      end
+
       def send_notification(dispatch)
         notification_rule = Cats::Core::NotificationRule.find_by(code: 'dispatch')
         raise(StandardError, 'Notification rule not found for dispatch notification.') unless notification_rule

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

@@ -34,13 +34,10 @@ module Cats
         end
       end
 
-      def receipt_stacks(receipt)
-        location = receipt.dispatch.dispatch_plan_item.destination
-        warehouses = location.children
-        stores = Store.where(warehouse: warehouses)
-
-        commodity = receipt.dispatch.dispatch_plan_item.commodity
-        Stack.where(commodity: commodity, store: stores)
+      def receipt_stacks(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        commodity = authorization.dispatch.dispatch_plan_item.commodity
+        Stack.where(commodity: commodity, store_id: authorization.store_id)
       end
 
       def dispatch_stacks(dispatch)

data/config/routes.rb

@@ -107,6 +107,7 @@ Cats::Core::Engine.routes.draw do
       post 'approve'
       post 'start'
       post 'confirm'
+      post 'start_with_pin'
     end
   end
 
@@ -118,10 +119,16 @@ Cats::Core::Engine.routes.draw do
   end
 
   get(
-    '/storekeeper/:id/authorizations',
+    '/storekeeper/:id/dispatch_authorizations',
     controller: :dispatch_authorizations,
     action: :storekeeper_authorizations,
-    as: :storekeeper_authorizations
+    as: :storekeeper_dispatch_authorizations
+  )
+  get(
+    '/storekeeper/:id/receipt_authorizations',
+    controller: :receipt_authorizations,
+    action: :storekeeper_authorizations,
+    as: :storekeeper_receipt_authorizations
   )
   resources :receipt_authorizations, except: %i[index destroy] do
     member do
@@ -129,6 +136,7 @@ Cats::Core::Engine.routes.draw do
       get 'lost', controller: :lost_commodities, action: :index
       get 'receipts', controller: :receipts, action: :index
       post 'confirm', controller: :receipt_authorizations, action: :confirm
+      post 'stack'
     end
   end
 

data/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -25,6 +25,7 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
                    index: { name: 'pb_on_dispatches_indx' },
                    foreign_key: { to_table: :cats_core_users }
       t.string :dispatch_status, null: false
+      t.jsonb :auth_details
 
       t.timestamps
     end

data/db/migrate/20210727074646_create_cats_core_receipt_authorizations.rb

@@ -13,6 +13,8 @@ class CreateCatsCoreReceiptAuthorizations < ActiveRecord::Migration[6.1]
       t.float :received_quantity, null: false, default: 0
       t.string :status, null: false, default: 'Authorized'
       t.string :remark
+      t.jsonb :auth_details
+      t.boolean :driver_confirmed, null: false, default: false
       t.references :authorized_by,
                    null: false,
                    index: { name: 'ab_on_receipt_authorizations_indx' },

data/lib/cats/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.23
+  version: 1.4.26
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers