cats_core 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affaa1b4a210fc6234d49f105efd3a0e197b8d9e6c2ad7e00ae2dbefd23cfe31
-  data.tar.gz: 608f4585d6c34f68a62a7bcfc187d495ac21a0fa528f905bcda7044801ab4c1f
+  metadata.gz: 05ec37047a728927e68df2e0a0ae34dd16cca869cfe658314ea5fb0738ae894b
+  data.tar.gz: 272f1c6cb33e96a8407cab42c3b9bd8b01540156feee9bf4d6012b5b97600b52
 SHA512:
-  metadata.gz: 68b8a081e2ee0e3ad7edb1876b76a1cb2d2c0b8836de2af209acb01de699d004c0fd2f74c0357a27857fd287f249f3338950debe88c15ee2b742cfe72f4d62cd
-  data.tar.gz: 4b5c89c2de473ec47255835b1862ddaa42f44b4a99d5410bd4c63515b73bef77d1ef92328a75358a00dd29992afa2bcf2c582cbde84a5d63de2833d10944aada
+  metadata.gz: 19a5247f29b37ca8dc8a0176719b22b924069166168ddcf684a84ca0bcbd45ae170a164516ffada4cb2066b428ece538f89c8daa45bfb2db15bd432fb9676dab
+  data.tar.gz: b41ed1c8028112b527cd21b01821187260ba85ab2647fe7f477422a69f40a72420aed74d6741d3525f5812d110354b85bc12cf23b54163ce921286be1d185e10

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

@@ -34,7 +34,7 @@ module Cats
       def model_params
         params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
-                                        :arrival_status)
+                                        :arrival_status, :shipping_reference)
       end
     end
   end

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

@@ -9,6 +9,11 @@ module Cats
         render json: { success: true, data: data }
       end
 
+      def all
+        data = Cats::Core::CommodityCategory.all
+        render json: { success: true, data: data }
+      end
+
       def root
         data = Cats::Core::CommodityCategory.roots
         render json: { success: true, data: serialize(data) }

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

@@ -17,7 +17,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status,
-                                        :status)
+                                        :status, :commodity_id)
       end
     end
   end

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

@@ -33,7 +33,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type, :commodity_id)
+        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type)
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Cats
       # user to give us a source.
       def create_allocation
         dispatch = Dispatch.find(model_params[:dispatch_id])
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         transaction = DispatchTransaction.new(model_params)
 
         # Fetch supplier stack by commodity

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

@@ -49,7 +49,7 @@ module Cats
       end
 
       def commodity
-        data = @dispatch.dispatch_plan_item.dispatch_plan.commodity
+        data = @dispatch.dispatch_plan_item.commodity
         render json: { success: true, data: serialize(data) }
       end
 

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

@@ -17,12 +17,10 @@ module Cats
 
       def approve
         plan = Cats::Core::MonthlyPlan.find(params[:id])
-        if plan.monthly_plan_items.count.zero?
-          render json: { success: false, error: 'Empty plan cannot be approved.' }, status: :unprocessable_entity
-          return
-        end
-        plan.update(status: Cats::Core::Plan::APPROVED)
+        plan.approve
         render json: { success: true, data: serialize(plan) }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }, status: :unprocessable_entity
       end
 
       def generate

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

@@ -13,9 +13,9 @@ module Cats
         render json: { success: true, data: serialize(query.result) }
       end
 
-      def commodity_for_location
+      def items_for_location
         service = StackService.new
-        commodities = service.commodity_for_location(current_user)
+        commodities = service.items_for_location(current_user)
         render json: { success: true, data: serialize(commodities) }
       end
 

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class UnitConversionsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:from_id, :to_id, :factor)
+      end
+    end
+  end
+end

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

@@ -31,8 +31,6 @@ module Cats
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
 
-      has_many :allocations
-
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
@@ -40,7 +38,7 @@ module Cats
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
       validates :status, presence: true, inclusion: { in: STATUSES }
 
-      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')
       delegate(:reference_no, to: :source, prefix: true)
 
       def name
@@ -74,25 +72,6 @@ module Cats
         end
         result
       end
-
-      def allocate(ignore_errors: true)
-        statuses = Allocation.where(commodity_id: id).map(&:allocation_status).uniq
-        unless statuses.count == 1 && statuses[0] == APPROVED
-          return if ignore_errors
-
-          raise(StandardError, 'There are allocations in "Draft" state.')
-        end
-
-        quantity = allocations.sum(:quantity)
-        unless quantity == self.quantity
-          return if ignore_errors
-
-          raise(StandardError, 'Total allocations quantity is not the same as commodity quantity.')
-        end
-
-        self.status = ALLOCATED
-        save!
-      end
     end
   end
 end

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

@@ -8,7 +8,6 @@ module Cats
       belongs_to :dispatchable, polymorphic: true, optional: true
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
-      belongs_to :commodity
 
       has_many :dispatch_plan_items
 
@@ -16,7 +15,6 @@ module Cats
       validates :status, inclusion: { in: STATUSES }
       validate :validate_dispatchable, on: :create
 
-      delegate(:batch_no, :name, :quantity, to: :commodity, prefix: true)
       delegate(:request_reference, to: :dispatchable, allow_nil: true)
       delegate(:request_quantity, to: :dispatchable, allow_nil: true)
 
@@ -44,12 +42,12 @@ module Cats
 
         # Raise error if the total dispatch plan quantity is not equal to the
         # dispatchable quantity
-        if dispatchable && dispatchable.quantity != quantity
+        if dispatchable.instance_of?(RhnRequest) && dispatchable.quantity != quantity
           raise(StandardError, 'Requested quantity and plan quantity do not match.')
         end
 
         self.status = APPROVED
-        dispatchable&.allocate
+        dispatchable&.allocate if dispatchable.instance_of?(RhnRequest)
         save!
       end
 

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

@@ -10,6 +10,8 @@ module Cats
       belongs_to :source, class_name: 'Cats::Core::Location'
       belongs_to :destination, class_name: 'Cats::Core::Location'
       belongs_to :dispatch_plan
+      belongs_to :commodity
+
       has_many :dispatches
       has_many :hub_authorizations
 
@@ -18,7 +20,7 @@ module Cats
       validates :status, presence: true, inclusion: { in: STATUSES }
 
       delegate(:reference_no, to: :dispatch_plan, prefix: :plan, allow_nil: true)
-      delegate(:commodity_batch_no, :commodity_name, to: :dispatch_plan)
+      delegate(:batch_no, :name, to: :commodity, prefix: true)
       delegate(:name, to: :source, prefix: true)
       delegate(:name, to: :destination, prefix: true)
       delegate(:location_type, to: :source, prefix: true)

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

@@ -4,21 +4,24 @@ module Cats
       belongs_to :donation, optional: true
       belongs_to :commodity_category
       belongs_to :unit_of_measure
+      belongs_to :currency
       belongs_to :destination_warehouse, class_name: 'Cats::Core::Location'
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, :quantity, :requested_by, :request_reference, presence: true
+      validates :gift_date, :quantity, :requested_by, :customs_office, presence: true
       validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :destination_warehouse, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:code, to: :currency, prefix: true)
 
       before_validation :set_commodity_category
       after_create :update_donation
 
       def update_donation
-        donation = self.donation
+        return unless donation
+
         return if donation.active
 
         donation.active = true

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

@@ -4,11 +4,12 @@ module Cats
       REGION = 'Region'.freeze
       ZONE = 'Zone'.freeze
       WOREDA = 'Woreda'.freeze
+      FDP = 'Fdp'.freeze
       KEBELE = 'Kebele'.freeze
       HUB = 'Hub'.freeze
       WAREHOUSE = 'Warehouse'.freeze
 
-      LOCATION_TYPES = [REGION, ZONE, WOREDA, KEBELE, HUB, WAREHOUSE].freeze
+      LOCATION_TYPES = [REGION, ZONE, WOREDA, KEBELE, HUB, WAREHOUSE, FDP].freeze
 
       has_ancestry
 
@@ -23,6 +24,7 @@ module Cats
           ZONE => [REGION],
           WOREDA => [REGION, ZONE],
           KEBELE => [REGION, ZONE, WOREDA],
+          FDP => [REGION, ZONE, WOREDA],
           HUB => [REGION, ZONE, WOREDA, KEBELE],
           WAREHOUSE => [REGION, ZONE, WOREDA, KEBELE, HUB]
         }

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

@@ -3,6 +3,13 @@ module Cats
     class MonthlyPlan < ApplicationRecord
       include Dispatchable
 
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      RESERVED = 'Reserved'.freeze
+      NEEDS_APPROVED = 'Needs Approved'.freeze
+
+      STATUSES = [DRAFT, APPROVED, RESERVED, NEEDS_APPROVED].freeze
+
       belongs_to :plan
       belongs_to :region, class_name: 'Cats::Core::Location'
 
@@ -11,7 +18,7 @@ module Cats
       has_many :monthly_rations
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :status, presence: true, inclusion: { in: Cats::Core::Plan::STATUSES }
+      validates :status, presence: true, inclusion: { in: MonthlyPlan::STATUSES }
       validates :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
       validate :validate_month, :validate_region
 
@@ -26,6 +33,21 @@ module Cats
         nil
       end
 
+      def approve
+        raise(StandardError, 'Plan is not in draft state.') unless status == DRAFT
+
+        raise(StandardError, 'Empty plan cannot be approved.') if monthly_plan_items.count.zero?
+
+        update!(status: APPROVED)
+      end
+
+      def reserve
+        raise(StandardError, 'Plan is not approved.') unless status == APPROVED
+
+        self.status = RESERVED
+        save!
+      end
+
       def validate_month
         return unless month
 
@@ -35,7 +57,7 @@ module Cats
       def validate_region
         return unless region
 
-        errors.add(:region, 'is not valid.') unless region.location_type == Cats::Core::Location::REGION
+        errors.add(:region, 'is not valid.') unless region.location_type == Location::REGION
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Cats
       belongs_to :destination, class_name: 'Cats::Core::Location'
 
       validates :source_id, uniqueness: { scope: :destination_id }
-      validate :validate_region, :validate_source, :validate_destination
+      validate :validate_region, :validate_source, :validate_destination, :validate_route
 
       delegate(:name, to: :region, prefix: true)
 
@@ -35,6 +35,14 @@ module Cats
 
         errors.add(:destination, 'cannot be a region.') if destination.location_type == Location::REGION
       end
+
+      def validate_route
+        return unless source
+
+        return unless destination
+
+        errors.add(:base, 'Source and destination cannot be the same') if source == destination
+      end
     end
   end
 end

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

@@ -20,7 +20,8 @@ module Cats
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
       validates :stack_status, inclusion: { in: STACK_STATUSES }
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
-               :validate_space_between_stack, unless: -> { store && store.code == 'SUP-STORE' }
+               :validate_space_between_stack, :validate_max_height, :validate_max_length, :validate_max_width,
+               :validate_distance_from_ceiling, unless: -> { store && store.code == 'SUP-STORE' }
 
       delegate :batch_no, to: :commodity, prefix: true
 
@@ -48,9 +49,9 @@ module Cats
           space_between_stack: 1,
           distance_from_gangway: 2,
           distance_from_ceiling: 1,
-          maximum_height: 5,
-          maximum_length: 5,
-          maximum_width: 5,
+          maximum_height: 7,
+          maximum_length: 12,
+          maximum_width: 12,
           distance_from_wall: 1
         )
         rule
@@ -92,6 +93,32 @@ module Cats
         end
       end
 
+      def validate_max_height
+        return unless height
+
+        errors.add(:height, 'exceeds stacking rule height.') if height > stacking_rules.maximum_height
+      end
+
+      def validate_max_length
+        return unless length
+
+        errors.add(:length, 'exceeds stacking rule length.') if length > stacking_rules.maximum_length
+      end
+
+      def validate_max_width
+        return unless width
+
+        errors.add(:width, 'exceeds stacking rule width.') if width > stacking_rules.maximum_width
+      end
+
+      def validate_distance_from_ceiling
+        return unless height && store
+
+        return unless store.height - height < stacking_rules.distance_from_ceiling
+
+        errors.add(:height, 'of stack is close to the ceiling.')
+      end
+
       # A method that checks if an overlap exists b/n two stacks.
       # An overlap b/n stacks does not occur if one of the stacks is completely above the other stack or
       # if one of the stacks is on the left side of the other stack.

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

@@ -16,7 +16,7 @@ module Cats
       belongs_to :transport_plan
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :start_date, :end_date, :status, :bid_bond_amount, presence: true
+      validates :start_date, :end_date, :opening_date, :status, :bid_bond_amount, presence: true
       validates :bid_bond_amount, numericality: { greater_than_or_equal_to: 0 }
       validates :status, inclusion: { in: STATUSES }
       validate :validate_start_date_against_end_date
@@ -46,6 +46,10 @@ module Cats
         save!
         self
       end
+
+      def quantity
+        transport_bid_items.sum(:quantity)
+      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Cats
     class TransportBidItem < ApplicationRecord
       belongs_to :transport_bid
       belongs_to :transport_plan_item
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       has_many :offer_items
 
@@ -10,6 +11,7 @@ module Cats
       validates :transport_plan_item_id, uniqueness: true
 
       delegate(:reference_no, to: :transport_bid, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
 
       def route
         transport_plan_item.route.name

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

@@ -7,6 +7,7 @@ module Cats
 
       validates :offer_date, :bid_bond_amount, presence: true
       validates :bid_bond_amount, numericality: { greater_than_or_equal_to: 0 }
+      validates :transport_bid_id, uniqueness: { scope: :transporter_id }
 
       delegate(:name, to: :transporter, prefix: true)
       delegate(:reference_no, to: :transport_bid, prefix: 'bid')

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class UnitConversion < ApplicationRecord
+      belongs_to :from, class_name: 'Cats::Core::UnitOfMeasure'
+      belongs_to :to, class_name: 'Cats::Core::UnitOfMeasure'
+
+      validates :factor, presence: true
+      validates :from_id, uniqueness: { scope: :to_id }
+      validates :factor, numericality: { greater_than: 0 }
+
+      delegate(:abbreviation, to: :from, prefix: true)
+      delegate(:abbreviation, to: :to, prefix: true)
+
+      def self.convert(from, to, value)
+        return value if from == to
+
+        conversion = find_by(from: from, to: to)
+        error = "Conversion factor from #{from.abbreviation} to #{to.abbreviation} not found."
+        raise(StandardError, error) unless conversion
+
+        value * conversion.factor
+      end
+    end
+  end
+end

data/app/models/concerns/cats/core/dispatchable.rb

@@ -1,6 +1,6 @@
 # A concern to represent entities that lead to dispatch plan.
-# All classes including this concern must implement `request_reference()`
-# and `request_quantity()` methods, which will be used to generate
+# All classes including this concern must implement `request_reference()`,
+# `reserve()`, and `request_quantity()` methods, which will be used to generate
 # reference information in dispatch plan serializer.
 module Cats
   module Core

data/app/notifications/cats/core/allocation_notification.rb

@@ -12,14 +12,14 @@ module Cats
 
       def message
         allocation_item = params[:allocation_item]
-        commodity = allocation_item.dispatch_plan.commodity.name
+        commodity = allocation_item.commodity.name
         source = allocation_item.source.name
         destination = allocation_item.destination.name
         title = "Allocation Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following specification has been allocated to you:
-              Batch No. = #{allocation_item.dispatch_plan.commodity.batch_no}
+              Batch No. = #{allocation_item.commodity.batch_no}
               Commodity = #{commodity}
               Quantity = #{allocation_item.quantity}
           The commodity is expected to be delivered from #{source} to #{destination}

data/app/notifications/cats/core/dispatch_notification.rb

@@ -7,7 +7,7 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         title = "Dispatch Notification - #{commodity.name}"
         date = Date.today
         body = <<~BODY

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

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :arrival_status, :status
+                 :arrival_status, :status, :shipping_reference
     end
   end
 end

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

@@ -2,8 +2,7 @@ module Cats
   module Core
     class DispatchPlanSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :status, :dispatchable_id, :dispatchable_type, :request_reference,
-                 :request_quantity, :commodity_id, :commodity_name, :commodity_batch_no, :commodity_quantity,
-                 :upstream
+                 :request_quantity, :upstream
     end
   end
 end

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

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class UnitConversionSerializer < ActiveModel::Serializer
+      attributes :id, :from_id, :from_abbreviation, :to_id, :to_abbreviation, :factor
+    end
+  end
+end

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

@@ -1,47 +1,35 @@
 module Cats
   module Core
     class StackService
-      def commodity_for_location(user)
+      def items_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
+        hub = if details['hub']
+                Location.find(details['hub'])
+              elsif details['warehouse']
+                Location.find(details['warehouse']).parent
+              else
+                Store.find(details['stores'][0]).warehouse.parent
+              end
+
+        allocation_items =
+          DispatchPlanItem
+          .joins(:dispatch_plan)
+          .where(destination: hub, dispatch_plan: { status: DispatchPlan::APPROVED })
 
         allocation_items.map do |item|
           {
-            reference_no: item.allocation.reference_no,
-            source: item.allocation.source.name,
+            reference_no: item.dispatch_plan.reference_no,
+            source: item.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
+            batch_no: item.commodity.batch_no,
+            commodity_id: item.commodity_id,
+            commodity_name: item.commodity.name,
+            unit: item.commodity.unit_abbreviation
           }
         end
       end
@@ -51,7 +39,7 @@ module Cats
         warehouses = location.children
         stores = Store.where(warehouse: warehouses)
 
-        commodity = receipt.dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = receipt.dispatch.dispatch_plan_item.commodity
         Stack.where(commodity: commodity, store: stores)
       end
 
@@ -60,7 +48,7 @@ module Cats
         warehouses = location.children
         stores = Store.where(warehouse: warehouses)
 
-        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
+        commodity = dispatch.dispatch_plan_item.commodity
         Stack.where(commodity: commodity, store: stores)
       end
     end

data/config/routes.rb

@@ -60,6 +60,7 @@ Cats::Core::Engine.routes.draw do
       defaults: { level: Cats::Core::SpaceService::STORE }
 
   get '/commodity_categories/roots', to: 'commodity_categories#root', as: :commodity_category_roots
+  get '/commodity_categories/all', to: 'commodity_categories#all', as: :commodity_category_all
   resources :commodity_categories, except: %i[destroy] do
     member do
       get 'children'
@@ -73,6 +74,7 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+  resources :unit_conversions, except: %i[destroy]
 
   post '/transporters/filter', controller: :transporters, action: :filter
   resources :transporters, except: %i[destroy]
@@ -135,7 +137,7 @@ Cats::Core::Engine.routes.draw do
 
   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 '/stacks/items_for_location', controller: :stacks, action: :items_for_location, as: :items_for_location
   get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
   get '/dispatches/:id/stacks', controller: :stacks, action: :dispatch_stacks, as: :dispatch_stacks
   resources :stacks, only: %i[show index create update]

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -30,9 +30,14 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    foreign_key: { to_table: :cats_core_locations }
       t.float :estimated_price
       t.float :estimated_tax
+      t.references :currency,
+                   null: false,
+                   index: { name: 'currency_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_currencies }
       t.string :registration_no
       t.string :requested_by, null: false
-      t.string :request_reference, null: false
+      t.string :request_reference
+      t.string :customs_office, null: false
 
       t.timestamps
     end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -13,6 +13,7 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
       t.float :volume_per_metric_ton
       t.string :arrival_status, null: false, default: 'At Source'
       t.boolean :approved, null: false, default: false
+      t.string :shipping_reference
 
       t.timestamps
     end

data/db/migrate/20210718043328_create_cats_core_dispatch_plans.rb

@@ -6,11 +6,6 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.string :status, null: false, default: 'Draft'
       t.references :dispatchable, polymorphic: true
       t.boolean :upstream, null: false, default: false
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'commodity_on_dp_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-
       t.references :prepared_by,
                    null: false,
                    index: { name: 'pb_on_dp_indx' },

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -13,6 +13,10 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'dpi_on_destination_indx'},
                    foreign_key: { to_table: :cats_core_locations }
+      t.references :commodity,
+                  null: false,
+                  index: { name: 'commodity_on_dpi_indx' },
+                  foreign_key: { to_table: :cats_core_commodities }
       t.float :quantity, null: false
       t.string :commodity_status, null: false, default: 'Good'
       t.string :status, null: false, default: 'Unauthorized'

data/db/migrate/20211215121151_create_cats_core_transport_bids.rb

@@ -3,8 +3,9 @@ class CreateCatsCoreTransportBids < ActiveRecord::Migration[6.1]
     create_table :cats_core_transport_bids do |t|
       t.string :reference_no, unique: true
       t.string :description
-      t.date :start_date, null: false
-      t.date :end_date, null: false
+      t.datetime :start_date, null: false
+      t.datetime :end_date, null: false
+      t.datetime :opening_date, null: false
       t.string :status, null: false, default: 'New'
       t.float :bid_bond_amount, null: false, default: 0
       t.references :transport_plan,

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

@@ -10,6 +10,10 @@ class CreateCatsCoreTransportBidItems < ActiveRecord::Migration[6.1]
                    index: { name: 'tpi_on_tbi_indx' },
                    foreign_key: { to_table: :cats_core_transport_plan_items }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures } 
 
       t.timestamps
     end

data/db/migrate/20211229160125_create_cats_core_transport_offers.rb

@@ -13,6 +13,8 @@ class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
       t.float :bid_bond_amount, null: false, default: 0
 
       t.timestamps
+
+      t.index [:transport_bid_id, :transporter_id], unique: true, name: 'tb_and_t_on_to_indx'
     end
   end
 end

data/db/migrate/20220416143416_create_cats_core_unit_conversions.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreUnitConversions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_unit_conversions do |t|
+      t.references :from,
+                   null: false,
+                   index: { name: 'from_on_uc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :to,
+                   null: false,
+                   index: { name: 'to_on_uc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :factor, null: false
+
+      t.timestamps
+    end
+
+    add_index(:cats_core_unit_conversions, [:from_id, :to_id], unique: true)
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.1'.freeze
+    VERSION = '1.4.4'.freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     volume_per_metric_ton { 10 }
     arrival_status { Cats::Core::Commodity::AT_SOURCE }
     status { Cats::Core::Commodity::DRAFT }
+    shipping_reference { FFaker::Name.name }
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     destination factory: :location
     dispatch_plan
     quantity { 100 }
+    commodity
     commodity_status { Cats::Core::Commodity::GOOD }
     status { Cats::Core::DispatchPlanItem::UNAUTHORIZED }
   end

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

@@ -4,12 +4,24 @@ FactoryBot.define do
     status { Cats::Core::DispatchPlan::DRAFT }
     dispatchable { nil }
     upstream { false }
-    commodity
     prepared_by factory: :user
     approved_by { nil }
 
     trait :with_rhn do
-      dispatchable { create(:rhn_request) }
+      dispatchable do
+        disp = create(:rhn_request)
+        disp.approve
+        disp
+      end
+    end
+
+    trait :with_monthly_plan do
+      dispatchable do
+        disp = create(:monthly_plan)
+        3.times { create(:monthly_plan_item, monthly_plan: disp) }
+        disp.approve
+        disp
+      end
     end
   end
 end

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

@@ -15,8 +15,10 @@ FactoryBot.define do
     quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
+    currency
     registration_no { FFaker::Name.name }
     requested_by { FFaker::Name.name }
     request_reference { FFaker::Name.name }
+    customs_office { FFaker::Name.name }
   end
 end

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

@@ -3,9 +3,9 @@ FactoryBot.define do
     space_between_stack { 1 }
     distance_from_gangway { 1.5 }
     distance_from_ceiling { 1 }
-    maximum_height { 2.5 }
-    maximum_length { 6 }
-    maximum_width { 6 }
+    maximum_height { 7 }
+    maximum_length { 12 }
+    maximum_width { 12 }
     distance_from_wall { 1 }
   end
 end

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

@@ -3,5 +3,6 @@ FactoryBot.define do
     transport_bid
     transport_plan_item
     quantity { 100 }
+    unit factory: :unit_of_measure
   end
 end

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

@@ -2,8 +2,9 @@ FactoryBot.define do
   factory :transport_bid, class: 'Cats::Core::TransportBid' do
     reference_no { FFaker::Name.name }
     description { FFaker::Name.name }
-    start_date { Date.today - 1.week }
-    end_date { Date.today }
+    start_date { DateTime.now - 1.week }
+    end_date { DateTime.now }
+    opening_date { DateTime.now + 1.week }
     bid_bond_amount { 100 }
     transport_plan
   end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :unit_conversion, class: 'Cats::Core::UnitConversion' do
+    from factory: :unit_of_measure
+    to factory: :unit_of_measure
+    factor { 1 }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -251,12 +251,11 @@ files:
 - 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_conversions_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/controllers/concerns/cats/core/common.rb
 - app/jobs/cats/core/application_job.rb
-- app/models/cats/core/allocation.rb
-- app/models/cats/core/allocation_item.rb
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb
 - app/models/cats/core/commodity.rb
@@ -311,6 +310,7 @@ files:
 - app/models/cats/core/transport_plan.rb
 - app/models/cats/core/transport_plan_item.rb
 - app/models/cats/core/transporter.rb
+- app/models/cats/core/unit_conversion.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
 - app/models/concerns/cats/core/dispatchable.rb
@@ -334,6 +334,7 @@ files:
 - 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_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/dispatch_plan_service.rb
@@ -374,8 +375,6 @@ files:
 - db/migrate/20210718040129_create_cats_core_routes.rb
 - db/migrate/20210718042749_create_cats_core_transporters.rb
 - db/migrate/20210718042755_create_cats_core_rhn_requests.rb
-- db/migrate/20210718042823_create_cats_core_allocations.rb
-- db/migrate/20210718043204_create_cats_core_allocation_items.rb
 - db/migrate/20210718043328_create_cats_core_dispatch_plans.rb
 - db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb
 - db/migrate/20210718045516_create_cats_core_dispatches.rb
@@ -404,13 +403,12 @@ files:
 - db/migrate/20220107125025_create_cats_core_monthly_plan_items.rb
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb
 - db/migrate/20220209083928_create_cats_core_hub_authorizations.rb
+- db/migrate/20220416143416_create_cats_core_unit_conversions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
 - lib/cats_core.rb
 - lib/tasks/cats_core_tasks.rake
-- spec/factories/cats/core/allocation_items.rb
-- spec/factories/cats/core/allocations.rb
 - spec/factories/cats/core/application_modules.rb
 - spec/factories/cats/core/commodities.rb
 - spec/factories/cats/core/commodity_categories.rb
@@ -463,6 +461,7 @@ files:
 - spec/factories/cats/core/transport_plan_items.rb
 - spec/factories/cats/core/transport_plans.rb
 - spec/factories/cats/core/transporters.rb
+- spec/factories/cats/core/unit_conversions.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb
 homepage: http://cats.ndrmcapps.org
@@ -488,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Core module for CATS applications

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

@@ -1,78 +0,0 @@
-module Cats
-  module Core
-    class Allocation < ApplicationRecord
-      DRAFT = 'Draft'.freeze
-      APPROVED = 'Approved'.freeze
-      ALLOCATION_STATUSES = [DRAFT, APPROVED].freeze
-
-      belongs_to :rhn_request, optional: true
-      belongs_to :commodity
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      has_many :allocation_items
-
-      validates :commodity_status, :allocation_status, presence: true
-      validates :reference_no, presence: true, uniqueness: true
-      validates :quantity, presence: true, numericality: { greater_than: 0 }
-      validates :commodity_status, inclusion: { in: Commodity::COMMODITY_STATUSES }
-      validates :allocation_status, inclusion: { in: ALLOCATION_STATUSES }
-      validate :validate_quantity_against_items, :validate_quantity_against_commodity,
-               :validate_quantity_against_request, :validate_request_status, :validate_commodity_status
-
-      delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
-      delegate(:batch_no, to: :commodity, prefix: true)
-      delegate(:name, to: :source, prefix: true)
-      delegate(:location_type, to: :source, prefix: true)
-
-      def validate_quantity_against_items
-        return unless quantity
-
-        return unless quantity_changed?
-
-        allocated = allocation_items.sum(:quantity)
-        errors.add(:quantity, "is below items quantity. Minimum allowed is #{allocated}") if quantity < allocated
-      end
-
-      def validate_quantity_against_commodity
-        return unless quantity && commodity
-
-        allocated = Allocation.where(commodity: commodity).sum(:quantity)
-        remaining = commodity.quantity - allocated
-
-        remaining += quantity_was if quantity_was
-        errors.add(:quantity, "exceeds commodity quantity. Maximum allowed is #{remaining}") if quantity > remaining
-      end
-
-      def validate_quantity_against_request
-        return unless quantity && rhn_request
-
-        errors.add(:quantity, 'is not equal to requested quantity.') if quantity != rhn_request.quantity
-      end
-
-      def validate_request_status
-        return unless rhn_request
-
-        errors.add(:rhn_request, 'should be approved first.') if rhn_request.status != RhnRequest::APPROVED
-      end
-
-      def validate_commodity_status
-        return unless commodity
-
-        errors.add(:commodity, 'should be approved first.') unless commodity.status == Commodity::APPROVED
-      end
-
-      def approve
-        raise(StandardError, 'Allocation already approved.') if allocation_status == Allocation::APPROVED
-
-        item_quantity = allocation_items.sum(:quantity)
-        raise(StandardError, 'Allocation quantity and items quantity do not match.') if quantity != item_quantity
-
-        self.allocation_status = Allocation::APPROVED
-        save!
-
-        # If the commodity is all allocated, then we should
-        # set its status to allocated.
-        commodity.allocate
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-module Cats
-  module Core
-    class AllocationItem < ApplicationRecord
-      belongs_to :allocation
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-
-      validates :from, :to, presence: true
-      validates :quantity, presence: true, numericality: { greater_than: 0 }
-      validate :validate_source_and_destination, :validate_quantity
-      validate :validate_allocation_status, on: %i[create update]
-
-      def validate_source_and_destination
-        return unless allocation.present? && destination.present?
-
-        errors.add(:base, 'source and destination cannot be the same') if allocation.source == destination
-      end
-
-      def validate_quantity
-        return unless quantity && allocation
-
-        return unless quantity_changed?
-
-        allocated = AllocationItem.where(allocation: allocation).sum(:quantity)
-        remaining = allocation.quantity - allocated
-        remaining += quantity_was if quantity_was
-        errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
-      end
-
-      def validate_allocation_status
-        return unless allocation
-
-        return unless allocation.allocation_status == Cats::Core::Allocation::APPROVED
-
-        errors.add(:allocation, 'is alreay approved. Changes are not allowed at this point.')
-      end
-
-      delegate(:name, to: :destination, prefix: true)
-      delegate(:reference_no, to: :allocation, prefix: true)
-      delegate(:location_type, to: :destination, prefix: true)
-    end
-  end
-end

data/db/migrate/20210718042823_create_cats_core_allocations.rb

@@ -1,25 +0,0 @@
-class CreateCatsCoreAllocations < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_allocations do |t|
-      t.string :reference_no, unique: true
-      t.references :rhn_request,
-                   null: true,
-                   index: { name: 'rr_on_allocation_indx' },
-                   foreign_key: { to_table: :cats_core_rhn_requests }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'ca_on_commodity_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-      t.references :source,
-                   null: false,
-                   index: { name: 'ca_on_source_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.float :quantity, null: false
-      t.string :commodity_status, null: false, default: 'Good'
-      t.string :allocation_status, null: false, default: 'Draft'
-      t.string :remark
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210718043204_create_cats_core_allocation_items.rb

@@ -1,19 +0,0 @@
-class CreateCatsCoreAllocationItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_allocation_items do |t|
-      t.references :allocation,
-                   null: false,
-                   index: { name: 'allocation_on_ai_indx' },
-                   foreign_key: { to_table: :cats_core_allocations }
-      t.references :destination,
-                   null: false,
-                   index: { name: 'destination_on_ai_indx'},
-                   foreign_key: { to_table: :cats_core_locations }
-      t.float :quantity, null: false
-      t.date :from, null: false
-      t.date :to, null: false
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-FactoryBot.define do
-  factory :allocation_item, class: 'Cats::Core::AllocationItem' do
-    allocation
-    destination factory: :location
-    quantity { 50 }
-    from { Date.today }
-    to { Date.today + 1.week }
-  end
-end

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

@@ -1,16 +0,0 @@
-FactoryBot.define do
-  factory :allocation, class: 'Cats::Core::Allocation' do
-    reference_no { FFaker::Name.name }
-    rhn_request { nil }
-    commodity do
-      c = create(:commodity)
-      c.approve
-      c
-    end
-    source factory: :location
-    quantity { 50 }
-    commodity_status { Cats::Core::Commodity::GOOD }
-    allocation_status { Cats::Core::Allocation::DRAFT }
-    remark { FFaker::Name.name }
-  end
-end