cats_core 1.4.39 → 1.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86860a6e6a86d7d133ab9a050bffdd675d00c1fad85e9af8b9fabf24183711d
-  data.tar.gz: 23001d95a8ce470d196ab560dd72d782f080ed8fed7e9067a12674b06084cf35
+  metadata.gz: b075feb71a427f4901c4fb32fe34f8b2ad2dfb902a3386b9c92b10fd6e809762
+  data.tar.gz: 283f7c441c7d3920fbe5a7ce4253d41d24fccbaa9432d634f7004abe2cfa531f
 SHA512:
-  metadata.gz: 10324cc46243b87345e485e9f176cd1b4a9acc277d8c26aa5b1372c3dc211fa4e4a3f473e81ad94c1bcba0f67c8a9cbb988b5648f4bd70063ab10da0c4865636
-  data.tar.gz: 0c530f68241d07329f96a399b2fcac5cffc30bb549c5ddb605739a49db2150cbef97b24e290459232d05f4bf67390ecf66c706bc2f552628743853b4d7bec86b
+  metadata.gz: 8975cb79857ea468f7c13b638ff8668849b3d0021d59df037f1d88ceb508090481fe10da028a5b5a54ee23117c270c1b67e1d8b9149bc9eeec421015ea92eda9
+  data.tar.gz: 54936908e0394ead9f8f8ffd887949f1f6afbd1fcb63d7cdf90b5d9d0f32dcd6a0b5f73009d326c03550b5ce43bce7d8bbf758e8a2a735b23c6b653302b48eba

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class CashDonationsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          CashDonation.includes(:donor, :currency).all
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:reference_no, :description, :donated_on, :donor_id, :amount, :currency_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Cats
+  module Core
+    class CommodityDonationsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          CommodityDonation.includes(:donor, :plan, :unit, :commodity_category).all
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(
+          :reference_no, :description, :shipping_reference, :donated_on, :donor_id, :plan_id, :quantity,
+          :commodity_category_id, :unit_id
+        )
+      end
+    end
+  end
+end

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

@@ -27,6 +27,18 @@ module Cats
         render json: { success: false, error: e.message }, status: :unprocessable_entity
       end
 
+      def generate
+        service = DispatchPlanService.new
+        items = service.generate(params[:id])
+        render json: { success: true, data: serialize(items) }
+      end
+
+      def bulk_create
+        service = DispatchPlanService.new
+        plan = service.bulk_create(bulk_create_params, current_user)
+        render json: { success: true, data: serialize(plan) }
+      end
+
       def approve
         service = DispatchPlanService.new
         plan = DispatchPlan.find(params[:id])
@@ -41,6 +53,18 @@ module Cats
       def model_params
         params.require(:payload).permit(:reference_no, :dispatchable_id, :dispatchable_type)
       end
+
+      def bulk_create_params
+        params.require(:payload).permit(
+          :reference_no,
+          :dispatchable_id,
+          :dispatchable_type,
+          items: %i[
+            reference_no region zone woreda fdp commodity_category unit_id unit quantity source_id destination_id
+            commodity_id
+          ]
+        )
+      end
     end
   end
 end

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

@@ -0,0 +1,20 @@
+module Cats
+  module Core
+    class LoansController < ApplicationController
+      include Common
+
+      def index
+        super do
+          Loan.includes(:commodity_category, :unit).all
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:reference_no, :lender, :agreement_date, :repayment_date, :quantity, :unit_id,
+                                        :commodity_category_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Cats
+  module Core
+    class PurchaseOrdersController < ApplicationController
+      include Common
+
+      def index
+        purchase_orders = Cats::Core::PurchaseOrder.where(cash_donation_id: params[:id]).includes(
+          :commodity_category,
+          :unit,
+          :currency
+        )
+        render json: { success: true, data: serialize(purchase_orders) }
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:reference_no, :order_date, :requisition_no, :supplier, :cash_donation_id,
+                                        :commodity_category_id, :quantity, :purchase_type, :unit_id, :price,
+                                        :currency_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Cats
+  module Core
+    class SwapsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          Swap.includes(:issued_commodity, :issued_unit, :received_commodity, :received_unit).all
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id,
+                                        :issued_quantity, :received_commodity_id, :received_quantity,
+                                        :issued_unit_id, :received_unit_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class CashDonation < Donation
+      belongs_to :currency
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:code, to: :currency, prefix: true)
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Cats
+  module Core
+    class CommodityDonation < Donation
+      belongs_to :plan, optional: true
+      belongs_to :commodity_category
+      belongs_to :unit, class_name: 'UnitOfMeasure'
+
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:reference_no, to: :plan, prefix: true, allow_nil: true)
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module Cats
 
         return if dispatchable.status == RhnRequest::APPROVED
 
-        errors.add(:dispatchable, 'is already reserved.') if id.nil?
+        errors.add(:dispatchable, 'is already reserved.') if id.nil? && dispatchable.status == Dispatchable::RESERVED
       end
 
       def approve

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

@@ -1,28 +1,14 @@
 module Cats
   module Core
     class Donation < ApplicationRecord
-      CASH = 'Cash'.freeze
-      KIND = 'Kind'.freeze
-      DONATION_TYPES = [CASH, KIND].freeze
+      self.abstract_class = true
 
       belongs_to :donor
-      belongs_to :plan, optional: true
-      belongs_to :currency, optional: true
-      belongs_to :commodity_category, optional: true
-      belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :amount, :donation_type, :donated_on, :agency, presence: true
+      validates :reference_no, :donated_on, presence: true
       validates :reference_no, uniqueness: true
-      validates :donation_type, inclusion: { in: DONATION_TYPES }
-      validates :currency, presence: true, if: -> { donation_type == CASH }
-      validates :commodity_category, presence: true, if: -> { donation_type == KIND }
-      validates :unit_of_measure, presence: true, if: -> { donation_type == KIND }
 
       delegate(:name, to: :donor, prefix: true)
-      delegate(:reference_no, to: :plan, prefix: true, allow_nil: true)
-      delegate(:name, to: :commodity_category, prefix: true, allow_nil: true)
-      delegate(:code, to: :currency, prefix: true, allow_nil: true)
-      delegate(:abbreviation, to: :unit_of_measure, prefix: true, allow_nil: true)
     end
   end
 end

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

@@ -3,9 +3,9 @@ module Cats
     class GiftCertificate < ApplicationRecord
       belongs_to :donation, optional: true
       belongs_to :commodity_category
-      belongs_to :unit_of_measure
+      belongs_to :unit, class_name: 'UnitOfMeasure'
       belongs_to :currency
-      belongs_to :destination_warehouse, class_name: 'Cats::Core::Location'
+      belongs_to :destination_warehouse, class_name: 'Location'
 
       validates :reference_no, presence: true, uniqueness: true
       validates :gift_date, :quantity, :requested_by, :customs_office, presence: true
@@ -13,28 +13,8 @@ module Cats
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :destination_warehouse, prefix: true)
-      delegate(:abbreviation, to: :unit_of_measure, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
       delegate(:code, to: :currency, prefix: true)
-
-      before_validation :set_commodity_category
-      after_create :update_donation
-
-      def update_donation
-        return unless donation
-
-        return if donation.active
-
-        donation.active = true
-        donation.save!
-      end
-
-      def set_commodity_category
-        return unless donation
-
-        return if commodity_category == donation.commodity_category
-
-        self.commodity_category = donation.commodity_category
-      end
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module Cats
+  module Core
+    class Loan < ApplicationRecord
+      belongs_to :commodity_category
+      belongs_to :unit, class_name: 'UnitOfMeasure'
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :lender, :agreement_date, presence: true
+      validates :quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+    end
+  end
+end

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

@@ -2,10 +2,14 @@ module Cats
   module Core
     class Project < ApplicationRecord
       belongs_to :source, polymorphic: true
+      belongs_to :program
 
       validates :code, presence: true, uniqueness: true
       validates :year, :implementing_agency, presence: true
       validates :year, numericality: { greater_than: 2000 }
+
+      delegate(:code, to: :program, prefix: true)
+      delegate(:reference_no, to: :source, prefix: true)
     end
   end
 end

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

@@ -5,27 +5,19 @@ module Cats
       FOREIGN = 'Foreign'.freeze
       PURCHASE_TYPES = [LOCAL, FOREIGN].freeze
 
-      belongs_to :donation
+      belongs_to :cash_donation
       belongs_to :commodity_category
+      belongs_to :currency
       belongs_to :unit, class_name: 'Cats::Core::UnitOfMeasure'
 
-      validates :reference_no, :order_date, :supplier, :quantity, :purchase_type, presence: true
+      validates :reference_no, :order_date, :supplier, :purchase_type, presence: true
       validates :reference_no, uniqueness: true
       validates :purchase_type, inclusion: { in: PURCHASE_TYPES }
-      validates :quantity, numericality: { greater_than: 0 }
+      validates :quantity, :price, presence: true, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :unit, prefix: true)
-
-      after_create :update_donation
-
-      def update_donation
-        donation = self.donation
-        return if donation.active
-
-        donation.active = true
-        donation.save!
-      end
+      delegate(:code, to: :currency, prefix: true)
     end
   end
 end

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

@@ -3,11 +3,11 @@ module Cats
     class RhnRequest < ApplicationRecord
       include Dispatchable
 
-      DRAFT = 'Draft'.freeze
-      APPROVED = 'Approved'.freeze
-      RESERVED = 'Reserved'.freeze
+      # DRAFT = 'Draft'.freeze
+      # APPROVED = 'Approved'.freeze
+      # RESERVED = 'Reserved'.freeze
       ALLOCATED = 'Allocated'.freeze
-      STATUSES = [DRAFT, APPROVED, RESERVED, ALLOCATED].freeze
+      STATUSES << ALLOCATED
 
       belongs_to :commodity
 

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

@@ -3,12 +3,9 @@ module Cats
     class RoundPlan < ApplicationRecord
       include Dispatchable
 
-      DRAFT = 'Draft'.freeze
-      APPROVED = 'Approved'.freeze
-      RESERVED = 'Reserved'.freeze
       NEEDS_APPROVED = 'Needs Approved'.freeze
 
-      STATUSES = [DRAFT, APPROVED, RESERVED, NEEDS_APPROVED].freeze
+      STATUSES << NEEDS_APPROVED
 
       belongs_to :plan
       belongs_to :region, class_name: 'Cats::Core::Location'

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class Swap < ApplicationRecord
+      belongs_to :issued_commodity, class_name: 'CommodityCategory'
+      belongs_to :issued_unit, class_name: 'UnitOfMeasure'
+      belongs_to :received_commodity, class_name: 'CommodityCategory'
+      belongs_to :received_unit, class_name: 'UnitOfMeasure'
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :swapper, :agreement_date, :issued_quantity, :received_quantity, presence: true
+      validates :issued_quantity, :received_quantity, presence: true, numericality: { greater_than: 0 }
+
+      delegate(:name, to: :issued_commodity, prefix: true)
+      delegate(:name, to: :received_commodity, prefix: true)
+      delegate(:abbreviation, to: :issued_unit, prefix: true)
+      delegate(:abbreviation, to: :received_unit, prefix: true)
+    end
+  end
+end

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

@@ -7,6 +7,14 @@ module Cats
     module Dispatchable
       extend ActiveSupport::Concern
 
+      DRAFT = 'Draft'.freeze
+      APPROVED = 'Approved'.freeze
+      RESERVED = 'Reserved'.freeze
+
+      # rubocop:disable Style/MutableConstant
+      STATUSES = [DRAFT, APPROVED, RESERVED]
+      # rubocop:enable Style/MutableConstant
+
       included do
         has_many :dispatch_plans, as: :dispatchable
       end

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class CashDonationSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :description, :donated_on, :donor_id, :donor_name, :amount, :currency_id,
+                 :currency_code
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class CommodityDonationSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :donated_on, :donor_id, :donor_name, :plan_id, :plan_reference_no,
+                 :quantity, :unit_id, :unit_abbreviation, :description, :commodity_category_id,
+                 :commodity_category_name, :shipping_reference
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class LoanSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :lender, :agreement_date, :repayment_date, :commodity_category_id,
+                 :commodity_category_name, :quantity, :unit_id, :unit_abbreviation
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class PurchaseOrderSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :order_date, :requisition_no, :supplier, :cash_donation_id, :purchase_type,
+                 :commodity_category_id, :commodity_category_name, :quantity, :unit_id, :unit_name, :currency_id,
+                 :currency_code, :price
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class SwapSerializer < ActiveModel::Serializer
+      attributes :id, :reference_no, :swapper, :agreement_date, :issued_commodity_id, :issued_commodity_name,
+                 :issued_quantity, :received_commodity_id, :received_commodity_name, :received_quantity,
+                 :issued_unit_id, :issued_unit_abbreviation, :received_unit_id, :received_unit_abbreviation
+    end
+  end
+end

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

@@ -59,6 +59,85 @@ module Cats
           end
         end
       end
+
+      # This method generates dispatch plan for a round plan by aggregating the FDP level
+      # quantities into woreda level quantity per commodity.
+      #
+      # Parameters:
+      #   id => The ID of the round plan for which dispatch plan is to be generated
+      #
+      def generate(id)
+        details = RoundPlanItemDetail.joins(
+          beneficiary_round_plan_item: { round_plan_item: :round_plan }
+        ).where(
+          beneficiary_round_plan_item: { cats_core_round_plan_items: { round_plan_id: id } }
+        ).includes(
+          beneficiary_round_plan_item: {
+            round_plan_item: %i[round_plan region zone woreda fdp]
+          },
+          round_ration: :commodity_category
+        )
+
+        items = details.each_with_object([]) do |detail, res|
+          res << {
+            reference_no: nil,
+            region: detail.beneficiary_round_plan_item.round_plan_item.region.name,
+            zone: detail.beneficiary_round_plan_item.round_plan_item.zone.name,
+            woreda: detail.beneficiary_round_plan_item.round_plan_item.woreda.name,
+            fdp: detail.beneficiary_round_plan_item.round_plan_item.fdp.name,
+            commodity_category: detail.round_ration.commodity_category.name,
+            unit_id: detail.round_ration.unit_of_measure_id,
+            unit: detail.round_ration.unit_of_measure.abbreviation,
+            quantity: detail.quantity,
+            source_id: nil,
+            destination_id: detail.beneficiary_round_plan_item.round_plan_item.fdp.id,
+            commodity_id: nil,
+            commodity_status: Cats::Core::Commodity::GOOD
+          }
+        end
+        {
+          reference_no: nil,
+          dispatchable_id: id,
+          dispatchable_type: 'Cats::Core::RoundPlan',
+          items: items
+        }
+      end
+
+      # This method creates dispatch and dispatch plan items once
+      # users fill out additional details such as source and destination
+      # for generated dispatch plan items.
+      #
+      # NOTE: Users still have to go through each plan item and set the
+      #       reference_no. If the product team comes up with a reference_no
+      #       generation scheme, then we may use that to avoid this.
+      #
+      def bulk_create(payload, user)
+        plan = Cats::Core::DispatchPlan.new(
+          reference_no: payload[:reference_no],
+          dispatchable_id: payload[:dispatchable_id],
+          dispatchable_type: payload[:dispatchable_type],
+          prepared_by: user
+        )
+        ActiveRecord::Base.transaction do
+          plan.save!
+
+          items = payload[:items].each_with_object([]) do |item, res|
+            res << {
+              reference_no: item[:reference_no],
+              source_id: item[:source_id],
+              destination_id: item[:destination_id],
+              dispatch_plan_id: plan.id,
+              quantity: item[:quantity],
+              unit_id: item[:unit_id],
+              commodity_id: item[:commodity_id],
+              commodity_status: item[:commodity_status],
+              status: Cats::Core::DispatchPlanItem::UNAUTHORIZED
+            }
+          end
+          Cats::Core::DispatchPlanItem.insert_all(items, record_timestamps: true)
+        end
+        plan
+      end
     end
   end
 end

data/config/routes.rb

@@ -84,7 +84,18 @@ Cats::Core::Engine.routes.draw do
   post '/routes/bulk_create', controller: :routes, action: :bulk_create
   resources :routes, except: %i[destroy]
 
+  resources :commodity_donations, except: %i[destroy]
+  resources :purchase_orders, except: %i[index destroy]
+  resources :cash_donations, except: %i[destroy] do
+    member do
+      get 'purchase_orders', controller: :purchase_orders, action: :index
+    end
+  end
+  resources :swaps, except: %i[destory]
+  resources :loans, except: %i[destory]
+
   post '/dispatch_plans/filter', controller: :dispatch_plans, action: :filter
+  post '/dispatch_plans/bulk_create'
   resources :dispatch_plans do
     member do
       get 'items', controller: :dispatch_plan_items, action: :index
@@ -164,6 +175,7 @@ Cats::Core::Engine.routes.draw do
   post '/round_plans/filter'
   resources :round_plans, except: %i[index destroy] do
     member do
+      post 'generate_dispatch_plan', controller: :dispatch_plans, action: :generate
       post 'remove_items'
       post 'generate_round_needs'
       post 'approve'

data/db/migrate/20210717032330_create_cats_core_commodity_donations.rb

@@ -0,0 +1,29 @@
+class CreateCatsCoreCommodityDonations < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_commodity_donations do |t|
+      t.string :reference_no, unique: true
+      t.string :description
+      t.string :shipping_reference
+      t.date :donated_on, null: false
+      t.references :donor,
+                   null: false,
+                   index: { name: 'donor_on_cd_indx' },
+                   foreign_key: { to_table: :cats_core_donors }
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_cd_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :plan,
+                   null: true,
+                   index: { name: 'plan_on_cd_indx' },
+                   foreign_key: { to_table: :cats_core_plans }
+      t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_cd_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210717032408_create_cats_core_cash_donations.rb

@@ -0,0 +1,20 @@
+class CreateCatsCoreCashDonations < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_cash_donations do |t|
+      t.string :reference_no, unique: true
+      t.string :description
+      t.date :donated_on, null: false
+      t.references :donor,
+                   null: false,
+                   index: { name: 'donor_on_cad_indx' },
+                   foreign_key: { to_table: :cats_core_donors }
+      t.float :amount, null: false
+      t.references :currency,
+                   null: false,
+                   index: { name: 'currency_on_cad_indx' },
+                   foreign_key: { to_table: :cats_core_currencies }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -3,12 +3,6 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
     create_table :cats_core_gift_certificates do |t|
       t.string :reference_no, unique: true
       t.date :gift_date, null: false
-
-      t.references :donation,
-                   null: true,
-                   index: { name: 'gc_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_donations }
-
       t.string :vessel
       t.string :port
       t.string :customs_declaration_no
@@ -20,9 +14,9 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'gc_on_cc_indx' },
                    foreign_key: { to_table: :cats_core_commodity_categories }
-      t.references :unit_of_measure,
+      t.references :unit,
                    null: false,
-                   index: { name: 'uom_on_gc_indx' },
+                   index: { name: 'unit_on_gc_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
       t.references :destination_warehouse,
                    null: false,

data/db/migrate/20210717032855_create_cats_core_purchase_orders.rb

@@ -7,14 +7,18 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
       t.string :supplier, null: false
       t.float :quantity, null: false
       t.string :purchase_type, null: false
-
-      t.references :donation,
+      t.float :price, null: false
+      t.references :currency,
+                   null: false,
+                   index: { name: 'currency_on_po_indx' },
+                   foreign_key: { to_table: :cats_core_currencies }
+      t.references :cash_donation,
                    null: false,
-                   index: { name: 'po_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_donations }
+                   index: { name: 'cd_on_po_indx' },
+                   foreign_key: { to_table: :cats_core_cash_donations }
       t.references :commodity_category,
                    null: false,
-                   index: { name: 'po_on_cc_indx' },
+                   index: { name: 'cc_on_po_indx' },
                    foreign_key: { to_table: :cats_core_commodity_categories }
       t.references :unit,
                    null: false,

data/db/migrate/20210717032927_create_cats_core_projects.rb

@@ -4,6 +4,10 @@ class CreateCatsCoreProjects < ActiveRecord::Migration[7.0]
       t.string :code, unique: true
       t.string :description
       t.references :source, polymorphic: true
+      t.references :program,
+                   null: false,
+                   index: { name: 'program_on_projects_indx' },
+                   foreign_key: { to_table: :cats_core_programs } 
       t.integer :year, null: false
       t.string :implementing_agency, null: false
 

data/db/migrate/20220626063501_create_cats_core_loans.rb

@@ -0,0 +1,21 @@
+class CreateCatsCoreLoans < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_loans do |t|
+      t.string :reference_no, unique: true
+      t.string :lender, null: false
+      t.date :agreement_date, null: false
+      t.date :repayment_date
+      t.references :commodity_category,
+                   null: false,
+                   index: { name: 'cc_on_loan_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.float :quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: { name: 'unit_on_loan_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220626063757_create_cats_core_swaps.rb

@@ -0,0 +1,29 @@
+class CreateCatsCoreSwaps < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_swaps do |t|
+      t.string :reference_no, unique: true
+      t.string :swapper, null: false
+      t.date :agreement_date, null: false
+      t.float :issued_quantity, null: false
+      t.float :received_quantity, null: false
+      t.references :issued_commodity,
+                   null: false,
+                   index: { name: 'ic_on_swap_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :received_commodity,
+                   null: false,
+                   index: { name: 'rc_on_swap_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_categories }
+      t.references :issued_unit,
+                   null: false,
+                   index: { name: 'iu_on_swap_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :received_unit,
+                   null: false,
+                   index: { name: 'ru_on_swap_indx' },
+                   foreign_key: { to_table: :cats_core_unit_of_measures }
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.39'.freeze
+    VERSION = '1.4.42'.freeze
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :cash_donation, class: 'Cats::Core::CashDonation' do
+    reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
+    donated_on { Date.today.prev_week }
+    donor
+    amount { 10_000 }
+    currency
+  end
+end

data/spec/factories/cats/core/{donations.rb → commodity_donations.rb}

@@ -1,17 +1,13 @@
 FactoryBot.define do
-  factory :donation, class: 'Cats::Core::Donation' do
+  factory :commodity_donation, class: 'Cats::Core::CommodityDonation' do
     reference_no { FFaker::Name.name }
     description { FFaker::Name.name }
-    donation_type { Cats::Core::Donation::KIND }
     shipping_reference { FFaker::Name.name }
     donated_on { Date.today }
-    agency { 'WFP' }
     donor
     plan
-    amount { 100 }
-    currency { nil }
+    quantity { 100 }
     commodity_category
-    unit_of_measure
-    active { false }
+    unit factory: :unit_of_measure
   end
 end

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

@@ -2,10 +2,6 @@ FactoryBot.define do
   factory :gift_certificate, class: 'Cats::Core::GiftCertificate' do
     reference_no { FFaker::Name.name }
     gift_date { Date.today - 1.month }
-    donation
-    commodity_category { donation.commodity_category }
-    unit_of_measure
-    destination_warehouse factory: :warehouse
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
@@ -13,8 +9,11 @@ FactoryBot.define do
     expiry_date { Date.today + 6.month }
     bill_of_lading_no { FFaker::Name.name }
     quantity { 1.5 }
-    estimated_price { 1.5 }
-    estimated_tax { 1.5 }
+    commodity_category
+    unit factory: :unit_of_measure
+    destination_warehouse factory: :warehouse
+    estimated_price { 500 }
+    estimated_tax { 200 }
     currency
     registration_no { FFaker::Name.name }
     requested_by { FFaker::Name.name }

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :loan, class: 'Cats::Core::Loan' do
+    reference_no { FFaker::Name.name }
+    lender { FFaker::Name.name }
+    agreement_date { Date.today }
+    repayment_date { agreement_date.next_month }
+    commodity_category
+    quantity { 100 }
+    unit factory: :unit_of_measure
+  end
+end

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

@@ -2,7 +2,8 @@ FactoryBot.define do
   factory :project, class: 'Cats::Core::Project' do
     code { FFaker::Name.name }
     description { FFaker::Name.name }
-    source factory: :gift_certificate
+    source factory: :commodity_donation
+    program
     year { 2022 }
     implementing_agency { FFaker::Name.name }
   end

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

@@ -6,7 +6,9 @@ FactoryBot.define do
     supplier { FFaker::Name.name }
     quantity { 100 }
     purchase_type { Cats::Core::PurchaseOrder::LOCAL }
-    donation
+    price { 1_000 }
+    currency
+    cash_donation
     commodity_category
     unit factory: :unit_of_measure
   end

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :swap, class: 'Cats::Core::Swap' do
+    reference_no { FFaker::Name.name }
+    swapper { FFaker::Name.name }
+    agreement_date { Date.yesterday }
+    issued_commodity factory: :commodity_category
+    issued_quantity { 100 }
+    issued_unit factory: :unit_of_measure
+    received_commodity factory: :commodity_category
+    received_quantity { 150 }
+    received_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.4.39
+  version: 1.4.42
 platform: ruby
 authors:
 - Henock L.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -232,18 +232,22 @@ files:
 - Rakefile
 - app/controllers/cats/core/access_controller.rb
 - app/controllers/cats/core/application_controller.rb
+- app/controllers/cats/core/cash_donations_controller.rb
 - app/controllers/cats/core/commodities_controller.rb
 - app/controllers/cats/core/commodity_categories_controller.rb
+- app/controllers/cats/core/commodity_donations_controller.rb
 - app/controllers/cats/core/currencies_controller.rb
 - app/controllers/cats/core/dispatch_authorizations_controller.rb
 - app/controllers/cats/core/dispatch_plan_items_controller.rb
 - app/controllers/cats/core/dispatch_plans_controller.rb
 - app/controllers/cats/core/dispatch_transactions_controller.rb
 - app/controllers/cats/core/dispatches_controller.rb
+- app/controllers/cats/core/loans_controller.rb
 - app/controllers/cats/core/locations_controller.rb
 - app/controllers/cats/core/lost_commodities_controller.rb
 - app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
+- app/controllers/cats/core/purchase_orders_controller.rb
 - app/controllers/cats/core/receipt_authorizations_controller.rb
 - app/controllers/cats/core/receipt_transactions_controller.rb
 - app/controllers/cats/core/receipts_controller.rb
@@ -253,6 +257,7 @@ files:
 - app/controllers/cats/core/spaces_controller.rb
 - app/controllers/cats/core/stacks_controller.rb
 - app/controllers/cats/core/stores_controller.rb
+- app/controllers/cats/core/swaps_controller.rb
 - app/controllers/cats/core/transporters_controller.rb
 - app/controllers/cats/core/unit_conversions_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
@@ -267,8 +272,10 @@ files:
 - app/models/cats/core/beneficiary_category.rb
 - app/models/cats/core/beneficiary_plan_item.rb
 - app/models/cats/core/beneficiary_round_plan_item.rb
+- app/models/cats/core/cash_donation.rb
 - app/models/cats/core/commodity.rb
 - app/models/cats/core/commodity_category.rb
+- app/models/cats/core/commodity_donation.rb
 - app/models/cats/core/commodity_substitution.rb
 - app/models/cats/core/contract_item.rb
 - app/models/cats/core/currency.rb
@@ -281,6 +288,7 @@ files:
 - app/models/cats/core/donor.rb
 - app/models/cats/core/gift_certificate.rb
 - app/models/cats/core/hub_authorization.rb
+- app/models/cats/core/loan.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/lost_commodity.rb
 - app/models/cats/core/menu.rb
@@ -312,6 +320,7 @@ files:
 - app/models/cats/core/stacking_rule.rb
 - app/models/cats/core/store.rb
 - app/models/cats/core/supplier.rb
+- app/models/cats/core/swap.rb
 - app/models/cats/core/tenderer.rb
 - app/models/cats/core/transaction.rb
 - app/models/cats/core/transport_bid.rb
@@ -333,7 +342,9 @@ files:
 - app/notifications/cats/core/allocation_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
+- app/serializers/cats/core/cash_donation_serializer.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
+- app/serializers/cats/core/commodity_donation_serializer.rb
 - app/serializers/cats/core/commodity_serializer.rb
 - app/serializers/cats/core/currency_serializer.rb
 - app/serializers/cats/core/dispatch_authorization_serializer.rb
@@ -341,8 +352,10 @@ files:
 - app/serializers/cats/core/dispatch_plan_serializer.rb
 - app/serializers/cats/core/dispatch_serializer.rb
 - app/serializers/cats/core/dispatch_transaction_serializer.rb
+- app/serializers/cats/core/loan_serializer.rb
 - app/serializers/cats/core/location_serializer.rb
 - app/serializers/cats/core/lost_commodity_serializer.rb
+- app/serializers/cats/core/purchase_order_serializer.rb
 - app/serializers/cats/core/receipt_authorization_serializer.rb
 - app/serializers/cats/core/receipt_serializer.rb
 - app/serializers/cats/core/receipt_transaction_serializer.rb
@@ -352,6 +365,7 @@ files:
 - app/serializers/cats/core/route_serializer.rb
 - app/serializers/cats/core/stack_serializer.rb
 - app/serializers/cats/core/store_serializer.rb
+- app/serializers/cats/core/swap_serializer.rb
 - app/serializers/cats/core/transporter_serializer.rb
 - app/serializers/cats/core/unit_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
@@ -386,7 +400,8 @@ files:
 - db/migrate/20210717032270_create_cats_core_rations.rb
 - db/migrate/20210717032290_create_cats_core_beneficiary_plan_items.rb
 - db/migrate/20210717032295_create_cats_core_plan_item_details.rb
-- db/migrate/20210717032330_create_cats_core_donations.rb
+- db/migrate/20210717032330_create_cats_core_commodity_donations.rb
+- db/migrate/20210717032408_create_cats_core_cash_donations.rb
 - db/migrate/20210717032602_create_cats_core_gift_certificates.rb
 - db/migrate/20210717032855_create_cats_core_purchase_orders.rb
 - db/migrate/20210717032927_create_cats_core_projects.rb
@@ -434,6 +449,8 @@ files:
 - db/migrate/20220506082329_create_cats_core_transport_orders.rb
 - db/migrate/20220506083042_create_cats_core_transport_order_items.rb
 - db/migrate/20220511082354_create_cats_core_beneficiaries.rb
+- db/migrate/20220626063501_create_cats_core_loans.rb
+- db/migrate/20220626063757_create_cats_core_swaps.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -444,8 +461,10 @@ files:
 - spec/factories/cats/core/beneficiary_categories.rb
 - spec/factories/cats/core/beneficiary_plan_items.rb
 - spec/factories/cats/core/beneficiary_round_plan_items.rb
+- spec/factories/cats/core/cash_donations.rb
 - spec/factories/cats/core/commodities.rb
 - spec/factories/cats/core/commodity_categories.rb
+- spec/factories/cats/core/commodity_donations.rb
 - spec/factories/cats/core/commodity_substitutions.rb
 - spec/factories/cats/core/contract_items.rb
 - spec/factories/cats/core/currencies.rb
@@ -454,10 +473,10 @@ files:
 - spec/factories/cats/core/dispatch_plans.rb
 - spec/factories/cats/core/dispatch_transactions.rb
 - spec/factories/cats/core/dispatches.rb
-- spec/factories/cats/core/donations.rb
 - spec/factories/cats/core/donors.rb
 - spec/factories/cats/core/gift_certificates.rb
 - spec/factories/cats/core/hub_authorizations.rb
+- spec/factories/cats/core/loans.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/lost_commodities.rb
 - spec/factories/cats/core/menu_items.rb
@@ -489,6 +508,7 @@ files:
 - spec/factories/cats/core/stacks.rb
 - spec/factories/cats/core/stores.rb
 - spec/factories/cats/core/suppliers.rb
+- spec/factories/cats/core/swaps.rb
 - spec/factories/cats/core/tenderers.rb
 - spec/factories/cats/core/transport_bid_items.rb
 - spec/factories/cats/core/transport_bids.rb
@@ -513,7 +533,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
@@ -529,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Core module for CATS applications
 test_files: []

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -1,36 +0,0 @@
-class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_donations do |t|
-      t.string :reference_no, unique: true
-      t.string :description
-      t.string :donation_type, null: false
-      t.string :shipping_reference
-      t.date :donated_on, null: false
-      t.string :agency, null: false
-      t.references :donor,
-                   null: false,
-                   index: { name: 'donor_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_donors }
-      t.references :plan,
-                   null: true,
-                   index: { name: 'plan_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_plans }
-      t.float :amount, null: false
-      t.references :currency,
-                   null: true,
-                   index: { name: 'currency_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_currencies }
-      t.references :commodity_category,
-                   null: true,
-                   index: { name: 'cc_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_commodity_categories }
-      t.references :unit_of_measure,
-                   null: true,
-                   index: { name: 'uom_on_donation_indx' },
-                   foreign_key: { to_table: :cats_core_unit_of_measures }
-      t.boolean :active, null: false, default: false
-
-      t.timestamps
-    end
-  end
-end