cats_core 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08f2f20d4acef0ef129992bee4c7f78ef4bfbd3fe239e500487ff6a2a3a247ae'
-  data.tar.gz: d01a26f3a74c9cf2a0ce1ef0545a8a4c09cb8a28cd7249772df7bfa43fc46432
+  metadata.gz: d8384e95d3bf98191d6f0fb04ce96f6180daf53d653d954ef1470282bf3b4782
+  data.tar.gz: 00a0000dba254d8f02dcb8f97fe37b268137d1fe19e03f5c385f2724cb03442b
 SHA512:
-  metadata.gz: d7b74a89b8a98f3c3a42281cd6cb8fe7f951b4cca766c089890e0e51361594e989c310b71fd194ee6ffeddd614f80d587056aea8269b9725fdbe31c4b2d44d88
-  data.tar.gz: 860b2fdfd704fbc6cbbc31c57816f097edef10f94911d9d4f1f59503e8e96da8229fa40fbdd47f15604d34de5fa17148dd7c46968187068429a7cddfe25dbbd6
+  metadata.gz: 2d6cdb1dcd812695e16f53ee1a613a834fa7683eb982d54b62cd1662a2082f147b0000ba2fa7453a7fedf5e5a003f94197eadeca05b7768fa104a9fb4655ab53
+  data.tar.gz: 7426544df6c7c89477936e11cff07b9ac047c46617b199e02853822cb67260d5b94e08816b51dd7c881173d85e0700a4ddcc3d3a4ab01523f42b2a6ae4e591a6

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

@@ -2,15 +2,30 @@ module Cats
   module Core
     class MonthlyPlan < ApplicationRecord
       belongs_to :plan
-      belongs_to :regional_request
+      belongs_to :region, class_name: 'Cats::Core::Location'
 
       has_many :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/db/migrate/20220107121752_create_cats_core_monthly_plans.rb

@@ -2,15 +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 :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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.12'.freeze
+    VERSION = '1.3.13'.freeze
   end
 end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     status { Cats::Core::Plan::DRAFT }
     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.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-01-10 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,7 +384,6 @@ 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/20220107125025_create_cats_core_monthly_plan_items.rb
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.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