cats_core 1.2.12 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d9c981d6dfe00647462832e97d47af7fc677b5e092a5f675366ae1e49ac8dc
-  data.tar.gz: b24adf0ed11330190cfd57050c94ead1f871e183339351d2caebcc2b09597536
+  metadata.gz: 83ed27840275615cce0b4a2fdee9d147a61407eef87df375e9db5e0424d4e923
+  data.tar.gz: 06a77ee55dec5a1d292afeaa225b35629867d85eac43640d5073aab84b657634
 SHA512:
-  metadata.gz: 56857803a15398dadccd2396e3a2d1b4124b392258ecc180f678d70ddca5a3dafa7b222774b34a9b2d93e8d23aa928622de3d78772017020c7c67f7996ede95c
-  data.tar.gz: f7b0c9cdbacfec2c9836a80560b2c93a69281e4be503e850ee433ca64917d1703c4bf83d2d59c668495f93fa4371350e9573569ce87ea5207b45a54a18d8b8ac
+  metadata.gz: f57ac8ebc0d69cb0abc5e0b19a28ae3afd4b3549a72b2fe34469bf63e15bc05067fa101bc378b97f073b5650b66d21516d9ea7998d165e8e5b133d971e08dbfe
+  data.tar.gz: 41f293dd59320cafef958b1d1dcf6b2342e2af1d696e31fb761ff50cf749966e5a993062d23f3e859c32bbb0431cba93c333b7410977be67a33c1bb8575e829a

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/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/transport_offer.rb

@@ -5,8 +5,24 @@ module Cats
       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.rb

@@ -21,6 +21,8 @@ module Cats
       def approve(approver)
         raise(StandardError, 'Request is not open for approval.') unless status == DRAFT
 
+        raise(StandardError, 'Request is empty.') if transport_request_items.count.zero?
+
         self.approved_by = approver
         self.status = APPROVED
         save!

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/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

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/20211209160126_create_cats_core_transport_offers.rb

@@ -10,6 +10,8 @@ class CreateCatsCoreTransportOffers < ActiveRecord::Migration[6.1]
                    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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.12'.freeze
+    VERSION = '1.2.16'.freeze
   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/transport_offers.rb

@@ -3,5 +3,7 @@ FactoryBot.define do
     transport_request_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.12
+  version: 1.2.16
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers