cats_core 1.1.36 → 1.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d66e9f780b4e36013c3eac6a0c319e61270199d621eea8cc1747451eb09e95b
-  data.tar.gz: 83c8aee6ba3e4a15d3aa6a0255f0c8a6aead3247fed994e5ced103c91cc1d314
+  metadata.gz: c2c955101b31607adc7eec1388f6f4c172181ffd78a2e514b5c220130899b4f3
+  data.tar.gz: f99a81794245cd12120a3b5dac7cd04a6f8a89ef7ca96dbce409b341629172c3
 SHA512:
-  metadata.gz: b77f6a0923079b2e847b263602e42fb489245f15442b11ccd0509d4c6b3790b1f3950469557a686d0b4cbeb9f34c9c94dc14c82e853e0d2d064d42c5db3bd4e8
-  data.tar.gz: ac19f2ff28600eaa8d580bef4d6ad8fdec01ea0511f163d486d8bc3397e67d95eab82a79c32977b01e88952f789d53198a40c599fc977c14a623f4cf3eb4da12
+  metadata.gz: b80445e45187d6590c0219cba05d11defbea0d298f79cb0f3c7c8fc82705e17ef6abc1223181c8ae6dca44138aa4b46a4d3aaa9f7732c7efb5d92ba6aeeff76e
+  data.tar.gz: 1a3efcd95681646652dd285f6f96f1ba28da6ba6214f32db735ff8f4571de66c28c68342843c9a347cb4f70e2a6078800ef4eff27898d675cabf79e80037b72e

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

@@ -57,7 +57,7 @@ module Cats
       def validate_commodity_status
         return unless commodity
 
-        errors.add(:commodity, 'should be approved first.') unless commodity.approved
+        errors.add(:commodity, 'should be approved first.') unless commodity.status == Commodity::APPROVED
       end
 
       def approve
@@ -68,6 +68,10 @@ module Cats
 
         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

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

@@ -22,6 +22,7 @@ module Cats
 
         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
 

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

@@ -1,7 +1,11 @@
 module Cats
   module Core
     class Commodity < ApplicationRecord
-      after_initialize :set_approved
+      # Statuses
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      ALLOCATED = 'Allocated'.freeze
+      STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
 
       # Commodity statuses
       GOOD = 'Good'.freeze
@@ -17,23 +21,66 @@ 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 }
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
       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(:reference_no, to: :source, prefix: true)
 
-      def set_approved
-        return unless new_record?
+      def name
+        source.commodity_category.name
+      end
+
+      def approve
+        raise(StandardError, 'Commodity already approved.') if status == APPROVED
+
+        Cats::Core::Commodity.transaction do
+          self.status = APPROVED
+          save!
+          store = Cats::Core::Store.find_by(code: 'SUP-STORE')
+          raise(StandardError, 'Supplier store does not exist.') unless store
 
-        self.approved = false
+          Cats::Core::Stack.create!(
+            code: batch_no,
+            store: store,
+            commodity: self,
+            quantity: quantity,
+            commodity_status: GOOD,
+            stack_status: Stack::ALLOCATED,
+            length: 100,
+            width: 100,
+            height: 10,
+            start_x: 1,
+            start_y: 1
+          )
+          true
+        end
+        false
       end
 
-      def name
-        source.commodity_category.name
+      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

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

@@ -32,6 +32,7 @@ module Cats
 
         dispatched = Dispatch.where(allocation_item: allocation_item).sum(:quantity)
         remaining = allocation_item.quantity - dispatched
+        remaining += quantity_was if quantity_was
         errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
       end
 

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

@@ -18,7 +18,7 @@ module Cats
       def validate_commodity_status
         return unless commodity
 
-        errors.add(:commodity, 'should be approved first.') unless commodity.approved
+        errors.add(:commodity, 'should be approved first.') unless commodity.status == Commodity::APPROVED
       end
 
       def validate_quantity
@@ -30,6 +30,11 @@ module Cats
         remaining += quantity_was if quantity_was
         errors.add(:quantity, "exceeds commodity quantity. Maximum allowed is #{remaining}") if quantity > remaining
       end
+
+      def approve
+        self.status = APPROVED
+        save!
+      end
     end
   end
 end

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

@@ -22,6 +22,8 @@ module Cats
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
                :validate_space_between_stack, unless: -> { store && store.code == 'SUP-STORE' }
 
+      delegate :batch_no, to: :commodity, prefix: true
+
       after_save :update_store_space
 
       def validate_coordinates
@@ -58,8 +60,8 @@ module Cats
         return unless store.present? && length.present? && width.present? && start_x.present? && start_y.present?
 
         rule = stacking_rules
-        if start_x < rule.distance_from_wall || store.length - (start_y + length) < rule.distance_from_wall ||
-           store.width - (start_x + width) < rule.distance_from_wall || start_y < rule.distance_from_wall
+        if start_x < rule.distance_from_wall || store.length - (start_x + length) < rule.distance_from_wall ||
+           store.width - (start_y + width) < rule.distance_from_wall || start_y < rule.distance_from_wall
           errors.add(:base,
                      message: "The stack must be placed #{rule.distance_from_wall} meter away from a store wall")
         end

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

@@ -3,7 +3,7 @@ module Cats
     class CommoditySerializer < ActiveModel::Serializer
       attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
                  :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :arrival_status, :approved
+                 :arrival_status, :status
     end
   end
 end

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

@@ -17,6 +17,7 @@ module Cats
         end
 
         receipt.status = Cats::Core::Receipt::STACKED
+        receipt.save!
         receipt.receipt_transactions.each(&:commit)
         receipt
       end

data/db/migrate/20211030133752_add_status_to_cats_core_commodities.rb

@@ -0,0 +1,6 @@
+class AddStatusToCatsCoreCommodities < ActiveRecord::Migration[6.1]
+  def change
+    add_column :cats_core_commodities, :status, :string, null: false, default: 'Draft'
+    remove_column :cats_core_commodities, :approved, :boolean
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.36'.freeze
+    VERSION = '1.1.40'.freeze
   end
 end

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

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

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

@@ -8,6 +8,6 @@ FactoryBot.define do
     best_use_before { Date.today + 2.month }
     volume_per_metric_ton { 10 }
     arrival_status { Cats::Core::Commodity::AT_SOURCE }
-    approved { true }
+    status { Cats::Core::Commodity::DRAFT }
   end
 end

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

@@ -1,7 +1,11 @@
 FactoryBot.define do
   factory :rhn_request, class: 'Cats::Core::RhnRequest' do
     reference_no { FFaker::Name.name }
-    commodity
+    commodity do
+      c = create(:commodity)
+      c.approve
+      c
+    end
     quantity { 100 }
     request_date { Date.today }
     requested_by { FFaker::Name.name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.36
+  version: 1.1.40
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -346,6 +346,7 @@ files:
 - db/migrate/20210814175406_create_cats_core_stack_transactions.rb
 - db/migrate/20211002050739_create_cats_core_notification_rules.rb
 - db/migrate/20211024063240_add_status_to_cats_core_rhn_requests.rb
+- db/migrate/20211030133752_add_status_to_cats_core_commodities.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb