cats_core 1.2.19 → 1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bab9a0fa1d97225acf7f2895a4d84ef699cc947851b11d0d304c47ad4b80ed6
-  data.tar.gz: d8ec1bf30f447226ce4e3d8b445a72728a7c249b94e7919c69313599cc2e0c6e
+  metadata.gz: 6fe0f87a2452fb8bcafe40ece45a769789b6b576cab27cdf0867507acc79338e
+  data.tar.gz: 967feac1199b16fe037295cb805c3cb9cf7234b37e03641af952bf1ffc7e624d
 SHA512:
-  metadata.gz: 96caa2ec1346006591ea5fd019992aec79a3e7d269e8495ad14f1818fbe40716b53b4aa5a0b2481024abd04fe2ae9d132abb4122c7791ec312264b18139fc239
-  data.tar.gz: 7fc447ddcb864efea72a7de8cd904a70520df3ef058b2c4a26bc6fb6b8ff63a706ab7514607d647a0fa573ae81965141589a95a7487fe998f84e2c6df49edacb
+  metadata.gz: 01ce4d95e2c647519e65a19b109a81229bae931aa0af07cf719f9a2f2322f4d8edc4c098e221a51af9577b64a394da4bd05dc8243e7a28837d8ea5482b2c2b56
+  data.tar.gz: e78386c0c8df0e6b8045de92d5235516e09937d044b7e0efee9505fc6b629b1589ee962e759ea17460e19f3caef58a4ad1554959bad138740aec29d870b3c932

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

@@ -0,0 +1,23 @@
+module Cats
+  module Core
+    class CommoditySubstitution < ApplicationRecord
+      belongs_to :program
+      belongs_to :commodity, class_name: 'Cats::Core::CommodityCategory'
+      belongs_to :replaced_by, class_name: 'Cats::Core::CommodityCategory'
+
+      validates :ratio, presence: true
+      validates :program_id, uniqueness: { scope: %i[commodity_id replaced_by_id] }
+      validate :validate_ratio
+
+      def validate_ratio
+        return unless ratio
+
+        left, right = ratio.split(':')
+        left_correct = Integer(left).is_a?(Integer) rescue false
+        right_correct = Integer(right).is_a?(Integer) rescue false
+
+        errors.add(:ratio, 'is not in correct format.') unless left_correct && right_correct
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Cats
       DONATION_TYPES = [CASH, KIND].freeze
 
       belongs_to :donor
-      belongs_to :hrp
+      belongs_to :plan
       belongs_to :currency, optional: true
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
@@ -19,7 +19,7 @@ module Cats
       validates :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
-      delegate(:reference_no, to: :hrp, prefix: true)
+      delegate(:reference_no, to: :plan, prefix: true)
       delegate(:name, to: :commodity_category, prefix: true, allow_nil: true)
       delegate(:code, to: :currency, prefix: true, allow_nil: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true, allow_nil: true)

data/app/models/cats/core/{hrp.rb → plan.rb}

@@ -1,6 +1,6 @@
 module Cats
   module Core
-    class Hrp < ApplicationRecord
+    class Plan < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
       NEEDS_APPROVED = 'Needs Approved'.freeze
@@ -13,7 +13,7 @@ module Cats
 
       belongs_to :program
       belongs_to :ration, optional: true
-      has_many :hrp_items
+      has_many :plan_items
 
       validates :reference_no, :year, :status, presence: true
       validates :season, presence: true, inclusion: { in: SEASONS }

data/app/models/cats/core/{hrp_item.rb → plan_item.rb}

@@ -1,14 +1,14 @@
 module Cats
   module Core
-    class HrpItem < ApplicationRecord
-      belongs_to :hrp
+    class PlanItem < ApplicationRecord
+      belongs_to :plan
       belongs_to :woreda, -> { where(location_type: Cats::Core::Location::WOREDA) }, class_name: 'Cats::Core::Location'
       belongs_to :operator
 
-      has_many :hrp_item_details
+      has_many :plan_item_details
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
-      validates :hrp_id, uniqueness: { scope: :woreda_id }
+      validates :plan_id, uniqueness: { scope: :woreda_id }
 
       delegate(:name, to: :woreda, prefix: true)
       delegate(:name, to: :operator, prefix: true)

data/app/models/cats/core/{hrp_item_detail.rb → plan_item_detail.rb}

@@ -1,11 +1,11 @@
 module Cats
   module Core
-    class HrpItemDetail < ApplicationRecord
-      belongs_to :hrp_item
+    class PlanItemDetail < ApplicationRecord
+      belongs_to :plan_item
       belongs_to :ration_item
 
       validates :amount, presence: true, numericality: { greater_than: 0 }
-      validates :hrp_item_id, uniqueness: { scope: :ration_item_id }
+      validates :plan_item_id, uniqueness: { scope: :ration_item_id }
     end
   end
 end

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

@@ -4,7 +4,9 @@ module Cats
       NEW = 'New'.freeze
       OPEN = 'Open'.freeze
       CLOSED = 'Closed'.freeze
-      STATUSES = [NEW, OPEN, CLOSED].freeze
+      RANKED = 'Ranked'.freeze
+      WINNERS_DECLARED = 'Winner Declared'.freeze
+      STATUSES = [NEW, OPEN, CLOSED, RANKED, WINNERS_DECLARED].freeze
 
       has_many :transport_bid_items
 

data/db/migrate/{20210717031810_create_cats_core_hrps.rb → 20210717031810_create_cats_core_plans.rb}

@@ -1,6 +1,6 @@
-class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
+class CreateCatsCorePlans < ActiveRecord::Migration[6.1]
   def change
-    create_table :cats_core_hrps do |t|
+    create_table :cats_core_plans do |t|
       t.string :reference_no, unique: true
       t.integer :year, null: false
       t.string :season, null: false
@@ -8,11 +8,11 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
 
       t.references :program,
                    null: false,
-                   index: { name: 'program_on_hrp_indx' },
+                   index: { name: 'program_on_plan_indx' },
                    foreign_key: { to_table: :cats_core_programs }
       t.references :ration,
                    null: true,
-                   index: { name: 'ration_on_hrp_indx' },
+                   index: { name: 'ration_on_plan_indx' },
                    foreign_key: { to_table: :cats_core_rations }
 
       t.timestamps

data/db/migrate/20210717032024_create_cats_core_plan_items.rb

@@ -0,0 +1,23 @@
+class CreateCatsCorePlanItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_plan_items do |t|
+      t.references :plan,
+                   null: false,
+                   index: { name: 'plan_on_plan_items_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
+      t.references :woreda,
+                   null: false,
+                   index: { name: 'woreda_on_plan_items_idnx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.integer :beneficiaries, null: false
+      t.references :operator,
+                   null: false,
+                   index: { name: 'operator_on_plan_items_indx' },
+                   foreign_key: { to_table: :cats_core_operators }
+
+      t.timestamps
+    end
+
+    add_index :cats_core_plan_items, [:plan_id, :woreda_id], unique: true
+  end
+end

data/db/migrate/20210717032240_create_cats_core_plan_item_details.rb

@@ -0,0 +1,18 @@
+class CreateCatsCorePlanItemDetails < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_plan_item_details do |t|
+      t.references :plan_item,
+                   null: false,
+                   index: { name: 'pi_on_pid_indx' },
+                   foreign_key: { to_table: :cats_core_plan_items }
+      t.references :ration_item,
+                   null: false,
+                   index: { name: 'ri_on_pid_indx' },
+                   foreign_key: { to_table: :cats_core_ration_items }
+      t.float :amount, null: false
+
+      t.timestamps
+    end
+    add_index(:cats_core_plan_item_details, [:plan_item_id, :ration_item_id], unique: true, name: 'pii_rii_on_pid_indx')
+  end
+end

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -8,10 +8,10 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'donor_on_donation_indx' },
                    foreign_key: { to_table: :cats_core_donors }
-      t.references :hrp,
+      t.references :plan,
                    null: false,
-                   index: { name: 'hrp_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_hrps }
+                   index: { name: 'plan_on_donation_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
       t.float :amount, null: false
       t.references :currency,
                    null: true,

data/db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb

@@ -0,0 +1,23 @@
+class CreateCatsCoreCommoditySubstitutions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_commodity_substitutions do |t|
+      t.references :program,
+                   null: false,
+                   index: { name: 'program_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_programs }
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'commodity_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :replaced_by,
+                   null: false,
+                   index: { name: 'rb_on_cs_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.string :ratio, null: false
+
+      t.timestamps
+
+      t.index [:program_id, :commodity_id, :replaced_by_id], unique: true, name: 'pcr_on_cs_indx'
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.19'.freeze
+    VERSION = '1.2.23'.freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :commodity_substitution, class: 'Cats::Core::CommoditySubstitution' do
+    program
+    commodity factory: :commodity_category
+    replaced_by factory: :commodity_category
+    ratio { '1:2' }
+  end
+end

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

@@ -4,7 +4,7 @@ FactoryBot.define do
     donation_type { Cats::Core::Donation::KIND }
     donated_on { Date.today }
     donor
-    hrp
+    plan
     amount { 100 }
     currency { nil }
     commodity_category

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :plan_item_detail, class: 'Cats::Core::PlanItemDetail' do
+    plan_item
+    ration_item
+    amount { 150 }
+  end
+end

data/spec/factories/cats/core/{hrp_items.rb → plan_items.rb}

@@ -1,6 +1,6 @@
 FactoryBot.define do
-  factory :hrp_item, class: 'Cats::Core::HrpItem' do
-    hrp
+  factory :plan_item, class: 'Cats::Core::PlanItem' do
+    plan
     woreda
     beneficiaries { 100 }
     operator

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :plan, class: 'Cats::Core::Plan' do
+    reference_no { FFaker::Name.name }
+    year { 1 }
+    season { Cats::Core::Plan::BELG }
+    status { Cats::Core::Plan::DRAFT }
+    program
+    ration
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.23
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -256,6 +256,7 @@ files:
 - app/models/cats/core/application_record.rb
 - app/models/cats/core/commodity.rb
 - app/models/cats/core/commodity_category.rb
+- app/models/cats/core/commodity_substitution.rb
 - app/models/cats/core/contract_item.rb
 - app/models/cats/core/currency.rb
 - app/models/cats/core/dispatch.rb
@@ -265,15 +266,15 @@ files:
 - app/models/cats/core/donation.rb
 - app/models/cats/core/donor.rb
 - app/models/cats/core/gift_certificate.rb
-- app/models/cats/core/hrp.rb
-- app/models/cats/core/hrp_item.rb
-- app/models/cats/core/hrp_item_detail.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
 - app/models/cats/core/notification.rb
 - app/models/cats/core/notification_rule.rb
 - app/models/cats/core/operator.rb
+- app/models/cats/core/plan.rb
+- app/models/cats/core/plan_item.rb
+- app/models/cats/core/plan_item_detail.rb
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
@@ -294,8 +295,6 @@ files:
 - app/models/cats/core/transport_bid_item.rb
 - app/models/cats/core/transport_contract.rb
 - app/models/cats/core/transport_offer.rb
-- app/models/cats/core/transport_request.rb
-- app/models/cats/core/transport_request_item.rb
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
@@ -341,9 +340,9 @@ files:
 - db/migrate/20210717031108_create_cats_core_donors.rb
 - db/migrate/20210717031216_create_cats_core_rations.rb
 - db/migrate/20210717031343_create_cats_core_ration_items.rb
-- db/migrate/20210717031810_create_cats_core_hrps.rb
-- db/migrate/20210717032024_create_cats_core_hrp_items.rb
-- db/migrate/20210717032240_create_cats_core_hrp_item_details.rb
+- db/migrate/20210717031810_create_cats_core_plans.rb
+- db/migrate/20210717032024_create_cats_core_plan_items.rb
+- db/migrate/20210717032240_create_cats_core_plan_item_details.rb
 - db/migrate/20210717032330_create_cats_core_donations.rb
 - db/migrate/20210717032602_create_cats_core_gift_certificates.rb
 - db/migrate/20210717032855_create_cats_core_purchase_orders.rb
@@ -372,6 +371,7 @@ files:
 - db/migrate/20211229160126_create_cats_core_transport_offers.rb
 - db/migrate/20211229160127_create_cats_core_transport_contracts.rb
 - db/migrate/20211229160128_create_cats_core_contract_items.rb
+- db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -382,6 +382,7 @@ files:
 - spec/factories/cats/core/application_modules.rb
 - spec/factories/cats/core/commodities.rb
 - spec/factories/cats/core/commodity_categories.rb
+- spec/factories/cats/core/commodity_substitutions.rb
 - spec/factories/cats/core/contract_items.rb
 - spec/factories/cats/core/currencies.rb
 - spec/factories/cats/core/dispatch_plan_items.rb
@@ -391,15 +392,15 @@ files:
 - spec/factories/cats/core/donations.rb
 - spec/factories/cats/core/donors.rb
 - spec/factories/cats/core/gift_certificates.rb
-- spec/factories/cats/core/hrp_item_details.rb
-- spec/factories/cats/core/hrp_items.rb
-- spec/factories/cats/core/hrps.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/menu_items.rb
 - spec/factories/cats/core/menus.rb
 - spec/factories/cats/core/notification_rules.rb
 - spec/factories/cats/core/notifications.rb
 - spec/factories/cats/core/operators.rb
+- spec/factories/cats/core/plan_item_details.rb
+- spec/factories/cats/core/plan_items.rb
+- spec/factories/cats/core/plans.rb
 - spec/factories/cats/core/programs.rb
 - spec/factories/cats/core/purchase_orders.rb
 - spec/factories/cats/core/ration_items.rb

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

@@ -1,46 +0,0 @@
-module Cats
-  module Core
-    class TransportRequest < ApplicationRecord
-      DRAFT = 'Draft'.freeze
-      APPROVED = 'Approved'.freeze
-      OPEN = 'Open'.freeze
-      CLOSED = 'Closed'.freeze
-      STATUSES = [DRAFT, APPROVED, OPEN, CLOSED].freeze
-
-      belongs_to :requested_by, class_name: 'Cats::Core::User'
-      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
-      has_many :transport_request_items
-
-      validates :reference_no, :request_date, :status, presence: true
-      validates :reference_no, uniqueness: true
-      validates :status, inclusion: { in: STATUSES }
-
-      delegate(:full_name, to: :requested_by, prefix: true, allow_nil: true)
-      delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
-
-      def approve(approver)
-        raise(StandardError, 'Request is not open for approval.') unless status == DRAFT
-
-        raise(StandardError, 'Request is empty.') if transport_request_items.count.zero?
-
-        self.approved_by = approver
-        self.status = APPROVED
-        save!
-      end
-
-      def open
-        raise(StandardError, 'Request is not approved for opening.') unless status == APPROVED
-
-        self.status = OPEN
-        save!
-      end
-
-      def close
-        raise(StandardError, 'Request is not open.') unless status == OPEN
-
-        self.status = CLOSED
-        save!
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-module Cats
-  module Core
-    class TransportRequestItem < ApplicationRecord
-      belongs_to :transport_request
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-      belongs_to :commodity
-
-      has_many :transport_offers
-
-      delegate(:name, to: :source, prefix: true)
-      delegate(:name, to: :destination, prefix: true)
-      delegate(:name, to: :commodity, prefix: true)
-    end
-  end
-end

data/db/migrate/20210717032024_create_cats_core_hrp_items.rb

@@ -1,23 +0,0 @@
-class CreateCatsCoreHrpItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_hrp_items do |t|
-      t.references :hrp,
-                   null: false,
-                   index: { name: 'hrp_on_hrp_items_indx' },
-                   foreign_key: { to_table: :cats_core_hrps }
-      t.references :woreda,
-                   null: false,
-                   index: { name: 'woreda_on_hrp_items_idnx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.integer :beneficiaries, null: false
-      t.references :operator,
-                   null: false,
-                   index: { name: 'operator_on_hrp_items_indx' },
-                   foreign_key: { to_table: :cats_core_operators }
-
-      t.timestamps
-    end
-
-    add_index :cats_core_hrp_items, [:hrp_id, :woreda_id], unique: true
-  end
-end

data/db/migrate/20210717032240_create_cats_core_hrp_item_details.rb

@@ -1,18 +0,0 @@
-class CreateCatsCoreHrpItemDetails < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_hrp_item_details do |t|
-      t.references :hrp_item,
-                   null: false,
-                   index: { name: 'hi_on_hid_indx' },
-                   foreign_key: { to_table: :cats_core_hrp_items }
-      t.references :ration_item,
-                   null: false,
-                   index: { name: 'ri_on_hid_indx' },
-                   foreign_key: { to_table: :cats_core_ration_items }
-      t.float :amount, null: false
-
-      t.timestamps
-    end
-    add_index(:cats_core_hrp_item_details, [:hrp_item_id, :ration_item_id], unique: true, name: 'hii_rii_on_hid_indx')
-  end
-end

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

@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :hrp_item_detail, class: 'Cats::Core::HrpItemDetail' do
-    hrp_item
-    ration_item
-    amount { 150 }
-  end
-end

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

@@ -1,10 +0,0 @@
-FactoryBot.define do
-  factory :hrp, class: 'Cats::Core::Hrp' do
-    reference_no { FFaker::Name.name }
-    year { 1 }
-    season { Cats::Core::Hrp::BELG }
-    status { Cats::Core::Hrp::DRAFT }
-    program
-    ration
-  end
-end