cats_core 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cbad0f2d1788e23d39a4b904aac57711bc3d6432b36ea4a96105ee9fccfd94
-  data.tar.gz: d3ff309544e77e52620b48c66f19be7488c7629bcd6a2e7cf45cd084f48ce835
+  metadata.gz: e2624794cc9a3787caefb212037b9f33f8964e9d5512fcc40a7dbb31fa129009
+  data.tar.gz: 0f2d9b94ca4dc8794fe89928449b6c26cac67a78e2ffffadfa5be8d49baef52c
 SHA512:
-  metadata.gz: c38aaf1efefb124e3e2e1d2122d420f5fe152363580931ac0c49065a19392b092cd280e503ce84d674c87709f251d1f780c50674808b83c47c2f7cd3bcf48a89
-  data.tar.gz: d7c641de65a5a30397eecabd9af62c792e50e5540aeafbb1f795a720ce49a4d0747611a01af39ab086b72c6c8cd759deb1561940d1c31f09b2cda51c8c2b6a1d
+  metadata.gz: c0f3fc9431f4b011ca5015f9bf288627b51b547d79323e48d1f0221baae4781766b63ab521c23652feda8cd2fefb7f17a2242166ace64875cf4418138dc37c54
+  data.tar.gz: c9b0ec89851d48c0fcc9338dd749364d4a1a66e0a4291085c59f70b73605f5b47b4831cbfd03d01683f0b1ed829309247069f0878b6bc199cf2791936e416978

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class UnitConversionsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:from_id, :to_id, :factor)
+      end
+    end
+  end
+end

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

@@ -44,12 +44,12 @@ module Cats
 
         # Raise error if the total dispatch plan quantity is not equal to the
         # dispatchable quantity
-        if dispatchable && dispatchable.quantity != quantity
+        if dispatchable.instance_of?(RhnRequest) && dispatchable.quantity != quantity
           raise(StandardError, 'Requested quantity and plan quantity do not match.')
         end
 
         self.status = APPROVED
-        dispatchable&.allocate
+        dispatchable&.allocate if dispatchable.instance_of?(RhnRequest)
         save!
       end
 

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

@@ -4,11 +4,12 @@ module Cats
       REGION = 'Region'.freeze
       ZONE = 'Zone'.freeze
       WOREDA = 'Woreda'.freeze
+      FDP = 'Fdp'.freeze
       KEBELE = 'Kebele'.freeze
       HUB = 'Hub'.freeze
       WAREHOUSE = 'Warehouse'.freeze
 
-      LOCATION_TYPES = [REGION, ZONE, WOREDA, KEBELE, HUB, WAREHOUSE].freeze
+      LOCATION_TYPES = [REGION, ZONE, WOREDA, KEBELE, HUB, WAREHOUSE, FDP].freeze
 
       has_ancestry
 
@@ -23,6 +24,7 @@ module Cats
           ZONE => [REGION],
           WOREDA => [REGION, ZONE],
           KEBELE => [REGION, ZONE, WOREDA],
+          FDP => [REGION, ZONE, WOREDA],
           HUB => [REGION, ZONE, WOREDA, KEBELE],
           WAREHOUSE => [REGION, ZONE, WOREDA, KEBELE, HUB]
         }

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

@@ -46,6 +46,10 @@ module Cats
         save!
         self
       end
+
+      def quantity
+        transport_bid_items.sum(:quantity)
+      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Cats
     class TransportBidItem < ApplicationRecord
       belongs_to :transport_bid
       belongs_to :transport_plan_item
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
       has_many :offer_items
 

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class UnitConversion < ApplicationRecord
+      belongs_to :from, class_name: 'Cats::Core::UnitOfMeasure'
+      belongs_to :to, class_name: 'Cats::Core::UnitOfMeasure'
+
+      validates :factor, presence: true
+      validates :from_id, uniqueness: { scope: :to_id }
+      validates :factor, numericality: { greater_than: 0 }
+
+      delegate(:abbreviation, to: :from, prefix: true)
+      delegate(:abbreviation, to: :to, prefix: true)
+
+      def self.convert(from, to, value)
+        return value if from == to
+
+        conversion = find_by(from: from, to: to)
+        error = "Conversion factor from #{from.abbreviation} to #{to.abbreviation} not found."
+        raise(StandardError, error) unless conversion
+
+        value * conversion.factor
+      end
+    end
+  end
+end

data/app/serializers/cats/core/unit_conversion_serializer.rb

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class UnitConversionSerializer < ActiveModel::Serializer
+      attributes :id, :from_id, :from_abbreviation, :to_id, :to_abbreviation, :factor
+    end
+  end
+end

data/config/routes.rb

@@ -74,6 +74,7 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+  resources :unit_conversions, except: %i[destroy]
 
   post '/transporters/filter', controller: :transporters, action: :filter
   resources :transporters, except: %i[destroy]

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

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

data/db/migrate/20220416143416_create_cats_core_unit_conversions.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreUnitConversions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_unit_conversions do |t|
+      t.references :from,
+                   null: false,
+                   index: { name: 'from_on_uc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :to,
+                   null: false,
+                   index: { name: 'to_on_uc_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :factor, null: false
+
+      t.timestamps
+    end
+
+    add_index(:cats_core_unit_conversions, [:from_id, :to_id], unique: true)
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.2'.freeze
+    VERSION = '1.4.3'.freeze
   end
 end

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

@@ -9,11 +9,20 @@ FactoryBot.define do
     approved_by { nil }
 
     trait :with_rhn do
-      dispatchable { create(:rhn_request) }
+      dispatchable do
+        disp = create(:rhn_request)
+        disp.approve
+        disp
+      end
     end
 
     trait :with_monthly_plan do
-      dispatchable { create(:monthly_plan) }
+      dispatchable do
+        disp = create(:monthly_plan)
+        3.times { create(:monthly_plan_item, monthly_plan: disp) }
+        disp.approve
+        disp
+      end
     end
   end
 end

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

@@ -3,5 +3,6 @@ FactoryBot.define do
     transport_bid
     transport_plan_item
     quantity { 100 }
+    unit factory: :unit_of_measure
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :unit_conversion, class: 'Cats::Core::UnitConversion' do
+    from factory: :unit_of_measure
+    to factory: :unit_of_measure
+    factor { 1 }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -251,6 +251,7 @@ files:
 - app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/stacks_controller.rb
 - app/controllers/cats/core/transporters_controller.rb
+- app/controllers/cats/core/unit_conversions_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/controllers/concerns/cats/core/common.rb
@@ -309,6 +310,7 @@ files:
 - app/models/cats/core/transport_plan.rb
 - app/models/cats/core/transport_plan_item.rb
 - app/models/cats/core/transporter.rb
+- app/models/cats/core/unit_conversion.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
 - app/models/concerns/cats/core/dispatchable.rb
@@ -332,6 +334,7 @@ files:
 - app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/stack_serializer.rb
 - app/serializers/cats/core/transporter_serializer.rb
+- app/serializers/cats/core/unit_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/dispatch_plan_service.rb
@@ -400,6 +403,7 @@ files:
 - db/migrate/20220107125025_create_cats_core_monthly_plan_items.rb
 - db/migrate/20220107132433_create_cats_core_monthly_plan_item_details.rb
 - db/migrate/20220209083928_create_cats_core_hub_authorizations.rb
+- db/migrate/20220416143416_create_cats_core_unit_conversions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -457,6 +461,7 @@ files:
 - spec/factories/cats/core/transport_plan_items.rb
 - spec/factories/cats/core/transport_plans.rb
 - spec/factories/cats/core/transporters.rb
+- spec/factories/cats/core/unit_conversions.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb
 homepage: http://cats.ndrmcapps.org
@@ -482,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Core module for CATS applications