cats_core 1.5.30 → 1.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03b358ca3dc8a8908dc00309ca843ab82e9703f9224c5d726cf1762034bf76ed
-  data.tar.gz: 3e0da8d5c95a1bd32c90f76d78bd17bd3b70e2c5466916945b96d6292c3ae3f7
+  metadata.gz: a7911574179f48f97106983fea8b4ca2989786a8db813b9512302c2cbae7a5d3
+  data.tar.gz: b7f622e7bc236fe0d831696064041efc2d8fa06a3e5f13df93b0acad00ae2294
 SHA512:
-  metadata.gz: fb22c2473633590d0c8f760b2a8dd178d19646e6ff9193b79f7536c0bbe9e3f2c16e3a860b9de66938d13279a1bcd0a3855b9593ff48ac5662ce10c9bc071c6c
-  data.tar.gz: 73fe0f22b150696c145d28eb4343145f033643ec7259f6865f6b725e2c052880e1905c28b78ea860858da58bb5d0753b96a16fa358e9a7cd2319b3376de27f4f
+  metadata.gz: af19792212cf56eca8d34915d3e849c66caeed14d102ac46a0a85131b1a8236d97c69636387f5b00e6273c5c19e395a98957dd1a5ae80b10dd659ccda099a762
+  data.tar.gz: 93bce0e798090fe6aba7a85861d262bdf95692a112a22359b82058aba9f153665cdb66a245aa3990530745e122a7d21bb62a828509b6b4ab62163de5a63b8a5c

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

@@ -19,6 +19,12 @@ module Cats
         render json: {success: true, data: serialize(query.result)}
       end
 
+      def filter_location_by_region
+        descendants = Location.find(params[:id]).descendants
+        query = descendants.ransack(params[:q])
+        render json: {success: true, data: serialize(query.result)}
+      end
+
       def woredas
         region = Location.find(params[:id])
         woredas = Location.where(id: region.descendant_ids, location_type: Location::WOREDA)

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

@@ -5,7 +5,7 @@ module Cats
       belongs_to :route
       belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
 
-      validates :price, presence: true, numericality: {greater_than: 0}
+      validates :price, :quantity, presence: true, numericality: {greater_than: 0}
 
       delegate(:name, to: :route, prefix: true)
       delegate(:contract_no, to: :transport_contract, prefix: false)

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

@@ -4,7 +4,7 @@ module Cats
       belongs_to :transport_offer
       belongs_to :transport_bid_item
 
-      validates :price, presence: true, numericality: {greater_than_or_equal_to: 0}
+      validates :price, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
       validates :rank, numericality: {greater_than: 0}, allow_nil: true
       validate :validate_rank_is_set_for_winner
 

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

@@ -7,6 +7,7 @@ module Cats
 
       belongs_to :transporter
       belongs_to :transport_bid
+      belongs_to :region, class_name: "Cats::Core::Location"
       has_many :contract_items
 
       validates :contract_no, presence: true, uniqueness: true
@@ -15,6 +16,7 @@ module Cats
 
       delegate(:name, to: :transporter, prefix: true)
       delegate(:reference_no, to: :transport_bid, prefix: :bid)
+      delegate(:name, to: :region, prefix: true, allow_nil: true)
     end
   end
 end

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

@@ -7,7 +7,8 @@ module Cats
 
       ACTIVE = "Active".freeze
       CANCELLED = "Cancelled".freeze
-      ORDER_STATUSES = [ACTIVE, CANCELLED].freeze
+      EXPIRED = "Expired".freeze
+      ORDER_STATUSES = [ACTIVE, CANCELLED, EXPIRED].freeze
 
       belongs_to :transport_requisition
       belongs_to :prepared_by, class_name: "Cats::Core::User"

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

@@ -3,8 +3,9 @@ module Cats
     class TransportOrderItem < ApplicationRecord
       ACTIVE = "Active".freeze
       CANCELLED = "Cancelled".freeze
+      EXPIRED = "Expired".freeze
 
-      ORDER_ITEM_STATUSES = [ACTIVE, CANCELLED].freeze
+      ORDER_ITEM_STATUSES = [ACTIVE, CANCELLED, EXPIRED].freeze
       belongs_to :transport_order
       belongs_to :transporter
       belongs_to :transport_requisition_item
@@ -12,8 +13,8 @@ module Cats
       belongs_to :unit, class_name: "Cats::Core::UnitOfMeasure"
       belongs_to :route
 
-      validates :valid_for, :quantity, presence: true
-      validates :valid_for, numericality: {greater_than: 0}
+      validates :valid_for, :quantity, :price, presence: true
+      validates :valid_for, :price, numericality: {greater_than: 0}
       validates :status, presence: true, inclusion: {in: ORDER_ITEM_STATUSES}
       validates :transport_requisition_item_id, uniqueness: true
       validate :validate_requisition
@@ -22,6 +23,12 @@ module Cats
       delegate(:name, to: :route, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
       delegate(:contract_no, to: :transport_contract, prefix: false, allow_nil: true)
+      delegate(:region, to: :transport_requisition_item, allow_nil: true, prefix: "req_item")
+      delegate(:zone, to: :transport_requisition_item, allow_nil: true, prefix: "req_item")
+      delegate(:woreda, to: :transport_requisition_item, allow_nil: true, prefix: "req_item")
+      delegate(:fdp, to: :transport_requisition_item, allow_nil: true, prefix: "req_item")
+      delegate(:commodity_name, to: :transport_requisition_item, allow_nil: true)
+      delegate(:plan_item_reference_no, to: :transport_requisition_item, allow_nil: true)
 
       def validate_requisition
         return unless transport_requisition_item

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

@@ -10,6 +10,7 @@ module Cats
       delegate(:reference_no, to: :transport_requisition, prefix: "requisition")
       delegate(:abbreviation, to: :unit, prefix: true)
       delegate(:source_name, to: :dispatch_plan_item, prefix: false)
+      delegate(:reference_no, to: :dispatch_plan_item, prefix: "plan_item")
 
       def commodity_name
         dispatch_plan_item.commodity.name

data/config/routes.rb

@@ -46,6 +46,7 @@ Cats::Core::Engine.routes.draw do
   resources :locations, except: %i[destroy] do
     member do
       get "children"
+      post "filter_location_by_region"
     end
   end
 

data/db/migrate/20240304080545_add_region_and_quantity_to_contract.rb

@@ -0,0 +1,10 @@
+class AddRegionAndQuantityToContract < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cats_core_contract_items, :quantity, :float
+    add_column :cats_core_transport_contracts, :region_id, :integer
+    add_foreign_key :cats_core_transport_contracts,
+                    :cats_core_locations,
+                    column: :region_id, null: false,
+                    index: {name: "region_on_trans_cont_indx"}
+  end
+end

data/db/migrate/20240304145823_add_price_to_order_item.rb

@@ -0,0 +1,17 @@
+class AddPriceToOrderItem < ActiveRecord::Migration[7.0]
+  def up
+    add_column :cats_core_transport_order_items, :price, :float, null: true
+    change_column :cats_core_offer_items, :price, :float, null: true
+    add_column :cats_core_transport_orders, :requested_dispatch_date, :date
+    add_column :cats_core_transport_orders, :order_expiry_date, :date
+    add_column :cats_core_transport_orders, :performance_bond_receipt, :string
+  end
+
+  def down
+    remove_column :cats_core_transport_order_items, :price
+    change_column :cats_core_offer_items, :price, :float, null: true
+    remove_column :cats_core_transport_orders, :requested_dispatch_date
+    remove_column :cats_core_transport_orders, :order_expiry_date
+    remove_column :cats_core_transport_orders, :performance_bond_receipt
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = "1.5.30".freeze
+    VERSION = "1.5.31".freeze
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     transport_contract
     route
     price { 150 }
+    quantity { 100 }
     unit factory: :unit_of_measure
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     contract_no { FFaker::Name.name }
     transporter
     transport_bid
+    region factory: :location
     contract_date { Date.today }
     expires_on { Date.today + 6.month }
     payment_term { FFaker::Name.name }

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     transport_requisition_item { transport_order.transport_requisition.transport_requisition_items.first }
     valid_for { 10 }
     quantity { 12 }
+    price { 100 }
     status { Cats::Core::TransportOrderItem::ACTIVE }
     unit factory: :unit_of_measure
     route

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.30
+  version: 1.5.31
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-01 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -535,6 +535,8 @@ files:
 - db/migrate/20240125051557_add_status_unit_and_quantity_to_transport_order_item.rb
 - db/migrate/20240125051632_add_status_to_transport_order.rb
 - db/migrate/20240125051644_add_status_to_contract.rb
+- db/migrate/20240304080545_add_region_and_quantity_to_contract.rb
+- db/migrate/20240304145823_add_price_to_order_item.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb