cats_core 1.3.37 → 1.3.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed830f2b21060736c309012ce715496a38df7a44e6afd7e83971600a5cd009a
-  data.tar.gz: b3fb80830191593df49aa191c551aa7c7282adaeb2163699c43cb47e0ce32128
+  metadata.gz: 8791c0f14b18ed18bfdf1cfec2d9b16b7909f9992470b13343a65a841aec6fac
+  data.tar.gz: 896aed01d613d3325b1b37103d03df781fd4351309a58a6b3b6b8409e5074101
 SHA512:
-  metadata.gz: fee481c6274541b597cc4cacdbbfe1fcb60db2790e487969e69de92705d262dacb29793dba304cf995e937ab4e7cdc78120a3da2e3b11decdafe7da28d0a26dd
-  data.tar.gz: 9022d76253b7050228e138eb096ffa462010a00f4b42508219fcb164b95ee8030f53b51cffe6b28f9e7e8ea0e5389fdce2eb268fdbc8addc32ebdc6b7cf55f65
+  metadata.gz: 6a0557c322d36efa4d843def05f22e857293e63590d7976e505c993933bb6199f2c7eb73ec44aa28d959d1e33f0528e6106ce435d959e1059aa42812696f65b4
+  data.tar.gz: 5b6d7d296ec99ab60c9456c566616593dd11a7c0281c0f03bac39441ca97ab90e5cbd9e39acb13c7d6a5895d71a5d8371da53445712dbda01c409a8259f1667e

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

@@ -8,6 +8,11 @@ module Cats
         render json: { success: true, data: serialize(items) }
       end
 
+      def filter
+        query = Cats::Core::DispatchPlanItem.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -22,8 +22,9 @@ module Cats
       end
 
       def approve
+        service = DispatchPlanService.new
         plan = Cats::Core::DispatchPlan.find(params[:id])
-        plan.approve
+        plan = service.approve(plan)
         render json: { success: true, data: serialize(plan) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -8,6 +8,26 @@ module Cats
         render json: { success: true, data: serialize(transactions) }
       end
 
+      # This end-point is used to create upstream dispatch transactions.
+      # We need a specific method like this because for upstream the source
+      # stack is a dummy one and we need to use that without waiting for the
+      # user to give us a source.
+      def create_allocation
+        dispatch = Dispatch.find(model_params[:dispatch_id])
+        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        transaction = DispatchTransaction.new(model_params)
+
+        # Fetch supplier stack by commodity
+        stack = Stack.joins(:store).find_by(commodity: commodity, store: { code: 'SUP-STORE' })
+        transaction.source = stack
+
+        if transaction.save
+          render json: { success: true, data: serialize(transaction) }, status: :created
+        else
+          render json: { success: false, error: transaction.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       private
 
       def model_params

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

@@ -9,26 +9,16 @@ module Cats
       end
 
       def create
-        p = model_params
-        receipt = Cats::Core::Receipt.find_by(
-          dispatch_id: p[:dispatch_id],
-          commodity_status: p[:commodity_status]
-        )
-        if receipt
-          receipt.quantity += p[:quantity]
-          if receipt.save
-            render json: { success: true, data: serialize(receipt) }
-          else
-            render json: { success: false, error: receipt.errors.full_messages[0] }, status: :unprocessable_entity
-          end
+        service = ReceiptService.new
+        receipt = service.init(model_params)
+
+        if receipt.save
+          render json: { success: true, data: serialize(receipt) }
         else
-          obj = Cats::Core::Receipt.new(model_params)
-          if obj.save
-            render json: { success: true, data: serialize(obj) }, status: :created
-          else
-            render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
-          end
+          render json: { success: false, error: receipt.errors.full_messages[0] }, status: :unprocessable_entity
         end
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
       end
 
       def start_stacking

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

@@ -0,0 +1,37 @@
+module Cats
+  module Core
+    class StacksController < ApplicationController
+      include Common
+
+      def index
+        stacks = Stack.where(store_id: params[:id])
+        render json: { success: true, data: serialize(stacks) }
+      end
+
+      def filter
+        query = Stack.where(store_id: params[:id]).ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
+      def commodity_for_location
+        service = StackService.new
+        commodities = service.commodity_for_location(current_user)
+        render json: { success: true, data: serialize(commodities) }
+      end
+
+      def receipt_stacks
+        service = StackService.new
+        receipt = Receipt.find(params[:id])
+        stacks = service.receipt_stacks(receipt)
+        render json: { success: true, data: serialize(stacks) }
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:code, :length, :width, :height, :start_x, :start_y, :commodity_id, :store_id,
+                                        :commodity_status, :stack_status, :quantity)
+      end
+    end
+  end
+end

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

@@ -3,6 +3,11 @@ module Cats
     class TransportersController < ApplicationController
       include Cats::Core::Common
 
+      def filter
+        query = Cats::Core::Transporter.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -71,6 +71,7 @@ module Cats
         return unless store.present? && length.present? && width.present? && start_x.present? && start_y.present?
 
         stacks = store.stacks.where(stack_status: [RESERVED, ALLOCATED]).where.not(id: id)
+
         stacks.each do |s|
           errors.add(:base, message: "#{code} overlaps with #{s.code}") if overlaps?(self, s)
         end

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

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

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

@@ -1,3 +1,8 @@
-class MonthlyPlanSerializer < ActiveModel::Serializer
-  attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :month, :no_of_days
+module Cats
+  module Core
+    class MonthlyPlanSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :month,
+                 :no_of_days
+    end
+  end
 end

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class StackSerializer < ActiveModel::Serializer
+      attributes :id, :code, :length, :width, :height, :start_x, :start_y, :commodity_id, :store_id, :commodity_status,
+                 :stack_status, :quantity, :commodity_batch_no
+    end
+  end
+end

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

@@ -4,7 +4,27 @@ module Cats
       def approve(plan)
         plan.approve
 
-        plan.dispatchable.allocate if plan.dispatchable_type == RhnRequest.name
+        if plan.upstream
+          # Create source hub authorizations for each item and
+          # put them in a `Source Authorized` state
+          store = Store.find_by(code: 'SUP-STORE')
+          keeper = User.find_by(first_name: 'SUP-Storekeeper')
+          authorizations = []
+          plan.dispatch_plan_items.each do |item|
+            authorizations << {
+              dispatch_plan_item_id: item.id,
+              store_id: store.id,
+              quantity: item.quantity,
+              authorization_type: HubAuthorization::SOURCE,
+              authorized_by_id: keeper.id,
+              created_at: Date.today,
+              updated_at: Date.today
+            }
+          end
+          HubAuthorization.insert_all(authorizations)
+          plan.dispatch_plan_items.update_all(status: DispatchPlanItem::SOURCE_AUTHORIZED)
+          plan.dispatchable.allocate
+        end
         # send_notification(plan)
         plan
       end

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

@@ -21,6 +21,28 @@ module Cats
         receipt.save!
         receipt
       end
+
+      def init(params)
+        receipt = Cats::Core::Receipt.find_by(
+          dispatch_id: params[:dispatch_id],
+          commodity_status: params[:commodity_status]
+        )
+
+        if receipt
+          # We can assume that the plan item is destination authorized.
+          # Therefore no need for checking destination authorization.
+          receipt.quantity += params[:quantity]
+          return receipt
+        end
+
+        # Check if plan item is destination authorized
+        dispatch = Dispatch.find(params[:dispatch_id])
+        status = dispatch.dispatch_plan_item.status
+        statuses = [DispatchPlanItem::DESTINATION_AUTHORIZED, DispatchPlanItem::AUTHORIZED]
+        raise(StandardError, 'Plan item is not destination authorized.') unless statuses.include?(status)
+
+        Receipt.new(params)
+      end
     end
   end
 end

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

@@ -0,0 +1,59 @@
+module Cats
+  module Core
+    class StackService
+      def commodity_for_location(user)
+        details = user.details
+
+        key_available = details.keys.any? { |key| %w[stores warehouse hub].include?(key) }
+        raise(StandardError, 'User does not have associated location.') unless key_available
+
+        if details['hub']
+          hub = Cats::Core::Location.find(details['hub'])
+          allocation_items =
+            Cats::Core::AllocationItem
+            .joins(allocation: :commodity)
+            .where(destination: hub, allocation: { allocation_status: Cats::Core::Allocation::APPROVED })
+        else
+          if details['stores']
+            warehouse = Cats::Core::Store.find(details['stores'][0]).warehouse
+            hub = warehouse.parent
+          elsif details['warehouse']
+            warehouse = Cats::Core::Location.find(details['warehouse'])
+            hub = warehouse.parent
+          end
+          allocation_items =
+            Cats::Core::AllocationItem
+            .joins(allocation: :commodity)
+            .where(destination: hub, allocation: { allocation_status: Cats::Core::Allocation::APPROVED })
+            .or(
+              Cats::Core::AllocationItem
+                .joins(allocation: :commodity)
+                .where(destination: warehouse, allocation: { allocation_status: Cats::Core::Allocation::APPROVED })
+            )
+        end
+
+        allocation_items.map do |item|
+          {
+            reference_no: item.allocation.reference_no,
+            source: item.allocation.source.name,
+            destination: item.destination.name,
+            quantity: item.quantity,
+            batch_no: item.allocation.commodity.batch_no,
+            commodity_id: item.allocation.commodity_id,
+            commodity_name: item.allocation.commodity.name,
+            unit: item.allocation.commodity.unit_of_measure.abbreviation
+          }
+        end
+      end
+
+      def receipt_stacks(receipt)
+        location = receipt.dispatch.dispatch_plan_item.destination
+        warehouses = location.children
+        stores = Cats::Core::Store.where(warehouse: warehouses)
+
+        commodity = receipt.dispatch.dispatch_plan_item.dispatch_plan.commodity
+        Cats::Core::Stack.where(commodity: commodity, store: stores)
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -73,6 +73,8 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+
+  post '/transporters/filter', controller: :transporters, action: :filter
   resources :transporters, except: %i[destroy]
 
   post '/routes/filter', controller: :routes, action: :filter
@@ -88,6 +90,7 @@ Cats::Core::Engine.routes.draw do
 
   resources :dispatch_plan_items, except: %i[index destroy]
 
+  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
 
   get '/dispatches/search', controller: :dispatches, action: :search, as: :search_dispatches
@@ -102,6 +105,13 @@ Cats::Core::Engine.routes.draw do
       post 'confirm'
     end
   end
+
+  post(
+    'dispatch_transactions/allocation',
+    controller: :dispatch_transactions,
+    action: :create_allocation,
+    as: :allocation_transaction
+  )
   resources :dispatch_transactions, except: %i[index new edit destroy]
   resources :receipts, except: %i[index new edit destroy] do
     member do
@@ -122,4 +132,10 @@ Cats::Core::Engine.routes.draw do
       post 'approve'
     end
   end
+
+  get '/stores/:id/stacks', controller: :stacks, action: :index, as: :stacks_store
+  post '/stores/:id/stacks', controller: :stacks, action: :filter
+  get '/stacks/commodity_for_location', controller: :stacks, action: :commodity_for_location, as: :commodity_for_location
+  get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
+  resources :stacks, only: %i[show index create update]
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.37'.freeze
+    VERSION = '1.3.40'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.37
+  version: 1.3.40
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -249,6 +249,7 @@ files:
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
+- app/controllers/cats/core/stacks_controller.rb
 - app/controllers/cats/core/transporters_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
@@ -331,6 +332,7 @@ files:
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/role_serializer.rb
 - app/serializers/cats/core/route_serializer.rb
+- app/serializers/cats/core/stack_serializer.rb
 - app/serializers/cats/core/transporter_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
@@ -341,6 +343,7 @@ files:
 - app/services/cats/core/notification_service.rb
 - app/services/cats/core/receipt_service.rb
 - app/services/cats/core/space_service.rb
+- app/services/cats/core/stack_service.rb
 - app/services/cats/core/token_auth_service.rb
 - config/routes.rb
 - db/migrate/20210715114238_create_cats_core_application_modules.rb