cats_core 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9380d0ff2181f5043d3c4d4f6251dde2561d5b08013959b6848558b505dbba2d
-  data.tar.gz: 1dc278bcfb116197b0c04620de35f042669a11e5690ce14fa93959a252f0e922
+  metadata.gz: b1553e2d695935cb7ac616b368580c59cef5f8a92b277829e41a8dd4ca7ff46b
+  data.tar.gz: 47d3a8a40f9e0c6ac3a8bddd98d2fb60943ade15288a3453b168273205f8f726
 SHA512:
-  metadata.gz: 0cecc9ef0cf5fc29c4b912e5b513afd23db6f6d607a93bdcd927348b2f11928df5624ccde4ae80b12048db368f1da25f4b8781b5a22014cb1b1fc2e0e251dba5
-  data.tar.gz: e3e5fbbe9e672a276f80a1d90e5c4b6a1958b5ccf894b1196387a7e9f50ce44a3d8285afdbcc8100c04b91702f9efa55b3b099074fd44330c6aa3ec38df53f6b
+  metadata.gz: c78f415988f1055f643caa4e6479c94b72f92b9c76775a1ab5bcd8578e52b999d49f43884d7b6177b7f76113db3571924bc2226390235057e244d695a060bd54
+  data.tar.gz: 1a7d8a00314ad8a56e0bc802f164fc9d48e600d9b97cfe609db2c81ef69fd175f44b28dbeae46e4a0d0a498586ddd35c8af98b6f394675cfdddae23b79dd0175

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

@@ -3,9 +3,12 @@ module Cats
     class MonthlyPlan < ApplicationRecord
       belongs_to :ration
       belongs_to :plan
+      belongs_to :regional_request
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, presence: true, inclusion: { in: Cats::Core::Plan::STATUSES }
+
+      delegate(:reference_no, to: :regional_request, prefix: 'request')
     end
   end
 end

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

@@ -2,12 +2,14 @@ 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 :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
@@ -23,6 +25,12 @@ module Cats
         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

@@ -9,6 +9,10 @@ class CreateCatsCoreRegionalRequests < ActiveRecord::Migration[6.1]
                    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

data/db/migrate/20220107121752_create_cats_core_monthly_plans.rb

@@ -11,6 +11,10 @@ class CreateCatsCoreMonthlyPlans < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'plan_on_mp_indx' },
                    foreign_key: { to_table: :cats_core_plans }
+      t.references :regional_request,
+                   null: false,
+                   index: { name: 'rr_on_mp_indx' },
+                   foreign_key: { to_table: :cats_core_regional_requests } 
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.7'.freeze
+    VERSION = '1.3.8'.freeze
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     status { Cats::Core::Plan::DRAFT }
     ration
     plan
+    regional_request
   end
 end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
       3.times { create(:plan_item, plan: pl, beneficiaries: 100) }
       pl
     end
+    region factory: :location
     reference_no { FFaker::Name.name }
     beneficiaries { 100 }
     month { 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Henock L.