cats_core 1.0.38 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f003ab02e18c4d6748354703954b989a2854beb06d6cedde9a1417dd033b6b0d
-  data.tar.gz: ec1a54e9e760cf5a8c84109d526b7a6da50696b31bd3647a82b910e108dca482
+  metadata.gz: 459a3f07d1fadf11fb8120f91ecf18b2df1b7719e05a2e8398e0af664af1b19b
+  data.tar.gz: 92645ac2384a08e79db744e98e8179bcea78112c538c1b6444bbc0a6fa26d34e
 SHA512:
-  metadata.gz: d21df2b1e4f3052deda19c879fbc0d3c4f4d5bf9754a7c91e6b7260a7ff1cf64292a68da01d847a9caec74d933cded52952d3de3c627afcd9b6a0bd426019cd0
-  data.tar.gz: 2afec4b8dedd8eb129bd3ad61cc3bcf766c69eb1fbc0d45ef12f18085b62db3856bbc298720be52cc63f040451904cd966cfc6b64fcf6d57037b76254b63f54b
+  metadata.gz: 265613d922d768384446ca0e38e3dfcae4ae2bb9f07a7f8a278ebbc3f2ec87fd8c96f08ae08a5ecc605ee9903701bf8d90f45ba5583524717b65f97ad3264509
+  data.tar.gz: 3a8236f40c2f028c8a7cff2abcf2d08c02eb598f577e71bedf8723841301c70cf0f8c0834d36fc1eff6b6a06dca0c6383d5e06e8bdfbed6b82ee747176ca9792

data/app/controllers/cats/core/locations_controller.rb

@@ -46,7 +46,7 @@ module Cats
       end
 
       def model_params
-        params.require(:payload).permit(:name, :location_type, :description, :parent_id)
+        params.require(:payload).permit(:code, :name, :location_type, :description, :parent_id)
       end
     end
   end

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

@@ -9,7 +9,8 @@ module Cats
       MEHER = 'Meher'.freeze
       SEASONS = [BELG, MEHER].freeze
 
-      belongs_to :ration
+      belongs_to :program
+      belongs_to :ration, optional: true
       has_many :hrp_items
 
       validates :reference_no, :year, :status, presence: true

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

@@ -5,6 +5,8 @@ module Cats
       belongs_to :woreda, -> { where(location_type: Cats::Core::Location::WOREDA) }, class_name: 'Cats::Core::Location'
       belongs_to :operator
 
+      has_many :hrp_item_details
+
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
       validates :hrp_id, uniqueness: { scope: :woreda_id }
 

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

@@ -2,7 +2,6 @@ module Cats
   module Core
     class HrpItemDetail < ApplicationRecord
       belongs_to :hrp_item
-      belongs_to :hrp_ration
       belongs_to :ration_item
 
       validates :amount, presence: true, numericality: { greater_than: 0 }

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

@@ -12,7 +12,8 @@ module Cats
 
       has_ancestry
 
-      validates :name, :location_type, presence: true
+      validates :code, :name, :location_type, presence: true
+      validates :code, uniqueness: true
       validates :location_type, inclusion: { in: LOCATION_TYPES }
       validate :validate_location_parent
 

data/db/migrate/20210716183620_create_cats_core_locations.rb

@@ -1,6 +1,7 @@
 class CreateCatsCoreLocations < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_locations do |t|
+      t.string :code, unique: true
       t.string :name, null: false
       t.string :location_type, null: false
       t.string :description

data/db/migrate/20210717031810_create_cats_core_hrps.rb

@@ -6,8 +6,12 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
       t.string :season, null: false
       t.string :status, null: false, default: 'Draft'
 
-      t.references :ration,
+      t.references :program,
                    null: false,
+                   index: { name: 'program_on_hrp_indx' },
+                   foreign_key: { to_table: :cats_core_programs }
+      t.references :ration,
+                   null: true,
                    index: { name: 'ration_on_hrp_indx' },
                    foreign_key: { to_table: :cats_core_rations }
 

data/db/migrate/20210717032240_create_cats_core_hrp_item_details.rb

@@ -5,10 +5,6 @@ class CreateCatsCoreHrpItemDetails < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'hi_on_hid_indx' },
                    foreign_key: { to_table: :cats_core_hrp_items }
-      t.references :hrp_ration,
-                   null: false,
-                   index: { name: 'hr_on_hid_indx' },
-                   foreign_key: { to_table: :cats_core_hrp_rations }
       t.references :ration_item,
                    null: false,
                    index: { name: 'ri_on_hid_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.38'.freeze
+    VERSION = '1.0.42'.freeze
   end
 end

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

@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :hrp_item_detail, class: 'Cats::Core::HrpItemDetail' do
     hrp_item
-    hrp_ration
     ration_item
     amount { 150 }
   end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     year { 1 }
     season { Cats::Core::Hrp::BELG }
     status { Cats::Core::Hrp::DRAFT }
+    program
     ration
   end
 end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :location, class: 'Cats::Core::Location', aliases: [:parent] do
+    code { FFaker::Name.name }
     name { FFaker::Name.name }
     location_type { Cats::Core::Location::REGION }
     ancestry { nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.42
 platform: ruby
 authors:
 - Henock L.
@@ -243,7 +243,6 @@ files:
 - app/models/cats/core/hrp.rb
 - app/models/cats/core/hrp_item.rb
 - app/models/cats/core/hrp_item_detail.rb
-- app/models/cats/core/hrp_ration.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
@@ -296,7 +295,6 @@ files:
 - db/migrate/20210717031343_create_cats_core_ration_items.rb
 - db/migrate/20210717031810_create_cats_core_hrps.rb
 - db/migrate/20210717032024_create_cats_core_hrp_items.rb
-- db/migrate/20210717032106_create_cats_core_hrp_rations.rb
 - db/migrate/20210717032240_create_cats_core_hrp_item_details.rb
 - db/migrate/20210717032330_create_cats_core_donations.rb
 - db/migrate/20210717032602_create_cats_core_gift_certificates.rb
@@ -333,7 +331,6 @@ files:
 - spec/factories/cats/core/gift_certificates.rb
 - spec/factories/cats/core/hrp_item_details.rb
 - spec/factories/cats/core/hrp_items.rb
-- spec/factories/cats/core/hrp_rations.rb
 - spec/factories/cats/core/hrps.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/menu_items.rb

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

@@ -1,10 +0,0 @@
-module Cats
-  module Core
-    class HrpRation < ApplicationRecord
-      belongs_to :hrp
-      belongs_to :ration
-
-      validates :hrp_id, uniqueness: true
-    end
-  end
-end

data/db/migrate/20210717032106_create_cats_core_hrp_rations.rb

@@ -1,17 +0,0 @@
-class CreateCatsCoreHrpRations < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_hrp_rations do |t|
-      t.references :hrp,
-                   null: false,
-                   index: { name: 'hrp_on_hr_indx' },
-                   foreign_key: { to_table: :cats_core_hrps }
-      t.references :ration,
-                   null: false,
-                   index: { name: 'ration_on_hr_indx' },
-                  foreign_key: { to_table: :cats_core_rations }
-
-      t.timestamps
-    end
-    add_index(:cats_core_hrp_rations, :hrp_id, unique: true)
-  end
-end

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

@@ -1,6 +0,0 @@
-FactoryBot.define do
-  factory :hrp_ration, class: 'Cats::Core::HrpRation' do
-    hrp
-    ration
-  end
-end