cats_core 1.3.16 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ad7f2aaa0c106926140445109463f49c20ef3c4d7336de19a4f99abe4152b48
-  data.tar.gz: ffb46327fe5ab23994d9ada4ab2d8cbdcfba90f7f44436a8f95b87bb8e9fc21d
+  metadata.gz: 9e298fc271839d6ddb95ce6fc876b1b6438e31fb15c94049ffc6e36431670330
+  data.tar.gz: 3a8d54022afad56f01b5be2433cbcf28154cf8a7ba7eee5390a3c3265d139037
 SHA512:
-  metadata.gz: e7ec684441796002b858da2a27ae38eecc14dea715682ea44f361434af24324236ddcd1ecd178dca5b9f44e99442341b6a667e43a0de9afafe12f37b21619628
-  data.tar.gz: 8887e74996a6a483da128576e049b630d20c0deb097d6e309a96be5421e11794b4e2033b8a25ee26f08fcb8de40e0a9e592336f4b97b79a1e71461364c0215bd
+  metadata.gz: 7cc8eb81b7edd12b5676d45c67b84d16fd8cb869cf5ad515736a3584a8c3dd4bf8274e3364c35b4bced831e9c0e94edcb124cfb1bfc22c551db36fd4c0f16456
+  data.tar.gz: 2e9555de096c8a8c22295ff8ef0247de401a2906862800fa31b8e1f4f49dbdb2cac88751941f84d28a4217390bdcd3698790ade35d4fab75eea6e09fd79544c6

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/models/cats/core/monthly_plan_item.rb

@@ -7,6 +7,8 @@ module Cats
       has_many :monthly_plan_item_details
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:reference_no, to: :monthly_plan, prefix: 'plan')
     end
   end
 end

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.16'.freeze
+    VERSION = '1.3.20'.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.16
+  version: 1.3.20
 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