cats_core 1.4.24 → 1.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd00b147a4dfa4ab46e10d7961b4291fbdb39ed68e49a0766e69a4a4d22704a
-  data.tar.gz: 1c37f11f41f76263cb197cdd881b820475a38e8addf1424fce593287ab1e30ad
+  metadata.gz: ad828e18f9f084f3c2e0343af564a1f1cc4832e935c9eec068503f4293442b87
+  data.tar.gz: 8e0520ff2a6df1e2b4dd3f726a60aef02ef45915158c72c73ccbc74a9ae2786d
 SHA512:
-  metadata.gz: ce78191aa4dde60ba521f32f95a87088f7e9380fcba3e3a05f2cb570c4fd722b6b1962ddff54ab76ea0278552b1640f3a72b0e96571e0160b096bc49b00abd56
-  data.tar.gz: f5e36206d35c62b26cd16bdcaeea9f11c711d90c2c68b6f5c5eeb4e174621c4ad6e8ef28f0082ad74cb505e82bbc44876cd67da9be92b045beebfd0f22c1b269
+  metadata.gz: cc1d8fc0861a5f8c46734cbbf029608625e8734d31361cf924834769166cc6d429f247b169b299616a5bedcf9dffd0cdc2ad4960e4caa502757a1a98cfd55865
+  data.tar.gz: '0850a3f89b88aea548765a78f46a8d4cac259642dc3f8c15837ab54c1d5c7911b311b8b55719972fe19312cf614d07042652376556a134ea2e20c8b1f7227fc1'

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/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

@@ -92,6 +92,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,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)
+      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']
 
-        ActiveRecord::Base.transaction do
-          authorization.confirm
+        raise(StandardError, 'Pin is not active.') unless authorization.auth_details['active']
 
-          # 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
+        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!
         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/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
 

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.24'.freeze
+    VERSION = '1.4.25'.freeze
   end
 end

metadata

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