cats_core 1.1.39 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe94734ecc46081ec63cab271f83489433fa784d1538b8c47d0f3a4f11b9cd8
-  data.tar.gz: cc1422a969f26032c587f05a808dcaf7cf365866e9aae3e0a5374b07b857ddba
+  metadata.gz: aa114e4773fb08fcaa761ebcc584caa4e6314e321e04d66fecccf107af2c72b9
+  data.tar.gz: bb57609da9d647843d17ddfa11e9b9fbbdbe116e35c624fb36a769cafa203dd9
 SHA512:
-  metadata.gz: 741a9a7c7ba5341f3a161c2b44e1a4bfd361a8db605d3e9d9a3e611fb7c39cd15b18c4c2f9c5eaa053629b03060c45946f76adbe8e75c7c8a8b7a7a31ecd653f
-  data.tar.gz: d517773ec037960e0893d8afb2288d37c8baea703f3ddaa72dcd0041cbdf67acd2a9a2850430fd5830925aa6597b23881db44ac6e85049b7683f24857bc28be3
+  metadata.gz: e1e019180bc325929319cf7e014db073015f9db04f322f904edc436ee17798df1dea5533b8d8f9758b617e60de2d5bc5d3c3fc8741b44b24b062330758389791
+  data.tar.gz: e4221dc2d453f8454ecb8f4cab23757b277dbb18e4f6802abba7463908997227e18298ac6e1add7deae5e932aa3b06c67c4cffa2b9d5ea4d0d35f494c7bc55ab

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

@@ -20,7 +20,7 @@ module Cats
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }
           else
-            render json: { error: 'Invalid username or password.' }, status: 400
+            render json: { error: 'Invalid password.' }, status: 400
           end
         else
           render json: { error: 'User does not exist.' }, status: 400

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

@@ -1,43 +1,10 @@
 module Cats
   module Core
     class CurrenciesController < ApplicationController
-      before_action :set_currency, only: %i[show update]
-
-      def index
-        data = ActiveModelSerializers::SerializableResource.new(Cats::Core::Currency.all)
-        render json: { success: true, data: data }
-      end
-
-      def show
-        data = ActiveModelSerializers::SerializableResource.new(@currency)
-        render json: { success: true, data: data }
-      end
-
-      def create
-        obj = Cats::Core::Currency.new(model_params)
-        if obj.save
-          data = ActiveModelSerializers::SerializableResource.new(obj)
-          render json: { success: true, data: data }, status: :created
-        else
-          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
-        end
-      end
-
-      def update
-        if @currency.update(model_params)
-          data = ActiveModelSerializers::SerializableResource.new(@currency)
-          render json: { success: true, data: data }
-        else
-          render json: { success: false, error: @currency.errors.full_messages[0] }, status: :unprocessable_entity
-        end
-      end
+      include Common
 
       private
 
-      def set_currency
-        @currency = Cats::Core::Currency.find(params[:id])
-      end
-
       def model_params
         params.require(:payload).permit(:code, :name)
       end

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/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,67 @@ 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
+
+        result = false
+        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
+          stack = 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
+          )
+          result = stack.id.positive?
+        end
+        result
       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_transaction.rb

@@ -6,6 +6,15 @@ module Cats
 
       delegate(:code, to: :source, prefix: true)
       delegate(:reference_no, to: :destination, prefix: true)
+
+      def commit
+        Transaction.transaction do
+          source.quantity -= quantity
+          source.save!
+          self.status = COMMITTED
+          save!
+        end
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Cats
         ReceiptTransaction.transaction do
           destination.quantity += quantity
           destination.stack_status = Cats::Core::Stack::ALLOCATED
-          destination.save
+          destination.save!
           self.status = COMMITTED
           save!
         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

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
@@ -95,9 +97,9 @@ module Cats
       # If both conditions fail, it means an overlap exists b/n the two stacks
 
       def overlaps?(st1, st2)
-        return false if st1.start_x > (st2.start_x + st2.width) || st2.start_x > (st1.start_x + st1.width)
+        return false if st1.start_x > (st2.start_x + st2.length) || st2.start_x > (st1.start_x + st1.length)
 
-        return false if st1.start_y > (st2.start_y + st2.length) || st2.start_y > (st1.start_y + st1.length)
+        return false if st1.start_y > (st2.start_y + st2.width) || st2.start_y > (st1.start_y + st1.width)
 
         true
       end

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

@@ -17,23 +17,16 @@ module Cats
       def validate_quantity
         return unless quantity.present? && source.present?
 
-        total = self.class.where(source: source).sum(:quantity)
+        dispatched = self.class.where(source: source, status: DRAFT).sum(:quantity)
 
-        total -= quantity_was if id
+        available = source.quantity - dispatched
+        available += quantity_was if quantity_was
 
-        diff = source.quantity - total
-        errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
+        errors.add(:quantity, "total is higher than source quantity (Max = #{available}).") if quantity > available
       end
 
       def commit
-        Transaction.transaction do
-          source.quantity -= quantity
-          destination.quantity += quantity
-          source.save
-          destination.save
-          self.status = COMMITTED
-          save!
-        end
+        raise(NotImplementedError, 'Method should be implemented in child classes.')
       end
 
       def skip_quantity_validation

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/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.39'.freeze
+    VERSION = '1.2.2'.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.39
+  version: 1.2.2
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-12 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