cats_core 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8384e95d3bf98191d6f0fb04ce96f6180daf53d653d954ef1470282bf3b4782
-  data.tar.gz: 00a0000dba254d8f02dcb8f97fe37b268137d1fe19e03f5c385f2724cb03442b
+  metadata.gz: 4be4eb5f572d4c38a09f3ddfb775497fd81c0c9e3a9053be1f03bfee51730308
+  data.tar.gz: 4bea5f8744afffa22bad84782ba5e40ef433a31b7c11719da8e910d849803d4c
 SHA512:
-  metadata.gz: 2d6cdb1dcd812695e16f53ee1a613a834fa7683eb982d54b62cd1662a2082f147b0000ba2fa7453a7fedf5e5a003f94197eadeca05b7768fa104a9fb4655ab53
-  data.tar.gz: 7426544df6c7c89477936e11cff07b9ac047c46617b199e02853822cb67260d5b94e08816b51dd7c881173d85e0700a4ddcc3d3a4ab01523f42b2a6ae4e591a6
+  metadata.gz: f600c4c2170e448936f7860659533d22039b6815a4890cb9d0af81476c12f9ef7d28c5828887c73f146b44caa6b191bc57101f8b78a85521117e8c0b027ac1f3
+  data.tar.gz: 3153dc2e38a2d6f33ac3817ad67250a77a308c8ba3c67d4ced336f6aecea9bc9da64c6b35fc055c77a112f92f1dea5f2e2e618579fe7fe8b1e13e83f83c04838

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

@@ -5,6 +5,7 @@ module Cats
       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

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/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/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.13'.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -385,9 +385,9 @@ files:
 - db/migrate/20211229160129_create_cats_core_commodity_substitutions.rb
 - db/migrate/20220103152802_create_cats_core_tenderers.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