cats_core 1.0.35 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2945064c03295f5dcd5971f0e6ce570b50e4616166030f17fa5a6bd869d5cd
-  data.tar.gz: 3a6e091d8830f0d30ef67285547b64e2fa327e3efbbaad99449daf4cce0c67fa
+  metadata.gz: dbd96f5c771c2adceaa0d3c058ba5643b6e38189b4a5afdfbe666affab5a3c36
+  data.tar.gz: b55e4ab59388139d7c591194059f001af370df848077f446640ec3e1dc25f975
 SHA512:
-  metadata.gz: 58327459e7bbf5c43a08787c53d7ad8b9e08a7b8b6453e1ed06493e173a45cac45d82f0cdf3ddfbd5b6c106df31932e0ac637a0a3dd35a2d9493dc56ee1ad37a
-  data.tar.gz: 3065d7e0fceee9696d93851cb6c35be27fef7e3fd0779e783a490f8fe548eed6dc96348fe1be64be7f318fb845417ad0bbc23f1d0551cdcb4e56a1d669b3bc8a
+  metadata.gz: '0812bb8e9484cc6dd7f375434c294e7f82320999a9a3ae7a5793c6ede1592fe9eefe50895892895cabe240d1c0fa12197dd9bf2479e1f816d8d31f3c98fe7575'
+  data.tar.gz: dc903f04dddb57c08c4c80c0a3c0135b85254a12bc634414a96eab76bdb39c85cf96e2f37abf47d4853b084651a843d45bd42b5cf2771d0667fdab152e260569

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

@@ -6,7 +6,6 @@ module Cats
       belongs_to :operator
 
       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.rb

@@ -2,11 +2,8 @@ module Cats
   module Core
     class Ration < ApplicationRecord
       belongs_to :program
-      belongs_to :commodity_category
 
-      validates :reference_no, :amount, presence: true
-      validates :reference_no, uniqueness: true
-      validates :amount, numericality: { greater_than: 0 }
+      validates :reference_no, presence: true, uniqueness: true
     end
   end
 end

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

@@ -0,0 +1,14 @@
+module Cats
+  module Core
+    class RationItem < ApplicationRecord
+      belongs_to :commodity_category
+      belongs_to :ration
+      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/20210717031216_create_cats_core_rations.rb

@@ -6,11 +6,6 @@ class CreateCatsCoreRations < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'program_on_ration_indx' },
                    foreign_key: { to_table: :cats_core_programs }
-      t.references :commodity_category,
-                   null: false,
-                   index: { name: 'cc_on_ration_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
-      t.float :amount, null: false
       t.boolean :current, null: false, default: true
 
       t.timestamps

data/db/migrate/20210717031343_create_cats_core_ration_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreRationItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_ration_items do |t|
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :ration,
+                   null: false,
+                   index: { name: 'ri_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_rations }
+      t.references :unit_of_measure,
+                   null: false,
+                   index: { name: 'uom_on_ration_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :amount, null: false
+
+      t.timestamps
+    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.35'.freeze
+    VERSION = '1.0.39'.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/ration_items.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :ration_item, class: 'Cats::Core::RationItem' do
+    commodity_category
+    ration
+    amount { 150 }
+    unit_of_measure
+  end
+end

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

@@ -2,8 +2,6 @@ FactoryBot.define do
   factory :ration, class: 'Cats::Core::Ration' do
     reference_no { FFaker::Name.name }
     program
-    commodity_category
-    amount { 1.5 }
     current { false }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.39
 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
@@ -250,6 +251,7 @@ files:
 - app/models/cats/core/program.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
+- app/models/cats/core/ration_item.rb
 - app/models/cats/core/receipt.rb
 - app/models/cats/core/receipt_transaction.rb
 - app/models/cats/core/rhn_request.rb
@@ -290,8 +292,10 @@ files:
 - db/migrate/20210716210905_create_cats_core_suppliers.rb
 - db/migrate/20210717031108_create_cats_core_donors.rb
 - db/migrate/20210717031216_create_cats_core_rations.rb
+- 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
@@ -325,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
@@ -334,6 +339,7 @@ files:
 - spec/factories/cats/core/operators.rb
 - spec/factories/cats/core/programs.rb
 - spec/factories/cats/core/purchase_orders.rb
+- spec/factories/cats/core/ration_items.rb
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_transactions.rb
 - spec/factories/cats/core/receipts.rb