cats_core 1.3.22 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e19b31050b332057df303229d63b57fe37df4608769e70684b9d3f7a35492ec
-  data.tar.gz: 1254bcbeb26ea89e70f710bdb4429f1e02a3cd80bb913c0ec9f7be5d1f3df42d
+  metadata.gz: 2f481bcc7803014db0c3db658b15064be22767d067276c5c89dbf783ae38b3af
+  data.tar.gz: 316ad648dcbb23aa8615354922c83c0aa287f6a66f5520fe2bf50ba42d757295
 SHA512:
-  metadata.gz: 54d98fda12c17f62461414a08f301e2f7b0b6ed5857ff9841cf12c0a03e53b0fa8bf0040bbc389bed789ea5d043fd9d5e401e50a567a9d9b88b8db19ffe3c59a
-  data.tar.gz: c25d388617ea0f3a694e7b03d5985b9d1fd87ee7a9a08394109ec9eaefd33d0854d70bdcbefbaf99d3713332d071a7be674cd8003327709d6312e923115055d2
+  metadata.gz: 1d4ea070ce7b41661c532d8e5f6b7d9f499ac7d566698681e603c331aef729d2341b70d16df730f5d8d9f0bd947e8c391afe40244de26af2c1428a407a043076
+  data.tar.gz: ee48e5c321a596e34cd9215dfe8b8219e67cbd9c9e8e392dc620a94e68b5220e04795a65267c24063f40b90a5f30f913acab6b82b5770a2b49c649e0719d8cb5

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

@@ -15,15 +15,10 @@ module Cats
 
       def create
         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: data[1].errors.full_messages[0] }, status: :unprocessable_entity
-        end
+        plan = service.create(model_params, current_user)
+        render json: { success: true, data: serialize(plan) }, status: :created
       rescue StandardError => e
-        render json: { success: false, error: e.message }
+        render json: { success: false, error: e.message }, status: :unprocessable_entity
       end
 
       def approve
@@ -37,7 +32,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :request_id, :commodity_id)
+        params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type, :commodity_id)
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module Cats
+  module Core
+    class TransportersController < ApplicationController
+      include Cats::Core::Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:code, :name, :address, :contact_phone)
+      end
+    end
+  end
+end

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

@@ -14,9 +14,19 @@ module Cats
 
       # Arrival Statuses
       AT_SOURCE = 'At Source'.freeze
-      IN_TRANSIT = 'In Transit'.freeze
+      AT_ORIGIN_PORT = 'At Origin Port'.freeze
+      IN_LOCAL_TRANSIT = 'In Local Transit'.freeze
+      IN_INTERNATIONAL_TRANSIT = 'In International Transit'.freeze
+      AT_DESTINATION_PORT = 'At Destination Port'.freeze
       ARRIVED = 'Arrived'.freeze
-      ARRIVAL_STATUSES = [AT_SOURCE, IN_TRANSIT, ARRIVED].freeze
+      ARRIVAL_STATUSES = [
+        AT_SOURCE,
+        AT_ORIGIN_PORT,
+        IN_LOCAL_TRANSIT,
+        IN_INTERNATIONAL_TRANSIT,
+        AT_DESTINATION_PORT,
+        ARRIVED
+      ].freeze
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true

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

@@ -5,7 +5,7 @@ module Cats
       APPROVED = 'Approved'.freeze
       STATUSES = [DRAFT, APPROVED].freeze
 
-      belongs_to :request, polymorphic: true, optional: true
+      belongs_to :dispatchable, 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
@@ -16,8 +16,12 @@ module Cats
       validates :status, inclusion: { in: STATUSES }
 
       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)
+      delegate(:request_reference, to: :dispatchable, allow_nil: true)
+      delegate(:request_quantity, to: :dispatchable, allow_nil: true)
+
+      before_save do |plan|
+        plan.upstream = !plan.dispatchable.nil? && plan.dispatchable_type == RhnRequest.name
+      end
 
       def approve
         raise(StandardError, 'Dispatch plan already approved.') if status == APPROVED

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

@@ -11,7 +11,7 @@ module Cats
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :amount, :donation_type, :donated_on, presence: true
+      validates :reference_no, :amount, :donation_type, :donated_on, :agency, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, presence: true, if: -> { donation_type == CASH }

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class MonthlyPlan < ApplicationRecord
+      include Dispatchable
+
       belongs_to :plan
       belongs_to :region, class_name: 'Cats::Core::Location'
 
@@ -16,6 +18,14 @@ module Cats
       delegate(:reference_no, to: :plan, prefix: true)
       delegate(:name, to: :region, prefix: true)
 
+      def request_reference
+        reference_no
+      end
+
+      def request_quantity
+        nil
+      end
+
       def validate_month
         return unless month
 

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

@@ -1,11 +1,18 @@
 module Cats
   module Core
     class PurchaseOrder < ApplicationRecord
+      LOCAL = 'Local'.freeze
+      FOREIGN = 'Foreign'.freeze
+      PURCHASE_TYPES = [LOCAL, FOREIGN].freeze
+
       belongs_to :donation
       belongs_to :commodity_category
+      belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
-      validates :reference_no, :order_date, :supplier, presence: true
+      validates :reference_no, :order_date, :supplier, :quantity, :purchase_type, presence: true
       validates :reference_no, uniqueness: true
+      validates :purchase_type, inclusion: { in: PURCHASE_TYPES }
+      validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
 

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class RhnRequest < ApplicationRecord
+      include Dispatchable
+
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
       ALLOCATED = 'Allocated'.freeze
@@ -16,6 +18,14 @@ module Cats
 
       delegate(:batch_no, to: :commodity, prefix: true)
 
+      def request_reference
+        reference_no
+      end
+
+      def request_quantity
+        quantity
+      end
+
       def validate_commodity_status
         return unless commodity
 

data/app/models/concerns/cats/core/dispatchable.rb

@@ -0,0 +1,15 @@
+# A concern to represent entities that lead to dispatch plan.
+# All classes including this concern must implement `request_reference()`
+# and `request_quantity()` methods, which will be used to generate
+# reference information in dispatch plan serializer.
+module Cats
+  module Core
+    module Dispatchable
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :dispatch_plans, as: :dispatchable
+      end
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 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, :request_quantity, :upstream
+      attributes :id, :reference_no, :status, :dispatchable_id, :dispatchable_type, :request_reference,
+                 :request_quantity, :commodity_id, :commodity_name, :commodity_batch_no, :commodity_quantity,
+                 :upstream
     end
   end
 end

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

@@ -0,0 +1,7 @@
+module Cats
+  module Core
+    class TransporterSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :address, :contact_phone
+    end
+  end
+end

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

@@ -3,24 +3,19 @@ module Cats
     class DispatchPlanService
       def approve(plan)
         plan.approve
-        plan.request.allocate if plan.request_id
+
+        plan.dispatchable.allocate if plan.dispatchable_type == RhnRequest.name
         # 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]
+        plan.save!
+        plan
+      rescue ActiveRecord::RecordInvalid
+        raise(StandardError, plan.errors.full_messages[0])
       end
     end
   end

data/config/routes.rb

@@ -66,6 +66,7 @@ Cats::Core::Engine.routes.draw do
   end
   resources :currencies, except: %i[destroy]
   resources :unit_of_measures, except: %i[destroy]
+  resources :transporters, except: %i[destroy]
 
   post '/routes/filter', controller: :routes, action: :filter
   resources :routes, except: %i[destroy]

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -5,6 +5,7 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
       t.string :description
       t.string :donation_type, null: false
       t.date :donated_on, null: false
+      t.string :agency, null: false
       t.references :donor,
                    null: false,
                    index: { name: 'donor_on_donation_indx' },

data/db/migrate/20210717032855_create_cats_core_purchase_orders.rb

@@ -5,6 +5,8 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
       t.date :order_date, null: false
       t.string :requisition_no
       t.string :supplier, null: false
+      t.float :quantity, null: false
+      t.string :purchase_type, null: false
 
       t.references :donation,
                    null: false,
@@ -14,6 +16,10 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'po_on_cc_indx' },
                    foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_po_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
 
       t.timestamps
     end

data/db/migrate/20210718043328_create_cats_core_dispatch_plans.rb

@@ -4,7 +4,7 @@ class CreateCatsCoreDispatchPlans < ActiveRecord::Migration[6.1]
       t.string :reference_no, unique: true
       t.string :description
       t.string :status, null: false, default: 'Draft'
-      t.references :request, polymorphic: true
+      t.references :dispatchable, polymorphic: true
       t.boolean :upstream, null: false, default: false
       t.references :commodity,
                    null: false,

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.22'.freeze
+    VERSION = '1.3.26'.freeze
   end
 end

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

@@ -2,10 +2,14 @@ FactoryBot.define do
   factory :dispatch_plan, class: 'Cats::Core::DispatchPlan' do
     reference_no { FFaker::Name.name }
     status { Cats::Core::DispatchPlan::DRAFT }
-    request { nil }
+    dispatchable { nil }
     upstream { false }
     commodity
     prepared_by factory: :user
     approved_by { nil }
+
+    trait :with_rhn do
+      dispatchable { create(:rhn_request) }
+    end
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     description { FFaker::Name.name }
     donation_type { Cats::Core::Donation::KIND }
     donated_on { Date.today }
+    agency { 'WFP' }
     donor
     plan
     amount { 100 }

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

@@ -4,7 +4,10 @@ FactoryBot.define do
     order_date { Date.today }
     requisition_no { FFaker::Name.name }
     supplier { FFaker::Name.name }
+    quantity { 100 }
+    purchase_type { Cats::Core::PurchaseOrder::LOCAL }
     donation
     commodity_category
+    unit factory: :unit_of_measure
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.26
 platform: ruby
 authors:
 - Henock L.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -246,6 +246,7 @@ files:
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/routes_controller.rb
 - app/controllers/cats/core/spaces_controller.rb
+- app/controllers/cats/core/transporters_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/controllers/concerns/cats/core/common.rb
@@ -306,6 +307,7 @@ files:
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
+- app/models/concerns/cats/core/dispatchable.rb
 - app/notifications/cats/core/allocation_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
@@ -322,6 +324,7 @@ files:
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/serializers/cats/core/role_serializer.rb
 - app/serializers/cats/core/route_serializer.rb
+- app/serializers/cats/core/transporter_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
 - app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/dispatch_plan_service.rb
@@ -455,7 +458,7 @@ metadata:
   homepage_uri: http://cats.ndrmcapps.org
   source_code_uri: https://github.com/ndrmc/cats_core
   changelog_uri: https://github.com/ndrmc/cats_core/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -470,8 +473,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.3.3
+signing_key: 
 specification_version: 4
 summary: Core module for CATS applications
 test_files: []