cats_core 1.3.17 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e94853a5eeb64254a1aea6d8fac50f41a2e64501a8c8bea4ee933e27601437
-  data.tar.gz: da74f7e6aa2b19108804cfe3f8a266847bc1d91299cc92fa54e746ae01c541d1
+  metadata.gz: 551532d2140d05f61a268ef27a1e2b8b9a7abb9f084dc808f161962d7f319b19
+  data.tar.gz: 78e9e7fd69241d39c84542d5160041df4ab2c697c60ea6cd9cd719182d7de43c
 SHA512:
-  metadata.gz: 3f9b95fb8c0897a122eda69aafab63102a08317004b7e3b6500e3a3545c71d0ded6177e1ba761225b1dfac86735618405e5796666477e256e0f9fb887f5eda1b
-  data.tar.gz: 33c9cee86d027666238e7d53cd93e3d209efbee762d4238b8d0585e0ae7c0f67d0fffa0b5a78f628767a81b774102d1c73e47499421057e33e02e2c656c54905
+  metadata.gz: a48bca9d45e6cfc5ea41bd5657d8142aafde2cc8fb3da40d37f2ba1a306bf98c3b6f403a15996579c5f4fb0b73d26aee6f92a6ffa30696f5f61f4dec5fa6f13c
+  data.tar.gz: ac88009a158bd3596389611e60e558eaf6bc1f99f7686955b7ae1e1987376d153bd7a21f0c67ae6bfec474907f7a0748f8a5b2636bfbbbb7fe271c0db2d83ba8

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

@@ -11,8 +11,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_id,
-                                        :commodity_status)
+        params.require(:payload).permit(:dispatch_plan_id, :source_id, :destination_id, :quantity, :commodity_status)
       end
     end
   end

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

@@ -57,7 +57,7 @@ module Cats
       end
 
       def commodity
-        data = @dispatch.dispatch_plan_item.commodity
+        data = @dispatch.dispatch_plan_item.dispatch_plan.commodity
         render json: { success: true, data: serialize(data) }
       end
 

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

@@ -15,9 +15,7 @@ module Cats
       validates :reference_no, presence: true, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
 
-      delegate(:batch_no, to: :commodity, prefix: true)
-      delegate(:name, to: :commodity, prefix: true)
-      delegate(:quantity, to: :commodity, prefix: true)
+      delegate(:batch_no, :name, :quantity, to: :commodity, prefix: true)
       delegate(:reference_no, to: :request, prefix: true, allow_nil: true)
 
       def approve

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

@@ -1,7 +1,6 @@
 module Cats
   module Core
     class DispatchPlanItem < ApplicationRecord
-      belongs_to :commodity
       belongs_to :source, class_name: 'Cats::Core::Location'
       belongs_to :destination, class_name: 'Cats::Core::Location'
       belongs_to :dispatch_plan
@@ -11,7 +10,7 @@ module Cats
       validates :quantity, presence: true, numericality: { greater_than: 0 }
 
       delegate(:reference_no, to: :dispatch_plan, prefix: :plan, allow_nil: true)
-      delegate(:batch_no, to: :commodity, prefix: true)
+      delegate(:commodity_batch_no, :commodity_name, to: :dispatch_plan)
       delegate(:name, to: :source, prefix: true)
       delegate(:name, to: :destination, prefix: true)
       delegate(:location_type, to: :source, prefix: true)

data/app/notifications/cats/core/dispatch_notification.rb

@@ -7,7 +7,7 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        commodity = dispatch.dispatch_plan_item.commodity
+        commodity = dispatch.dispatch_plan_item.dispatch_plan.commodity
         title = "Dispatch Notification - #{commodity.name}"
         date = Date.today
         body = <<~BODY

data/app/services/cats/core/dispatch_plan_service.rb

@@ -3,7 +3,8 @@ module Cats
     class DispatchPlanService
       def approve(plan)
         plan.approve
-        send_notification(plan)
+        plan.request.allocate if plan.request_id
+        # send_notification(plan)
         plan
       end
 
@@ -18,7 +19,6 @@ module Cats
         end
         plan.prepared_by = user
         result = plan.save
-        plan.request.allocate if result && plan.request_id
 
         [result, plan]
       end

data/app/services/cats/core/dispatch_service.rb

@@ -10,7 +10,7 @@ module Cats
         store = Cats::Core::Store.find_by(code: 'SUP-STORE')
         raise(StandardError, 'Supplier store does not exist.') unless store
 
-        commodity = plan_item.commodity
+        commodity = plan_item.dispatch_plan.commodity
         stack = store.stacks.find_by(commodity: commodity)
 
         raise(StandardError, 'Commodity not found in supplier store.') unless stack

data/db/migrate/20210718043401_create_cats_core_dispatch_plan_items.rb

@@ -5,10 +5,6 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'dpi_on_dp_indx' },
                    foreign_key: { to_table: :cats_core_dispatch_plans }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'dpi_on_commodity_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
       t.references :source,
                    null: false,
                    index: { name: 'dpi_on_source_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.17'.freeze
+    VERSION = '1.3.18'.freeze
   end
 end

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

@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
-    commodity
     source factory: :location
     destination factory: :location
     dispatch_plan

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.18
 platform: ruby
 authors:
 - Henock L.