cats_core 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b9bb64c4119d94cb514bf76741d6160682cb7adfb376daf9aff38b14fccf77
-  data.tar.gz: 0c5b176315cfbd52ed72f3214831705bdd9a8e7fc524e2689517a3e1ff0d29cd
+  metadata.gz: a7b180bedd093fa12aaf7cdbf46b9a9b4d5467f9a4679f3b977ed9bd57dddac9
+  data.tar.gz: e142956dce9922b02289fb0852109da69480b5c2ae459ff4fc892ef6a41fccc9
 SHA512:
-  metadata.gz: d3e0601550aebf25d5238ac8d9aabb57d933f3f48208bfe3a0cd39872a32e267dc97826c77eec6db841e40ae712ad4c7fded2ddb59b69da38f4ae874c5e4548b
-  data.tar.gz: '09ae2320e6fdfa2ec17b922068240768a0f614947b7de1ebbdc91fa412ecbd08e7b874593352e205975bb8647ddcf3e42959f51bdb14a9be335ef6a41d407376'
+  metadata.gz: 37605aa2ffdc3a3f4d9741124a4b65bb3f5a8c8d73c925b0881529eca3545a86709d8a0e7600fbabcb005bd7418dfcc9cd06bff3fc895cb6d3c634f984c448e0
+  data.tar.gz: 0b8c7f19cd38d66128f16f6b87bbb1e2e383798213cd465482cdcd6bafeb37177bfaa2c62a5335f60eb852a01692501416c804f2ec074370173936dd9ba0821e

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

@@ -27,7 +27,7 @@ module Cats
       def model_params
         params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :project_id, :commodity_grade,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
-                                        :arrival_status, :shipping_reference)
+                                        :arrival_status, :shipping_reference, :package_unit_id)
       end
     end
   end

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

@@ -3,6 +3,7 @@ module Cats
     class RoundPlanItemDetail < ApplicationRecord
       belongs_to :beneficiary_round_plan_item
       belongs_to :round_ration
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :beneficiary_round_plan_item_id, uniqueness: { scope: :round_ration_id }

data/app/services/cats/core/round_plan_service.rb

@@ -19,12 +19,17 @@ module Cats
           round_rations.each do |ration|
             quantity = (no_of_days / ration.no_of_days * ration.quantity) * plan_item.beneficiaries *
                        round_plan.rounds.count
-            quantity = UnitConversion.convert(ration.unit, mt, quantity) if ration.unit.abbreviation.downcase != 'pcs'
+            unit = ration.unit
+            if ration.unit.abbreviation.downcase != 'pc'
+              quantity = UnitConversion.convert(unit, mt, quantity)
+              unit = mt
+            end
 
             details << {
               beneficiary_round_plan_item_id: plan_item.id,
               round_ration_id: ration.id,
-              quantity: quantity
+              quantity: quantity,
+              unit_id: unit.id
             }
           end
         end

data/app/services/cats/core/stack_service.rb

@@ -29,7 +29,9 @@ module Cats
             batch_no: item.commodity.batch_no,
             commodity_id: item.commodity_id,
             commodity_name: item.commodity.name,
-            unit: item.commodity.unit_abbreviation
+            unit: item.commodity.unit_abbreviation,
+            package_unit_id: item.commodity.package_unit_id,
+            package_unit_abbreviation: item.commodity.package_unit_abbreviation
           }
         end
       end

data/db/migrate/20220107132433_create_cats_core_round_plan_item_details.rb

@@ -10,6 +10,10 @@ class CreateCatsCoreRoundPlanItemDetails < ActiveRecord::Migration[6.1]
                    index: { name: 'rr_on_rpid_indx' },
                    foreign_key: { to_table: :cats_core_round_rations }
       t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_rpid_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.5'.freeze
+    VERSION = '1.5.7'.freeze
   end
 end

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

@@ -1,7 +1,11 @@
 FactoryBot.define do
   factory :round_plan_item_detail, class: 'Cats::Core::RoundPlanItemDetail' do
+    transient do
+      mt { create(:unit_of_measure, abbreviation: 'mt', name: 'Metric Tonne') }
+    end
     beneficiary_round_plan_item
     round_ration
     quantity { 150 }
+    unit { round_ration.unit.abbreviation == 'pc' ? round_ration.unit : mt }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers