cats_core 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0259f4a23c09b64cad9bc0f1c1488eb6671590d9cb0b159943a9420644137f18'
-  data.tar.gz: 16af2ac84725a7fc0ce5fe87e485d6dbae46bca0d3b8f290a219175ff8c14a5c
+  metadata.gz: 83ed27840275615cce0b4a2fdee9d147a61407eef87df375e9db5e0424d4e923
+  data.tar.gz: 06a77ee55dec5a1d292afeaa225b35629867d85eac43640d5073aab84b657634
 SHA512:
-  metadata.gz: dc637444ec8abe5e3f00b3b540915d49458edf3b460658209d4ec95ac5db30a7ed070673dbbe40d9476be8c626cf503b86dac8d456f7d000a44928f1955bfd3a
-  data.tar.gz: 489b67dc9d9709d2d0bf93d653662eafb40faddff1659f5a7af122008cf0dd05a0270d89d2f4d29a1f44eb1efd15238085c994908c21f1c14767d067e556815d
+  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

@@ -6,7 +6,7 @@ module Cats
 
       validates :price, presence: true, numericality: { greater_than: 0 }
       validates :rank, numericality: { greater_than: 0 }, allow_nil: true
-      validate :validate_winner_is_set_for_rank
+      validate :validate_rank_is_set_for_winner
 
       delegate(:name, to: :transporter, prefix: true)
 
@@ -18,10 +18,10 @@ module Cats
         save!
       end
 
-      def validate_winner_is_set_for_rank
-        return if winner
+      def validate_rank_is_set_for_winner
+        return if rank
 
-        errors.add(:rank, 'cannot be set for a non-winning offer.') if rank
+        errors.add(:winner, 'cannot be set for a non-ranked offer.') if winner
       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

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/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.2.15'.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.2.16
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers