cats_core 1.0.37 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c131ef4d30c89f95283ca736b6da138361fdcb1641d6a667431d3a4aaeab96a5
-  data.tar.gz: cbd3917a4592cf72eecd527f82a766831761a92c51554da72aa60806973dbd12
+  metadata.gz: 1a3d6fa190673652349c149ea87b314da07a74f00c600d774f2911ca4da24a35
+  data.tar.gz: 7c29148233b0fc4a2e9efc1c114cb02910967d679420cfa5f40aca7eb0a92083
 SHA512:
-  metadata.gz: 1223c5b27c6bec3b5e511f61e387711ad4c4943dfb7b85470e9f71261b76e1aacf90c4365f6abfe41dd415227f291d78665798a60850f5641871ebeba0f56f43
-  data.tar.gz: af61ab9c795d2621f2cf4fd01c865bfb223874ff3725f094117c088e2acd29fb2e2158aa935c651428ef19b484a227380baec502c357b3384a82c67f30d7416f
+  metadata.gz: f37e6d2c1f1ff4d5c75df983a259c739d65de04d8d6da3f853dbe8994133f9ec7779c7b0948130ec9081e7127de062287271aa69703f0c5aa790588af6110a58
+  data.tar.gz: 7b4f03e36d240e6ae05d04f46c9cef15f9ec86c0cf6f1bbc871eda27fa5f5d5cd9d0971f016a55ef97e8a7b71413d88ec9d1d156bb376506ad8e68e57be83d21

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,8 +5,9 @@ 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 :commodity_amount, presence: true, numericality: { greater_than: 0 }
       validates :hrp_id, uniqueness: { scope: :woreda_id }
 
       delegate(:name, to: :woreda, prefix: true)

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class HrpItemDetail < ApplicationRecord
+      belongs_to :hrp_item
+      belongs_to :ration_item
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+      validates :hrp_item_id, uniqueness: { scope: :ration_item_id }
+    end
+  end
+end

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/20210717032024_create_cats_core_hrp_items.rb

@@ -10,7 +10,6 @@ class CreateCatsCoreHrpItems < ActiveRecord::Migration[6.1]
                    index: { name: 'woreda_on_hrp_items_idnx' },
                    foreign_key: { to_table: :cats_core_locations }
       t.integer :beneficiaries, null: false
-      t.float :commodity_amount, null: false
       t.references :operator,
                    null: false,
                    index: { name: 'operator_on_hrp_items_indx' },

data/db/migrate/20210717032240_create_cats_core_hrp_item_details.rb

@@ -0,0 +1,18 @@
+class CreateCatsCoreHrpItemDetails < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_hrp_item_details do |t|
+      t.references :hrp_item,
+                   null: false,
+                   index: { name: 'hi_on_hid_indx' },
+                   foreign_key: { to_table: :cats_core_hrp_items }
+      t.references :ration_item,
+                   null: false,
+                   index: { name: 'ri_on_hid_indx' },
+                   foreign_key: { to_table: :cats_core_ration_items }
+      t.float :amount, null: false
+
+      t.timestamps
+    end
+    add_index(:cats_core_hrp_item_details, [:hrp_item_id, :ration_item_id], unique: true, name: 'hii_rii_on_hid_indx')
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.37'.freeze
+    VERSION = '1.0.41'.freeze
   end
 end

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

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

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

@@ -3,7 +3,6 @@ FactoryBot.define do
     hrp
     woreda
     beneficiaries { 100 }
-    commodity_amount { 100 }
     operator
   end
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.41
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -242,6 +242,7 @@ files:
 - app/models/cats/core/gift_certificate.rb
 - 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/location.rb
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
@@ -294,6 +295,7 @@ 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/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
 - db/migrate/20210717032855_create_cats_core_purchase_orders.rb
@@ -327,6 +329,7 @@ files:
 - spec/factories/cats/core/donations.rb
 - spec/factories/cats/core/donors.rb
 - 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/hrps.rb
 - spec/factories/cats/core/locations.rb