cats_core 1.0.36 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c909272a932180976b058fc2514d349d48677862c5bee425d97e1ebb1d92f30e
-  data.tar.gz: 57060b872361ba7f38b5bffe9522241ccb147bb3fac27b7e593288937a771672
+  metadata.gz: 37b5451e19e51157d009365bb31175b4d944c3571fcb0d9b6ec3d3dcebb7289d
+  data.tar.gz: 8b98610327bb324b7804b837c446883eb2853faeb244686bababae44d71b02ff
 SHA512:
-  metadata.gz: af510c6f846701bea55bd995f6ccf3d34500c11c8a23cdac2df2f89f258170c4f93fb31c9242eaf927ed3a24a5e499fdd2c995ca1d2c178d9e39c60364e6d072
-  data.tar.gz: 19dff931a8a64a71870263e2193709f541ea530110ac852ef0c751bca2e8739d996c8da2ad53c3465d720ad2167a34ead9c9cca36cd42956db7abecf6b1b37fa
+  metadata.gz: 132f9f7a5af86d83a87a8410490dcc0bd1a2134feb1da3fa8dd3eabe3508e9359369e0ec5aa15918e072fe5769f5645229f006c39c7fd070cbfb756b3ee3fad4
+  data.tar.gz: 218d19acc42b5508c85f9b4e1f3c5b4112bf85b120114038d4f30af3ed4631d92e5dccee8c1f26931b24122d93c62a95ec92bf438785166da69c240306b0cc69

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

@@ -9,7 +9,7 @@ module Cats
       MEHER = 'Meher'.freeze
       SEASONS = [BELG, MEHER].freeze
 
-      belongs_to :ration
+      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/app/models/cats/core/ration_item.rb

@@ -6,6 +6,9 @@ module Cats
       belongs_to :unit_of_measure
 
       validates :amount, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
     end
   end
 end

data/db/migrate/20210717031810_create_cats_core_hrps.rb

@@ -7,7 +7,7 @@ class CreateCatsCoreHrps < ActiveRecord::Migration[6.1]
       t.string :status, null: false, default: 'Draft'
 
       t.references :ration,
-                   null: false,
+                   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.36'.freeze
+    VERSION = '1.0.40'.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.36
+  version: 1.0.40
 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