cats_core 1.3.14 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be4eb5f572d4c38a09f3ddfb775497fd81c0c9e3a9053be1f03bfee51730308
-  data.tar.gz: 4bea5f8744afffa22bad84782ba5e40ef433a31b7c11719da8e910d849803d4c
+  metadata.gz: fc65cc9d5534f0889942862e918fa9d6fe936088f6ef65765e21c20575f90734
+  data.tar.gz: 8af0f7892e4cae386db06875ba5d661d5c32fc9aec117bef36c4cdeda7e87200
 SHA512:
-  metadata.gz: f600c4c2170e448936f7860659533d22039b6815a4890cb9d0af81476c12f9ef7d28c5828887c73f146b44caa6b191bc57101f8b78a85521117e8c0b027ac1f3
-  data.tar.gz: 3153dc2e38a2d6f33ac3817ad67250a77a308c8ba3c67d4ced336f6aecea9bc9da64c6b35fc055c77a112f92f1dea5f2e2e618579fe7fe8b1e13e83f83c04838
+  metadata.gz: 9626f4d11a0de742b2110c0d2714fcd8c443b04a231339508b257bf99daa6b0c2f593165b429c035a9c16d9ac3b1e788c371b8203287f71566d857a31a172ed3
+  data.tar.gz: 5667b99d608d740a579cd76337ba7ab2978713af355573425335d034308113065d3a7d7ccb4b7ee60aef3ba14b712148c30eea6c7a22f693455be217f3177790

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

@@ -15,7 +15,8 @@ module Cats
             end
 
             payload = {
-              id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name, roles: roles
+              id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name, roles: roles,
+              details: user.details
             }
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }

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

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

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

@@ -14,13 +14,16 @@ module Cats
       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
+        service = DispatchPlanService.new
+
+        data = service.create(model_params, current_user)
+        if data[0]
+          render json: { success: true, data: serialize(data[1]) }, status: :created
         else
-          render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+          render json: { success: false, error: data[1].errors.full_messages[0] }, status: :unprocessable_entity
         end
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
       end
 
       def approve
@@ -34,7 +37,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :request_id)
+        params.require(:payload).permit(:reference_no, :request_id, :commodity_id)
       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

@@ -8,12 +8,16 @@ module Cats
       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
+      belongs_to :commodity
 
       has_many :dispatch_plan_items
 
       validates :reference_no, presence: true, uniqueness: true
       validates :status, inclusion: { in: STATUSES }
 
+      delegate(:batch_no, :name, :quantity, to: :commodity, prefix: true)
+      delegate(:reference_no, 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,16 +1,16 @@
 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
       has_many :dispatches
 
+      validates :commodity_status, presence: true, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
       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/models/cats/core/rhn_request.rb

@@ -3,7 +3,8 @@ module Cats
     class RhnRequest < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
-      STATUSES = [DRAFT, APPROVED].freeze
+      ALLOCATED = 'Allocated'.freeze
+      STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
 
       belongs_to :commodity
 
@@ -35,6 +36,11 @@ module Cats
         self.status = APPROVED
         save!
       end
+
+      def allocate
+        self.status = ALLOCATED
+        save!
+      end
     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/serializers/cats/core/dispatch_plan_item_serializer.rb

@@ -2,7 +2,7 @@ module Cats
   module Core
     class DispatchPlanItemSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_plan_id, :plan_reference_no, :source_id, :source_name, :destination_id,
-                 :destination_name, :quantity, :source_location_type, :destination_location_type
+                 :destination_name, :quantity, :source_location_type, :destination_location_type, :commodity_status
     end
   end
 end

data/app/serializers/cats/core/dispatch_plan_serializer.rb

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

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

@@ -1,7 +1,27 @@
-class DispatchPlanService
-  def approve(plan)
-    plan.approve
-    send_notification(plan)
-    plan
+module Cats
+  module Core
+    class DispatchPlanService
+      def approve(plan)
+        plan.approve
+        plan.request.allocate if plan.request_id
+        # send_notification(plan)
+        plan
+      end
+
+      def create(params, user)
+        plan = Cats::Core::DispatchPlan.new(params)
+        raise 'Commodity is not assigned for plan.' unless plan.commodity_id || plan.request_id
+
+        unless plan.commodity_id
+          request = Cats::Core::RhnRequest.find(plan.request_id)
+          plan.commodity_id = request.commodity_id
+          plan.request_type = 'Cats::Core::RhnRequest'
+        end
+        plan.prepared_by = user
+        result = plan.save
+
+        [result, plan]
+      end
+    end
   end
 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/20210718043328_create_cats_core_dispatch_plans.rb

@@ -6,6 +6,10 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.string :status, null: false, default: 'Draft'
       t.references :request, polymorphic: true
       t.boolean :upstream, null: false, default: false
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'commodity_on_dp_indx' },
+                   foreign_key: { to_table: :cats_core_commodities }
 
       t.references :prepared_by,
                    null: false,

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' },
@@ -18,6 +14,7 @@ class CreateCatsCoreDispatchPlanItems < ActiveRecord::Migration[6.1]
                    index: { name: 'dpi_on_destination_indx'},
                    foreign_key: { to_table: :cats_core_locations }
       t.float :quantity, null: false
+      t.string :commodity_status, null: false, default: 'Good'
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.14'.freeze
+    VERSION = '1.3.19'.freeze
   end
 end

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

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
-    commodity
     source factory: :location
     destination factory: :location
     dispatch_plan
     quantity { 100 }
+    commodity_status { Cats::Core::Commodity::GOOD }
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     status { Cats::Core::DispatchPlan::DRAFT }
     request { nil }
     upstream { false }
+    commodity
     prepared_by factory: :user
     approved_by { nil }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.19
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-16 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