cats_core 1.0.24 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42be12240a7c83fb5885cf25ae71c6926078e982975b6b07d9a3b60cc5c355c3
-  data.tar.gz: 7479ddfee27ddc4f2e7de0b4f40b8efd3e218026cb51ba3bbeb9ea77f8b2ade8
+  metadata.gz: b39ab8dfbbd491a6a9e68acfd75dcf77f88a477e5fe1eb2bce823a17dd857bd8
+  data.tar.gz: ffe26682256958cfb286feda0ae58f498922ed65c505af9401298fef5a7b7b44
 SHA512:
-  metadata.gz: 3640d304c753328131f660578553eda3bfc50fb98e955a86b35eca4fa3efff58fbe069dcddce891001a566069dc2f3da48a361adb577fbf71a9cca96d56b1f60
-  data.tar.gz: 85786685e2667ac62d0f73d793c78efcbe3c5bebe18524d1c6402acc5188cf60670f0dbfabc9f5229ef4bf3941907c918433bb713758b7077bfe21f62dc06123
+  metadata.gz: 16218f6af68d849f4550848cffc761e265b4cf80972d6befc8edbe19aed2eff86730299042c7ed098f372b8c55f77a698638fcaf8ca5317001db07bc0d21da86
+  data.tar.gz: e7a54575147d96397141682e144749767cc9be51abb89876c382202550531842876cba3c3a87800d01fc9671f3cc8fec056f29f992e3507a0f4a33423756f85b

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class Allocation < ApplicationRecord
+      belongs_to :rhn_request, optional: true
+      belongs_to :commodity
+      belongs_to :source, class_name: 'Cats::Core::Location'
+
+      validates :commodity_status, presence: true
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+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
+
+      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
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class Commodity < ApplicationRecord
+      after_initialize :set_approved
+
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
@@ -14,12 +16,23 @@ module Cats
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true
+      belongs_to :commodity_category
 
       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 }
+
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:reference_no, to: :source, prefix: true)
+
+      def set_approved
+        return unless new_record?
+
+        self.approved = false
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Cats
     class Dispatch < ApplicationRecord
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
-      belongs_to :commodity_allocation
+      belongs_to :allocation_item
 
       validates :reference_no, :plate_no, :driver_name, :driver_phone, :quantity, :commodity_status, presence: true
       validates :reference_no, uniqueness: true

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

@@ -0,0 +1,10 @@
+module Cats
+  module Core
+    class RhnRequest < ApplicationRecord
+      belongs_to :commodity
+
+      validates :reference_no, :request_date, presence: true
+      validates :reference_no, uniqueness: true
+    end
+  end
+end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -6,12 +6,17 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_commodities_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
       t.references :source, polymorphic: true
       t.float :quantity, null: false
       t.string :description
       t.date :best_use_before, null: false
       t.float :volume_per_metric_ton
       t.string :arrival_status, null: false, default: 'At Source'
+      t.boolean :approved, null: false, default: false
 
       t.timestamps
     end

data/db/migrate/20210718042755_create_cats_core_rhn_requests.rb

@@ -0,0 +1,15 @@
+class CreateCatsCoreRhnRequests < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_rhn_requests do |t|
+      t.string :reference_no, unique: true
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'commodity_on_rhn_indx' },
+                   foreign_key: { to_table: :cats_core_commodities }
+      t.date :request_date, null: false
+      t.string :requested_by
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/{20210718042823_create_cats_core_commodity_allocations.rb → 20210718042823_create_cats_core_allocations.rb}

@@ -1,6 +1,10 @@
-class CreateCatsCoreCommodityAllocations < ActiveRecord::Migration[6.1]
+class CreateCatsCoreAllocations < ActiveRecord::Migration[6.1]
   def change
-    create_table :cats_core_commodity_allocations do |t|
+    create_table :cats_core_allocations do |t|
+      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' },
@@ -9,10 +13,6 @@ class CreateCatsCoreCommodityAllocations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'ca_on_source_indx' },
                    foreign_key: { to_table: :cats_core_locations }
-      t.references :destination,
-                   null: false,
-                   index: { name: 'ca_on_destination_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
       t.float :quantity, null: false
       t.string :commodity_status, null: false, default: 'Good'
       t.string :remark

data/db/migrate/20210718043204_create_cats_core_allocation_items.rb

@@ -0,0 +1,19 @@
+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/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -2,10 +2,10 @@ class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_dispatches do |t|
       t.string :reference_no, unique: true
-      t.references :commodity_allocation,
+      t.references :allocation_item,
                    null: false,
-                   index: { name: 'ca_on_dispatches_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_allocations }
+                   index: { name: 'ai_on_dispatches_indx' },
+                   foreign_key: { to_table: :cats_core_allocation_items }
       t.references :transporter,
                    null: false,
                    index: { name: 'transporter_on_dispatches_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.24'.freeze
+    VERSION = '1.0.28'.freeze
   end
 end

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

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

data/spec/factories/cats/core/{commodity_allocations.rb → allocations.rb}

@@ -1,8 +1,8 @@
 FactoryBot.define do
-  factory :commodity_allocation, class: 'Cats::Core::CommodityAllocation' do
+  factory :allocation, class: 'Cats::Core::Allocation' do
+    rhn_request { nil }
     commodity
     source factory: :location
-    destination factory: :location
     quantity { 50 }
     commodity_status { Cats::Core::Commodity::GOOD }
     remark { FFaker::Name.name }

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

@@ -3,10 +3,12 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
+    commodity_category
     source factory: :gift_certificate
     quantity { 100 }
     best_use_before { Date.today + 2.month }
     volume_per_metric_ton { 10 }
     arrival_status { Cats::Core::Commodity::AT_SOURCE }
+    approved { false }
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :dispatch, class: 'Cats::Core::Dispatch' do
     reference_no { FFaker::Name.name }
-    commodity_allocation
+    allocation_item
     transporter
     plate_no { FFaker::Name.name }
     driver_name { FFaker::Name.name }

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :rhn_request, class: 'Cats::Core::RhnRequest' do
+    reference_no { FFaker::Name.name }
+    commodity
+    request_date { Date.today }
+    requested_by { FFaker::Name.name }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.28
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -226,10 +226,11 @@ files:
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/users_controller.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
-- app/models/cats/core/commodity_allocation.rb
 - app/models/cats/core/commodity_category.rb
 - app/models/cats/core/currency.rb
 - app/models/cats/core/dispatch.rb
@@ -249,6 +250,7 @@ files:
 - app/models/cats/core/ration.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
+- app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
 - app/models/cats/core/stack.rb
@@ -293,7 +295,9 @@ files:
 - db/migrate/20210717140855_create_cats_core_stores.rb
 - db/migrate/20210717171101_create_cats_core_stacks.rb
 - db/migrate/20210718042749_create_cats_core_transporters.rb
-- db/migrate/20210718042823_create_cats_core_commodity_allocations.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/20210718045516_create_cats_core_dispatches.rb
 - db/migrate/20210718202957_create_cats_core_dispatch_transactions.rb
 - db/migrate/20210719133710_create_cats_core_stacking_rules.rb
@@ -306,9 +310,10 @@ files:
 - 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_allocations.rb
 - spec/factories/cats/core/commodity_categories.rb
 - spec/factories/cats/core/currencies.rb
 - spec/factories/cats/core/dispatch_transactions.rb
@@ -328,6 +333,7 @@ files:
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb
+- spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb
 - spec/factories/cats/core/stack_transactions.rb

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

@@ -1,19 +0,0 @@
-module Cats
-  module Core
-    class CommodityAllocation < ApplicationRecord
-      belongs_to :commodity
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-
-      validates :quantity, :commodity_status, presence: true
-      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
-      validate :validate_source_and_destination
-
-      def validate_source_and_destination
-        return unless source.present? && destination.present?
-
-        errors.add(:base, 'source and destination cannot be the same') if source == destination
-      end
-    end
-  end
-end