cats_core 1.2.13 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6029b1cb0b5451bb6ca657e53b8fd719bff7ca250bbf24f59620b645666b7411
-  data.tar.gz: 5dbc6423c4779a589adcd093aa093bd235ba36165c9fd44ae2a28baeeafdc88b
+  metadata.gz: d7fad29c6363b9f97a6cdf998aa0af3319adb3484d6c12ac363bd17058de3d0e
+  data.tar.gz: 31efe7250a22930a60ad18ee7913530ef5c387b4f743e1f606fa91ab764b620d
 SHA512:
-  metadata.gz: 8ca3add5b0ade02757372eda5c4c1462f3146080071e8d2bfd01cb782c032666dc1965100bfda15b5537b5f11ce3378ae8071e488eaa9be8e1dd93672cbea059
-  data.tar.gz: 5774042cf7bc5d3e518b569a1ad18055596d018b21331555e4cdc6dedc752633b682afaa9691fdaa3794196e677e890272b196076abdf2fa9a6247325a78bc7b
+  metadata.gz: ff6fa84f59e57e8e7ffe5bfa0e1c6028ecad74a36b98cdff4b189a08fcd367a7c565bd0b7e987a76753df9516d74ba163050ee024cf7659ff0ee98bfc40105bf
+  data.tar.gz: 0672a380f2afef89c0ca904e27415c4286b36b13c844bcc6d7e5ac93cc767cd7fe225824a9c9116613a4601ac6dce1cbf777ac640832565311ff4ac511f34b71

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

@@ -3,11 +3,26 @@ module Cats
     class DispatchPlansController < ApplicationController
       include Common
 
+      def plans_for_user
+        plans = Cats::Core::DispatchPlan.where(prepared_by: current_user)
+        render json: { success: true, data: serialize(plans) }
+      end
+
       def filter
         query = Cats::Core::DispatchPlan.ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
+      def create
+        obj = Cats::Core::DispatchPlan.new(model_params)
+        obj.prepared_by = current_user
+        if obj.save
+          render json: { success: true, data: serialize(obj) }, status: :created
+        else
+          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       def approve
         plan = Cats::Core::DispatchPlan.find(params[:id])
         plan.approve

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class RoutesController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:source_id, :destination_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class ContractItem < ApplicationRecord
+      belongs_to :transport_contract
+      belongs_to :route
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
+
+      validates :price, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :route, prefix: true)
+    end
+  end
+end

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

@@ -6,6 +6,9 @@ module Cats
       STATUSES = [DRAFT, APPROVED].freeze
 
       belongs_to :request, polymorphic: true, optional: true
+      belongs_to :prepared_by, class_name: 'Cats::Core::User'
+      belongs_to :approved_by, class_name: 'Cats::Core::User', optional: true
+
       has_many :dispatch_plan_items
 
       validates :reference_no, presence: true, uniqueness: true

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

@@ -0,0 +1,18 @@
+module Cats
+  module Core
+    class Route < ApplicationRecord
+      before_validation :set_name, on: %i[create update]
+
+      belongs_to :source, class_name: 'Cats::Core::Location'
+      belongs_to :destination, class_name: 'Cats::Core::Location'
+
+      validates :source_id, uniqueness: { scope: :destination_id }
+
+      def set_name
+        return unless source && destination
+
+        self.name = "#{source.name} - #{destination.name}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Cats
+  module Core
+    class TransportBid < ApplicationRecord
+      NEW = 'New'.freeze
+      OPEN = 'Open'.freeze
+      CLOSED = 'Closed'.freeze
+      STATUSES = [NEW, OPEN, CLOSED].freeze
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :start_date, :end_date, :status, presence: true
+      validates :status, inclusion: { in: STATUSES }
+      validate :validate_start_date_against_end_date
+
+      def validate_start_date_against_end_date
+        return unless start_date && end_date
+
+        errors.add(:start_date, 'should be before end date.') if start_date >= end_date
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Cats
+  module Core
+    class TransportBidItem < ApplicationRecord
+      belongs_to :transport_bid
+      belongs_to :route
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure', optional: true
+
+      has_many :transport_offers
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :route, prefix: true)
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Cats
+  module Core
+    class TransportContract < ApplicationRecord
+      belongs_to :region, class_name: 'Cats::Core::Location'
+      belongs_to :transporter
+
+      validates :contract_date, :expires_on, presence: true
+    end
+  end
+end

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

@@ -1,12 +1,28 @@
 module Cats
   module Core
     class TransportOffer < ApplicationRecord
-      belongs_to :transport_request_item
+      belongs_to :transport_bid_item
       belongs_to :transporter
 
       validates :price, presence: true, numericality: { greater_than: 0 }
+      validates :rank, numericality: { greater_than: 0 }, allow_nil: true
+      validate :validate_rank_is_set_for_winner
 
       delegate(:name, to: :transporter, prefix: true)
+
+      def mark_as_winner(rank)
+        raise(StandardError, 'Offer already marked as winner.') if winner
+
+        self.rank = rank
+        self.winner = true
+        save!
+      end
+
+      def validate_rank_is_set_for_winner
+        return if rank
+
+        errors.add(:winner, 'cannot be set for a non-ranked offer.') if winner
+      end
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Cats
       belongs_to :destination, class_name: 'Cats::Core::Location'
       belongs_to :commodity
 
+      has_many :transport_offers
+
       delegate(:name, to: :source, prefix: true)
       delegate(:name, to: :destination, prefix: true)
       delegate(:name, to: :commodity, prefix: true)

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

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class RouteSerializer < ActiveModel::Serializer
+      attributes :id, :name, :source_id, :destination_id
+    end
+  end
+end

data/config/routes.rb

@@ -33,6 +33,7 @@ Cats::Core::Engine.routes.draw do
       get 'stores', controller: :users, action: :stores
       get 'warehouse', controller: :users, action: :warehouse
       get 'hub', controller: :users, action: :hub
+      get 'plans', controller: :dispatch_plans, action: :plans_for_user
       post 'assign_role'
       post 'revoke_role'
     end
@@ -65,6 +66,7 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+  resources :routes, except: %i[destroy]
 
   post '/dispatch_plans/filter', controller: :dispatch_plans, action: :filter
   resources :dispatch_plans do

data/db/migrate/20210718040129_create_cats_core_routes.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreRoutes < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_routes do |t|
+      t.string :name, null: false
+      t.references :source,
+                   null: false,
+                   index: { name: 'source_on_routes_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'destination_on_routes_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+
+      t.timestamps
+
+      t.index [:source_id, :destination_id], unique: true
+    end
+  end
+end

data/db/migrate/20210718043328_create_cats_core_dispatch_plans.rb

@@ -7,6 +7,15 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.references :request, polymorphic: true
       t.boolean :upstream, null: false, default: false
 
+      t.references :prepared_by,
+                   null: false,
+                   index: { name: 'pb_on_dp_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+      t.references :approved_by,
+                   null: true,
+                   index: { name: 'ab_on_dp_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+
       t.timestamps
     end
   end

data/db/migrate/20211215121151_create_cats_core_transport_bids.rb

@@ -0,0 +1,13 @@
+class CreateCatsCoreTransportBids < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_bids do |t|
+      t.string :reference_no, unique: true
+      t.string :description
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.string :status, null: false, default: 'New'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211215124452_create_cats_core_transport_bid_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreTransportBidItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_bid_items do |t|
+      t.references :transport_bid,
+                   null: false,
+                   index: { name: 'tb_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bids }
+      t.references :route,
+                   null: false,
+                   index: { name: 'route_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_routes }
+      t.references :unit,
+                   null: true,
+                   index: { name: 'unit_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.float :quantity, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/{20211209160126_create_cats_core_transport_offers.rb → 20211229160126_create_cats_core_transport_offers.rb}

@@ -1,15 +1,17 @@
 class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_transport_offers do |t|
-      t.references :transport_request_item,
+      t.references :transport_bid_item,
                    null: false,
-                   index: { name: 'to_on_tri_indx' },
-                   foreign_key: { to_table: :cats_core_transport_request_items }
+                   index: { name: 'to_on_tbi_indx' },
+                   foreign_key: { to_table: :cats_core_transport_bid_items }
       t.references :transporter,
                    null: false,
                    index: { name: 'to_on_transporter_indx' },
                    foreign_key: { to_table: :cats_core_transporters }
       t.float :price, null: false
+      t.boolean :winner, null: false, default: false
+      t.integer :rank
 
       t.timestamps
     end

data/db/migrate/20211229160127_create_cats_core_transport_contracts.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreTransportContracts < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_transport_contracts do |t|
+      t.references :region,
+                   null: false,
+                   index: { name: 'region_on_tc_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.references :transporter,
+                   null: false,
+                   index: { name: 'transporter_on_tc_indx' },
+                   foreign_key: { to_table: :cats_core_transporters }
+      t.date :contract_date, null: false
+      t.date :expires_on, null: false
+      t.string :payment_term
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211229160128_create_cats_core_contract_items.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreContractItems < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_contract_items do |t|
+      t.references :transport_contract,
+                   null: false,
+                   index: { name: 'tc_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_transport_contracts }
+      t.references :route,
+                   null: false,
+                   index: { name: 'route_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_routes }
+      t.float :price, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_ci_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.13'.freeze
+    VERSION = '1.2.17'.freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :contract_item, class: 'Cats::Core::ContractItem' do
+    transport_contract
+    route
+    price { 150 }
+    unit factory: :unit_of_measure
+  end
+end

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

@@ -4,5 +4,7 @@ FactoryBot.define do
     status { Cats::Core::DispatchPlan::DRAFT }
     request { nil }
     upstream { false }
+    prepared_by factory: :user
+    approved_by { nil }
   end
 end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :route, class: 'Cats::Core::Route' do
+    source factory: :location
+    destination factory: :location
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_bid_item, class: 'Cats::Core::TransportBidItem' do
+    transport_bid
+    route
+    unit factory: :unit_of_measure
+    quantity { 100 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transport_bid, class: 'Cats::Core::TransportBid' do
+    reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
+    start_date { Date.today - 1.week }
+    end_date { Date.today }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :transport_contract, class: 'Cats::Core::TransportContract' do
+    region factory: :location
+    transporter
+    contract_date { Date.today }
+    expires_on { Date.today + 6.month }
+    payment_term { FFaker::Name.name }
+  end
+end

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

@@ -1,7 +1,9 @@
 FactoryBot.define do
   factory :transport_offer, class: 'Cats::Core::TransportOffer' do
-    transport_request_item
+    transport_bid_item
     transporter
     price { 100 }
+    winner { false }
+    rank { nil }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.17
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -244,6 +244,7 @@ files:
 - app/controllers/cats/core/receipt_transactions_controller.rb
 - app/controllers/cats/core/receipts_controller.rb
 - app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
@@ -255,6 +256,7 @@ files:
 - app/models/cats/core/application_record.rb
 - app/models/cats/core/commodity.rb
 - app/models/cats/core/commodity_category.rb
+- app/models/cats/core/contract_item.rb
 - app/models/cats/core/currency.rb
 - app/models/cats/core/dispatch.rb
 - app/models/cats/core/dispatch_plan.rb
@@ -281,12 +283,16 @@ files:
 - app/models/cats/core/rhn_request.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
+- app/models/cats/core/route.rb
 - app/models/cats/core/stack.rb
 - app/models/cats/core/stack_transaction.rb
 - app/models/cats/core/stacking_rule.rb
 - app/models/cats/core/store.rb
 - app/models/cats/core/supplier.rb
 - app/models/cats/core/transaction.rb
+- app/models/cats/core/transport_bid.rb
+- app/models/cats/core/transport_bid_item.rb
+- app/models/cats/core/transport_contract.rb
 - app/models/cats/core/transport_offer.rb
 - app/models/cats/core/transport_request.rb
 - app/models/cats/core/transport_request_item.rb
@@ -308,6 +314,7 @@ files:
 - app/serializers/cats/core/receipt_transaction_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/role_serializer.rb
+- app/serializers/cats/core/route_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
@@ -343,6 +350,7 @@ files:
 - db/migrate/20210717033223_create_cats_core_commodities.rb
 - db/migrate/20210717140855_create_cats_core_stores.rb
 - db/migrate/20210717171101_create_cats_core_stacks.rb
+- db/migrate/20210718040129_create_cats_core_routes.rb
 - db/migrate/20210718042749_create_cats_core_transporters.rb
 - db/migrate/20210718042755_create_cats_core_rhn_requests.rb
 - db/migrate/20210718042823_create_cats_core_allocations.rb
@@ -359,9 +367,11 @@ files:
 - db/migrate/20211002050739_create_cats_core_notification_rules.rb
 - db/migrate/20211024063240_add_status_to_cats_core_rhn_requests.rb
 - db/migrate/20211030133752_add_status_to_cats_core_commodities.rb
-- db/migrate/20211209155113_create_cats_core_transport_requests.rb
-- db/migrate/20211209155915_create_cats_core_transport_request_items.rb
-- db/migrate/20211209160126_create_cats_core_transport_offers.rb
+- db/migrate/20211215121151_create_cats_core_transport_bids.rb
+- db/migrate/20211215124452_create_cats_core_transport_bid_items.rb
+- db/migrate/20211229160126_create_cats_core_transport_offers.rb
+- db/migrate/20211229160127_create_cats_core_transport_contracts.rb
+- db/migrate/20211229160128_create_cats_core_contract_items.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -372,6 +382,7 @@ files:
 - spec/factories/cats/core/application_modules.rb
 - spec/factories/cats/core/commodities.rb
 - spec/factories/cats/core/commodity_categories.rb
+- spec/factories/cats/core/contract_items.rb
 - spec/factories/cats/core/currencies.rb
 - spec/factories/cats/core/dispatch_plan_items.rb
 - spec/factories/cats/core/dispatch_plans.rb
@@ -398,14 +409,16 @@ files:
 - spec/factories/cats/core/rhn_requests.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb
+- spec/factories/cats/core/routes.rb
 - spec/factories/cats/core/stack_transactions.rb
 - spec/factories/cats/core/stacking_rules.rb
 - spec/factories/cats/core/stacks.rb
 - spec/factories/cats/core/stores.rb
 - spec/factories/cats/core/suppliers.rb
+- spec/factories/cats/core/transport_bid_items.rb
+- spec/factories/cats/core/transport_bids.rb
+- spec/factories/cats/core/transport_contracts.rb
 - spec/factories/cats/core/transport_offers.rb
-- spec/factories/cats/core/transport_request_items.rb
-- spec/factories/cats/core/transport_requests.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb

data/db/migrate/20211209155113_create_cats_core_transport_requests.rb

@@ -1,19 +0,0 @@
-class CreateCatsCoreTransportRequests < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_transport_requests do |t|
-      t.string :reference_no, unique: true
-      t.date :request_date, null: false
-      t.string :status, null: false, default: 'Draft'
-      t.references :requested_by,
-                   null: false,
-                   index: { name: 'tsr_on_rb_indx' },
-                   foreign_key: { to_table: :cats_core_users }
-      t.references :approved_by,
-                   null: true,
-                   index: { name: 'tsr_on_ab_indx' },
-                   foreign_key: { to_table: :cats_core_users }
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20211209155915_create_cats_core_transport_request_items.rb

@@ -1,24 +0,0 @@
-class CreateCatsCoreTransportRequestItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_transport_request_items do |t|
-      t.references :transport_request,
-                   null: false,
-                   index: { name: 'tri_on_tr_indx' },
-                   foreign_key: { to_table: :cats_core_transport_requests }
-      t.references :source,
-                   null: false,
-                   index: { name: 'tri_on_source_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.references :destination,
-                   null: false,
-                   index: { name: 'tri_on_destination_indx'},
-                   foreign_key: { to_table: :cats_core_locations }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'tri_on_commodity_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transport_request_item, class: 'Cats::Core::TransportRequestItem' do
-    transport_request
-    source factory: :location
-    destination factory: :location
-    commodity
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transport_request, class: 'Cats::Core::TransportRequest' do
-    reference_no { FFaker::Name.name }
-    request_date { Date.today }
-    requested_by factory: :user
-    approved_by factory: :user
-  end
-end