cats_core 1.3.10 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b11b523effee1abb0d25abc8f495da5417f4a92d260339588bd30dfd617bd4e
-  data.tar.gz: adb1c8af3fd35b7d40b6d1b462110dad73b5128dd3a7ab1064c401aef2a9218d
+  metadata.gz: 4be4eb5f572d4c38a09f3ddfb775497fd81c0c9e3a9053be1f03bfee51730308
+  data.tar.gz: 4bea5f8744afffa22bad84782ba5e40ef433a31b7c11719da8e910d849803d4c
 SHA512:
-  metadata.gz: af209110dee908a47a8b8dd6e6bf156a7b9ec72b17aaef38dc2ebb49fc052bc72edb5bd566ac4711a4714c68f9fb81a863a777c2feb7345696d7ed295a30ecc3
-  data.tar.gz: 7880e17c8a0bebc41bfa79f012ea0e5db7ac1ead2cd00ecd7d3680eae9253d3af76813426ddd492d72985c631e57119f1960e2ffb45b5404a7b0b2efbd7b5044
+  metadata.gz: f600c4c2170e448936f7860659533d22039b6815a4890cb9d0af81476c12f9ef7d28c5828887c73f146b44caa6b191bc57101f8b78a85521117e8c0b027ac1f3
+  data.tar.gz: 3153dc2e38a2d6f33ac3817ad67250a77a308c8ba3c67d4ced336f6aecea9bc9da64c6b35fc055c77a112f92f1dea5f2e2e618579fe7fe8b1e13e83f83c04838

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

@@ -1,17 +1,32 @@
 module Cats
   module Core
     class MonthlyPlan < ApplicationRecord
-      belongs_to :ration
       belongs_to :plan
-      belongs_to :regional_request
+      belongs_to :region, class_name: 'Cats::Core::Location'
 
       has_many :monthly_plan_items
+      has_many :monthly_plan_item_details, through: :monthly_plan_items
       has_many :monthly_rations
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, presence: true, inclusion: { in: Cats::Core::Plan::STATUSES }
+      validates :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
+      validate :validate_month, :validate_region
 
-      delegate(:reference_no, to: :regional_request, prefix: 'request')
+      delegate(:reference_no, to: :plan, prefix: true)
+      delegate(:name, to: :region, prefix: true)
+
+      def validate_month
+        return unless month
+
+        errors.add(:month, 'cannot be greater than 12.') if month > 12
+      end
+
+      def validate_region
+        return unless region
+
+        errors.add(:region, 'is not valid.') unless region.location_type == Cats::Core::Location::REGION
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Cats
   module Core
     class MonthlyPlanItemDetail < ApplicationRecord
       belongs_to :monthly_plan_item
-      belongs_to :ration_item
+      belongs_to :monthly_ration
 
       validates :amount, presence: true, numericality: { greater_than: 0 }
     end

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

@@ -6,6 +6,10 @@ module Cats
       belongs_to :monthly_plan
 
       validates :amount, :no_of_days, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:reference_no, to: :monthly_plan, prefix: true)
     end
   end
 end

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

@@ -9,11 +9,13 @@ module Cats
 
       BELG = 'Belg'.freeze
       MEHER = 'Meher'.freeze
-      SEASONS = [BELG, MEHER].freeze
+      ANNUAL = 'Annual'.freeze
+      SEASONS = [BELG, MEHER, ANNUAL].freeze
 
       belongs_to :program
       belongs_to :ration, optional: true
       has_many :plan_items
+      has_many :plan_item_details, through: :plan_items
 
       validates :reference_no, :year, :status, presence: true
       validates :season, presence: true, inclusion: { in: SEASONS }

data/db/migrate/20220107121752_create_cats_core_monthly_plans.rb

@@ -2,19 +2,17 @@ class CreateCatsCoreMonthlyPlans < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_monthly_plans do |t|
       t.string :reference_no, unique: true
+      t.integer :month, null: false
+      t.integer :no_of_days, null: false
       t.string :status, null: false, default: 'Draft'
-      t.references :ration,
-                   null: false,
-                   index: { name: 'ration_on_mp_indx' },
-                   foreign_key: { to_table: :cats_core_rations }
       t.references :plan,
                    null: false,
                    index: { name: 'plan_on_mp_indx' },
                    foreign_key: { to_table: :cats_core_plans }
-      t.references :regional_request,
+      t.references :region,
                    null: false,
-                   index: { name: 'rr_on_mp_indx' },
-                   foreign_key: { to_table: :cats_core_regional_requests }
+                   index: { name: 'region_on_mp_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
 
       t.timestamps
     end

data/db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb

@@ -5,10 +5,10 @@ class CreateCatsCoreMonthlyPlanItemDetails < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'mpi_on_mpid_indx' },
                    foreign_key: { to_table: :cats_core_monthly_plan_items }
-      t.references :ration_item,
+      t.references :monthly_ration,
                    null: false,
-                   index: { name: 'ri_on_mpid_indx' },
-                   foreign_key: { to_table: :cats_core_ration_items }
+                   index: { name: 'ri_on_mr_indx' },
+                   foreign_key: { to_table: :cats_core_monthly_rations }
       t.float :amount, null: false
 
       t.timestamps

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.10'.freeze
+    VERSION = '1.3.14'.freeze
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :monthly_plan_item_detail, class: 'Cats::Core::MonthlyPlanItemDetail' do
     monthly_plan_item
-    ration_item
+    monthly_ration
     amount { 150 }
   end
 end

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

@@ -2,8 +2,9 @@ FactoryBot.define do
   factory :monthly_plan, class: 'Cats::Core::MonthlyPlan' do
     reference_no { FFaker::Name.name }
     status { Cats::Core::Plan::DRAFT }
-    ration
     plan
-    regional_request
+    region factory: :location
+    month { 1 }
+    no_of_days { 30 }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -286,7 +286,6 @@ files:
 - app/models/cats/core/ration_item.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
-- app/models/cats/core/regional_request.rb
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
@@ -385,11 +384,10 @@ files:
 - db/migrate/20211229160128_create_cats_core_contract_items.rb
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - db/migrate/20220103152802_create_cats_core_tenderers.rb
-- db/migrate/20220105084347_create_cats_core_regional_requests.rb
 - db/migrate/20220107121752_create_cats_core_monthly_plans.rb
+- db/migrate/20220107124630_create_cats_core_monthly_rations.rb
 - db/migrate/20220107125025_create_cats_core_monthly_plan_items.rb
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb
-- db/migrate/20220107224630_create_cats_core_monthly_rations.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -430,7 +428,6 @@ files:
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb
-- spec/factories/cats/core/regional_requests.rb
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb

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

@@ -1,36 +0,0 @@
-module Cats
-  module Core
-    class RegionalRequest < ApplicationRecord
-      belongs_to :plan
-      belongs_to :region, class_name: 'Cats::Core::Location'
-
-      validates :reference_no, presence: true, uniqueness: true
-      validates :beneficiaries, :no_of_days, :month, presence: true, numericality: { greater_than: 0 }
-      validate :validate_month, :validate_beneficiaries, :validate_region
-
-      delegate(:reference_no, to: :plan, prefix: true)
-      delegate(:name, to: :region, prefix: true)
-
-      def validate_month
-        return unless month
-
-        errors.add(:month, 'cannot be greater than 12.') if month > 12
-      end
-
-      def validate_beneficiaries
-        return unless beneficiaries
-
-        return unless plan
-
-        total = plan.plan_items.sum(:beneficiaries)
-        errors.add(:beneficiaries, "cannot be higher than #{total}.") if total < beneficiaries
-      end
-
-      def validate_region
-        return unless region
-
-        errors.add(:region, 'is not valid.') unless region.location_type == Cats::Core::Location::REGION
-      end
-    end
-  end
-end

data/db/migrate/20220105084347_create_cats_core_regional_requests.rb

@@ -1,20 +0,0 @@
-class CreateCatsCoreRegionalRequests < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_regional_requests do |t|
-      t.string :reference_no, unique: true
-      t.integer :beneficiaries, null: false
-      t.integer :month, null: false
-      t.integer :no_of_days, null: false
-      t.references :plan,
-                   null: false,
-                   index: { name: 'plan_on_rr_indx' },
-                   foreign_key: { to_table: :cats_core_plans }
-      t.references :region,
-                   null: false,
-                   index: { name: 'region_on_rr_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-FactoryBot.define do
-  factory :regional_request, class: 'Cats::Core::RegionalRequest' do
-    plan do
-      pl = create(:plan)
-      3.times { create(:plan_item, plan: pl, beneficiaries: 100) }
-      pl
-    end
-    region factory: :location
-    reference_no { FFaker::Name.name }
-    beneficiaries { 100 }
-    month { 1 }
-    no_of_days { 30 }
-  end
-end