cats_core 1.3.17 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e94853a5eeb64254a1aea6d8fac50f41a2e64501a8c8bea4ee933e27601437
-  data.tar.gz: da74f7e6aa2b19108804cfe3f8a266847bc1d91299cc92fa54e746ae01c541d1
+  metadata.gz: 0a7dd0f8561b7aac9cc018cc285e35b9434f6877e8b47e5c4ac36e80b3820d21
+  data.tar.gz: '056178c96d8b513d75fa9e2229f459e22b20363d47d1c88b3099695c0c3f5b4a'
 SHA512:
-  metadata.gz: 3f9b95fb8c0897a122eda69aafab63102a08317004b7e3b6500e3a3545c71d0ded6177e1ba761225b1dfac86735618405e5796666477e256e0f9fb887f5eda1b
-  data.tar.gz: 33c9cee86d027666238e7d53cd93e3d209efbee762d4238b8d0585e0ae7c0f67d0fffa0b5a78f628767a81b774102d1c73e47499421057e33e02e2c656c54905
+  metadata.gz: c87cd77d1e17fe455d6a81d9a71c55768e806a1f9f9875694bb27e8026491b0410c131ec1e16509e148e1dafeea37884c3f60aef569875a1483357d375d93ff0
+  data.tar.gz: d90ec462825c52a2372a0311cfdcc875cb5d8768c67b7c98d788ad6755ab87ce3a9c39ad91fe64bcb7ca7d950b63385d60587a733e2ce1b3997dd7018f79a6d3

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,10 +15,9 @@ 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)
+      delegate(:quantity, to: :request, prefix: true, allow_nil: true)
 
       def approve
         raise(StandardError, 'Dispatch plan already approved.') if status == APPROVED

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/serializers/cats/core/dispatch_plan_serializer.rb

@@ -2,7 +2,7 @@ module Cats
   module Core
     class DispatchPlanSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :status, :request_id, :commodity_id, :commodity_name, :commodity_batch_no,
-                 :commodity_quantity, :request_reference_no, :upstream
+                 :commodity_quantity, :request_reference_no, :request_quantity, :upstream
     end
   end
 end

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.21'.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.21
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
@@ -470,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Core module for CATS applications