cats_core 1.0.35 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2945064c03295f5dcd5971f0e6ce570b50e4616166030f17fa5a6bd869d5cd
-  data.tar.gz: 3a6e091d8830f0d30ef67285547b64e2fa327e3efbbaad99449daf4cce0c67fa
+  metadata.gz: c909272a932180976b058fc2514d349d48677862c5bee425d97e1ebb1d92f30e
+  data.tar.gz: 57060b872361ba7f38b5bffe9522241ccb147bb3fac27b7e593288937a771672
 SHA512:
-  metadata.gz: 58327459e7bbf5c43a08787c53d7ad8b9e08a7b8b6453e1ed06493e173a45cac45d82f0cdf3ddfbd5b6c106df31932e0ac637a0a3dd35a2d9493dc56ee1ad37a
-  data.tar.gz: 3065d7e0fceee9696d93851cb6c35be27fef7e3fd0779e783a490f8fe548eed6dc96348fe1be64be7f318fb845417ad0bbc23f1d0551cdcb4e56a1d669b3bc8a
+  metadata.gz: af510c6f846701bea55bd995f6ccf3d34500c11c8a23cdac2df2f89f258170c4f93fb31c9242eaf927ed3a24a5e499fdd2c995ca1d2c178d9e39c60364e6d072
+  data.tar.gz: 19dff931a8a64a71870263e2193709f541ea530110ac852ef0c751bca2e8739d996c8da2ad53c3465d720ad2167a34ead9c9cca36cd42956db7abecf6b1b37fa

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,11 @@
+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 }
+    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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.35'.freeze
+    VERSION = '1.0.36'.freeze
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.36
 platform: ruby
 authors:
 - Henock L.
@@ -250,6 +250,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,6 +291,7 @@ 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/20210717032330_create_cats_core_donations.rb
@@ -334,6 +336,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