cats_core 1.3.7 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9380d0ff2181f5043d3c4d4f6251dde2561d5b08013959b6848558b505dbba2d
-  data.tar.gz: 1dc278bcfb116197b0c04620de35f042669a11e5690ce14fa93959a252f0e922
+  metadata.gz: 07bfd5b8cfedc80be5973e4c41ab660e71e1cc55dafea9dc3f0ad9669ce54382
+  data.tar.gz: 44265ec189d02cbb4e8553c3f2a837f78275a03a3a82d5c33e1a43f5695592e8
 SHA512:
-  metadata.gz: 0cecc9ef0cf5fc29c4b912e5b513afd23db6f6d607a93bdcd927348b2f11928df5624ccde4ae80b12048db368f1da25f4b8781b5a22014cb1b1fc2e0e251dba5
-  data.tar.gz: e3e5fbbe9e672a276f80a1d90e5c4b6a1958b5ccf894b1196387a7e9f50ce44a3d8285afdbcc8100c04b91702f9efa55b3b099074fd44330c6aa3ec38df53f6b
+  metadata.gz: c06175c94d4b3a39e011355104a963553d271a296e12f6e72af2e541d94aa2cf53a7898b953416f014012d6dddfa5738ba07d52e268193d7aab4103a692746b3
+  data.tar.gz: a21021e5054816d3ede7ac9ecadb7746bd2f9f62a43f977d90452350989003398fcb807aa59d15ff4a87975a7dd88debbdf7ae3ee1fc992ffbb6604aab77a025

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

@@ -1,11 +1,16 @@
 module Cats
   module Core
     class MonthlyPlan < ApplicationRecord
-      belongs_to :ration
       belongs_to :plan
+      belongs_to :regional_request
+
+      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 }
+
+      delegate(:reference_no, to: :regional_request, prefix: 'request')
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Cats
       belongs_to :monthly_plan
       belongs_to :plan_item
 
+      has_many :monthly_plan_item_details
+
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
     end
   end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class MonthlyRation < ApplicationRecord
+      belongs_to :commodity_category
+      belongs_to :unit_of_measure
+      belongs_to :monthly_plan
+
+      validates :amount, :no_of_days, presence: true, numericality: { greater_than: 0 }
+    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

@@ -3,14 +3,14 @@ class CreateCatsCoreMonthlyPlans < ActiveRecord::Migration[6.1]
     create_table :cats_core_monthly_plans do |t|
       t.string :reference_no, unique: true
       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,
+                   null: false,
+                   index: { name: 'rr_on_mp_indx' },
+                   foreign_key: { to_table: :cats_core_regional_requests }
 
       t.timestamps
     end

data/db/migrate/20220107224630_create_cats_core_monthly_rations.rb

@@ -0,0 +1,22 @@
+class CreateCatsCoreMonthlyRations < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_monthly_rations do |t|
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_mr_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.float :amount, null: false
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_mr_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.integer :no_of_days, null: false
+      t.references :monthly_plan,
+                   index: { name: 'mp_on_mr_indx' },
+                   null: false,
+                   foreign_key: { to_table: :cats_core_monthly_plans }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

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

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

@@ -2,7 +2,7 @@ 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
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :monthly_ration, class: 'Cats::Core::MonthlyRation' do
+    commodity_category
+    amount { 100 }
+    unit_of_measure
+    no_of_days { 30 }
+    monthly_plan
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.11
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -272,6 +272,7 @@ files:
 - app/models/cats/core/monthly_plan.rb
 - app/models/cats/core/monthly_plan_item.rb
 - app/models/cats/core/monthly_plan_item_detail.rb
+- app/models/cats/core/monthly_ration.rb
 - app/models/cats/core/notification.rb
 - app/models/cats/core/notification_rule.rb
 - app/models/cats/core/offer_item.rb
@@ -388,6 +389,7 @@ files:
 - 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
+- db/migrate/20220107224630_create_cats_core_monthly_rations.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -414,6 +416,7 @@ files:
 - spec/factories/cats/core/monthly_plan_item_details.rb
 - spec/factories/cats/core/monthly_plan_items.rb
 - spec/factories/cats/core/monthly_plans.rb
+- spec/factories/cats/core/monthly_rations.rb
 - spec/factories/cats/core/notification_rules.rb
 - spec/factories/cats/core/notifications.rb
 - spec/factories/cats/core/offer_items.rb