cats_core 1.4.36 → 1.4.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1a42d7b3cdd50ebcdcb1636aadeeeda8ecc3e9103f2ddf073c991f254d6fc5
-  data.tar.gz: 5bbee2e2655b3cb7d8d1f907ff941d4652e4e9058c9b7864dce87f0ad46cfef2
+  metadata.gz: a86860a6e6a86d7d133ab9a050bffdd675d00c1fad85e9af8b9fabf24183711d
+  data.tar.gz: 23001d95a8ce470d196ab560dd72d782f080ed8fed7e9067a12674b06084cf35
 SHA512:
-  metadata.gz: 7a9b2a00fa941cabd75a6b0dccc6ed2eb0aa8402315759d27a76786a25070193eab2ffc20c43dfe195d5353b914f9cf765578aaed6895257efb2a8360a6c2a7b
-  data.tar.gz: '09237ecb718238ad54943cdd534c99afce076e6afdaedfaf116c87ba68f5b0a81e6a9a6f1086504986c3f89411266ef2d0bb82c353b87ce76c23598eb93039cc'
+  metadata.gz: 10324cc46243b87345e485e9f176cd1b4a9acc277d8c26aa5b1372c3dc211fa4e4a3f473e81ad94c1bcba0f67c8a9cbb988b5648f4bd70063ab10da0c4865636
+  data.tar.gz: 0c530f68241d07329f96a399b2fcac5cffc30bb549c5ddb605739a49db2150cbef97b24e290459232d05f4bf67390ecf66c706bc2f552628743853b4d7bec86b

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

@@ -14,6 +14,15 @@ module Cats
         render json: { error: 'Unauthorized' }, status: 401 if current_user.nil?
       end
 
+      # In case we want to disable bullet for specific controller actions
+      def skip_bullet
+        previous_value = Bullet.enable?
+        Bullet.enable = false
+        yield
+      ensure
+        Bullet.enable = previous_value
+      end
+
       private
 
       def serialize(data)

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

@@ -3,6 +3,12 @@ module Cats
     class CommoditiesController < ApplicationController
       include Common
 
+      def index
+        super do
+          Commodity.all.includes({ project: { source: :commodity_category } }, :unit_of_measure)
+        end
+      end
+
       def approve
         commodity = Commodity.find(params[:id])
         result = commodity.approve
@@ -12,14 +18,14 @@ module Cats
       end
 
       def filter
-        query = Commodity.ransack(params[:q])
+        query = Commodity.includes(:project, :unit_of_measure).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
       private
 
       def model_params
-        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id, :commodity_grade,
+        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :project_id, :commodity_grade,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
                                         :arrival_status, :shipping_reference)
       end

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          DispatchAuthorization.where(dispatch_id: params[:id])
+          DispatchAuthorization.includes(:dispatch, :store, :authorized_by).where(dispatch_id: params[:id])
         end
       end
 
@@ -21,6 +21,7 @@ module Cats
         storekeeper = User.find(params[:id])
         stores = storekeeper.stores
         authorizations = DispatchAuthorization.joins(:dispatch)
+                                              .includes(:dispatch, :store, :authorized_by)
                                               .where(store: stores, dispatch: { dispatch_status: Dispatch::APPROVED })
         render json: { success: true, data: serialize(authorizations) }
       end

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

@@ -5,12 +5,24 @@ module Cats
 
       def index
         super do
-          DispatchPlanItem.where(dispatch_plan_id: params[:id])
+          DispatchPlanItem.includes(
+            :source,
+            :destination,
+            { commodity: { project: { source: :commodity_category } } },
+            :unit,
+            :dispatch_plan
+          ).where(dispatch_plan_id: params[:id])
         end
       end
 
       def filter
-        query = DispatchPlanItem.ransack(params[:q])
+        query = DispatchPlanItem.includes(
+          :source,
+          :destination,
+          { commodity: { project: { source: :commodity_category } } },
+          :unit,
+          :dispatch_plan
+        ).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 

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

@@ -3,8 +3,14 @@ module Cats
     class DispatchPlansController < ApplicationController
       include Common
 
+      def index
+        super do
+          DispatchPlan.all.includes(:dispatchable)
+        end
+      end
+
       def plans_for_user
-        plans = DispatchPlan.where(prepared_by: current_user)
+        plans = DispatchPlan.where(prepared_by: current_user).includes(:dispatchable)
         render json: { success: true, data: serialize(plans) }
       end
 

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

@@ -5,7 +5,7 @@ module Cats
 
       def index
         super do
-          DispatchTransaction.where(dispatch_authorization_id: params[:id])
+          DispatchTransaction.includes(:source).where(dispatch_authorization_id: params[:id])
         end
       end
 

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

@@ -4,10 +4,16 @@ module Cats
       include Common
       skip_before_action :authenticate, only: %i[start_with_pin]
       before_action :set_service, only: %i[create_receipt_authorization approve start start_with_pin search confirm]
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[search start_with_pin]
 
       def index
         super do
-          Dispatch.where(dispatch_plan_item_id: params[:id])
+          Dispatch.includes(
+            { dispatch_plan_item: :destination },
+            :transporter,
+            :prepared_by,
+            :unit
+          ).where(dispatch_plan_item_id: params[:id])
         end
       end
 
@@ -51,7 +57,12 @@ module Cats
       end
 
       def filter
-        query = Dispatch.ransack(params[:q])
+        query = Dispatch.includes(
+          { dispatch_plan_item: :destination },
+          :transporter,
+          :prepared_by,
+          :unit
+        ).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 

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

@@ -7,7 +7,7 @@ module Cats
 
       def index
         super do
-          ReceiptAuthorization.where(dispatch_id: params[:id])
+          ReceiptAuthorization.includes(:dispatch, :store, :authorized_by).where(dispatch_id: params[:id])
         end
       end
 
@@ -40,7 +40,8 @@ module Cats
         storekeeper = User.find(params[:id])
         status = params[:status]
         stores = storekeeper.stores
-        authorizations = ReceiptAuthorization.where(store: stores, status: status)
+        authorizations = ReceiptAuthorization.includes(:dispatch, :store, :authorized_by)
+                                             .where(store: stores, status: status)
         render json: { success: true, data: serialize(authorizations) }
       end
 

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

@@ -5,7 +5,8 @@ module Cats
 
       def index
         super do
-          ReceiptTransaction.joins(receipt_authorization: :dispatch).where(receipt_authorization_id: params[:id])
+          ReceiptTransaction.includes(:destination, { receipt_authorization: :dispatch })
+                            .where(receipt_authorization_id: params[:id])
         end
       end
 

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

@@ -4,15 +4,16 @@ module Cats
       include Common
 
       before_action :set_service, only: %i[approve generate remove_items generate_round_needs]
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[generate generate_round_needs remove_items]
 
       def index
         super do
-          RoundPlan.where(plan: params[:id])
+          RoundPlan.includes({ plan: :program }, :region).where(plan: params[:id])
         end
       end
 
       def filter
-        query = RoundPlan.ransack(params[:q])
+        query = RoundPlan.includes({ plan: :program }, :region).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
@@ -37,7 +38,7 @@ module Cats
       end
 
       def remove_items
-        plan = @service.remove_items(params[:id], remove_params)
+        plan = @service.remove_items(params[:id], remove_params[:ids])
         render json: { success: true, data: serialize(plan) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

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

@@ -3,8 +3,14 @@ module Cats
     class RoutesController < ApplicationController
       include Common
 
+      def index
+        super do
+          Route.all.includes(:region)
+        end
+      end
+
       def filter
-        query = Route.ransack(params[:q])
+        query = Route.includes(:region).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
@@ -23,7 +29,7 @@ module Cats
         end
 
         result = Route.insert_all!(data, record_timestamps: true)
-        routes = Route.where(id: result.rows.flatten)
+        routes = Route.includes(:region).where(id: result.rows.flatten)
         render json: { success: true, data: serialize(routes) }
       end
 

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

@@ -5,12 +5,12 @@ module Cats
 
       def index
         super do
-          Stack.where(store_id: params[:id])
+          Stack.includes(:commodity).where(store_id: params[:id])
         end
       end
 
       def filter
-        query = Stack.where(store_id: params[:id]).ransack(params[:q])
+        query = Stack.includes(:commodity).where(store_id: params[:id]).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 

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

@@ -4,19 +4,19 @@ module Cats
       include Common
 
       def index
-        stores = Cats::Core::Store.where(warehouse_id: params[:id])
+        stores = Store.includes(:store_keeper, :stacks).where(warehouse_id: params[:id])
         render json: { success: true, data: serialize(stores) }
       end
 
       def filter
-        query = Store.ransack(params[:q])
+        query = Store.includes(:store_keeper, :stacks).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
       def stores_for_hub
-        warehouses = Cats::Core::Location.find(params[:id]).children
+        warehouses = Location.find(params[:id]).children
         ids = warehouses.map(&:id)
-        stores = Cats::Core::Store.where(warehouse_id: ids)
+        stores = Store.includes(:store_keeper, :stacks).where(warehouse_id: ids)
         render json: { success: true, data: serialize(stores) }
       end
 

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

@@ -3,6 +3,12 @@ module Cats
     class UnitConversionsController < ApplicationController
       include Common
 
+      def index
+        super do
+          UnitConversion.all.includes(:from, :to)
+        end
+      end
+
       private
 
       def model_params

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

@@ -3,6 +3,8 @@ module Cats
     class UsersController < ApplicationController
       include Common
 
+      around_action :skip_bullet, if: -> { defined?(Bullet) }, only: %i[stores]
+
       def index
         super do
           User.joins(:application_module).where(cats_core_application_modules: { prefix: params[:prefix] })

data/app/helpers/cats/core/document_helper.rb

@@ -0,0 +1,12 @@
+module Cats
+  module Core
+    module DocumentHelper
+      require 'sablon'
+
+      def generate_document(template, output, data)
+        tpl = Sablon.template(template)
+        tpl.render_to_file(output, data)
+      end
+    end
+  end
+end

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

@@ -16,7 +16,15 @@ module Cats
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
-      COMMODITY_STATUSES = [GOOD, DAMAGED].freeze
+      LEAKAGE = 'Leakage'.freeze
+      WET = 'Wet'.freeze
+      MOLDY = 'Moldy'.freeze
+      INFESTED = 'Infested'.freeze
+      INSECT_INFECTED = 'Insect Infected'.freeze
+      FAECES_FROM_RODENTS = 'Faeces From Rodents'.freeze
+      UNDERWEIGHT_PACKAGE = 'Underweight Package'.freeze
+      COMMODITY_STATUSES = [GOOD, DAMAGED, LEAKAGE, WET, MOLDY, INFESTED, INSECT_INFECTED, FAECES_FROM_RODENTS,
+                            UNDERWEIGHT_PACKAGE].freeze
 
       # Arrival Statuses
       AT_SOURCE = 'At Source'.freeze
@@ -35,7 +43,7 @@ module Cats
       ].freeze
 
       belongs_to :unit_of_measure
-      belongs_to :source, polymorphic: true
+      belongs_to :project
 
       validates :best_use_before, presence: true
       validates :batch_no, presence: true, uniqueness: true
@@ -47,10 +55,12 @@ module Cats
       validate :validate_updateability, on: :update
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')
-      delegate(:reference_no, to: :source, prefix: true)
+      delegate(:code, to: :project, prefix: true)
 
       def name
-        source.commodity_category.name
+        # For this to be efficient, our query should use includes like
+        # Commodity.includes(project: { source: commodity_category })
+        project.source.commodity_category.name
       end
 
       def validate_updateability

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

@@ -29,6 +29,11 @@ module Cats
 
       delegate(:name, to: :transporter, prefix: true)
       delegate(:email, to: :prepared_by, prefix: true)
+      delegate(:abbreviation, to: :unit, prefix: true)
+
+      def destination
+        dispatch_plan_item.destination.name
+      end
 
       def authorized_quantity
         dispatch_authorizations.sum(:quantity)

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

@@ -10,7 +10,7 @@ module Cats
       end
 
       def self.messages(notifications)
-        notifications.map(&:message)
+        notifications.includes(:recipient).map(&:message)
       end
     end
   end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class Project < ApplicationRecord
+      belongs_to :source, polymorphic: true
+
+      validates :code, presence: true, uniqueness: true
+      validates :year, :implementing_agency, presence: true
+      validates :year, numericality: { greater_than: 2000 }
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Cats
       delegate(:source_name, to: :dispatch_plan_item, prefix: false)
 
       def commodity_name
-        dispatch_plan_item.commodity.source.commodity_category.name
+        dispatch_plan_item.commodity.name
       end
 
       def woreda

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

@@ -1,9 +1,9 @@
 module Cats
   module Core
     class CommoditySerializer < ActiveModel::Serializer
-      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :source_id,
-                 :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
-                 :arrival_status, :status, :shipping_reference, :commodity_grade
+      attributes :id, :name, :batch_no, :description, :unit_of_measure_id, :unit_abbreviation, :project_id,
+                 :project_code, :quantity, :best_use_before, :volume_per_metric_ton, :arrival_status, :status,
+                 :shipping_reference, :commodity_grade
     end
   end
 end

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

@@ -3,11 +3,7 @@ module Cats
     class DispatchSerializer < ActiveModel::Serializer
       attributes :id, :reference_no, :dispatch_plan_item_id, :transporter_id, :transporter_name, :plate_no,
                  :driver_name, :driver_phone, :quantity, :remark, :prepared_by_id, :prepared_by_email,
-                 :dispatch_status, :destination, :auth_details
-
-      def destination
-        object.dispatch_plan_item.destination.name
-      end
+                 :dispatch_status, :destination, :auth_details, :unit_id, :unit_abbreviation, :commodity_status
     end
   end
 end

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

@@ -19,12 +19,14 @@ module Cats
 
         if authorized
           return Dispatch.joins(:dispatch_plan_item)
+                         .includes({ dispatch_plan_item: :destination }, :transporter, :prepared_by, :unit)
                          .where(
                            dispatch_plan_item: { destination: hub, status: DispatchPlanItem::AUTHORIZED },
                            dispatch_status: status
                          )
         end
         Dispatch.joins(:dispatch_plan_item)
+                .includes({ dispatch_plan_item: :destination }, :transporter, :prepared_by, :unit)
                 .where(
                   dispatch_plan_item: { destination: hub },
                   dispatch_status: status
@@ -38,7 +40,12 @@ module Cats
       end
 
       def start_with_pin(dispatch_id, pin)
-        dispatch = Dispatch.find(dispatch_id)
+        dispatch = Dispatch.includes(
+          { dispatch_plan_item: :destination },
+          :transporter,
+          :prepared_by,
+          :unit
+        ).find(dispatch_id)
         raise(StandardError, 'Dispatch is already started.') if dispatch.dispatch_status == Dispatch::STARTED
 
         raise(StandardError, 'No pin has been generated for dispatch.') if dispatch.auth_details.nil?
@@ -60,12 +67,12 @@ module Cats
       end
 
       def send_notification(dispatch)
-        notification_rule = Cats::Core::NotificationRule.find_by(code: 'dispatch')
+        notification_rule = NotificationRule.find_by(code: 'dispatch')
         raise(StandardError, 'Notification rule not found for dispatch notification.') unless notification_rule
 
-        users = Cats::Core::User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        users = User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
         location_id = dispatch.dispatch_plan_item.destination_id
-        hub = Cats::Core::Location.find(location_id)
+        hub = Location.find(location_id)
         recipients = users.map do |user|
           details = user.details
 

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

@@ -115,7 +115,7 @@ module Cats
                                      .where(beneficiary_round_plan_items: { id: ids })
         raise(StandardError, 'Round plan items should be from the same plan.') if plans.count > 1
 
-        unless plans.count.positive? && plan_id == plans[0].id
+        unless plans.count.positive? && plan.id == plans[0].id
           raise(StandardError, 'Round plan items are not from the given round plan.')
         end
 
@@ -146,10 +146,16 @@ module Cats
         if plan.plan.program.code == 'PSNP'
           rounds = plan.rounds.count
           item_ids = plan.beneficiary_round_plan_items.pluck('beneficiary_plan_item_id').flatten
-          plan_items = BeneficiaryPlanItem.where(id: item_ids)
-          invalid = plan_items.select { |pi| pi.rounds - (pi.rounds_served || 0) < rounds }
-          error = 'There are plan items whose served rounds may exceed the allowed number of rounds.'
-          raise(StandardError, error) if invalid.count.positive?
+          plan_items = BeneficiaryPlanItem.includes(plan_item: :fdp).where(id: item_ids)
+          invalid = plan_items.select { |pi| pi.rounds - (pi.rounds_served || 0) < rounds }.map do |pi|
+            pi.plan_item.fdp.name
+          end
+
+          if invalid.count.positive?
+            msg = invalid.join(', ')
+            error = "The FDPs [#{msg}] exceeded their allowed number of rounds."
+            raise(StandardError, error)
+          end
 
           items = plan_items.each_with_object([]) do |plan_item, res|
             rounds_served = plan_item.rounds_served || 0

data/config/routes.rb

@@ -131,6 +131,12 @@ Cats::Core::Engine.routes.draw do
     action: :storekeeper_authorizations,
     as: :storekeeper_receipt_authorizations
   )
+  post(
+    '/receipt_authorizations/generate',
+    controller: :receipt_authorizations,
+    action: :generate,
+    as: :generate_receipt_authorizations
+  )
   resources :receipt_authorizations, except: %i[index destroy] do
     member do
       get 'transactions', controller: :receipt_transactions, action: :index

data/db/migrate/20210717032927_create_cats_core_projects.rb

@@ -0,0 +1,13 @@
+class CreateCatsCoreProjects < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cats_core_projects do |t|
+      t.string :code, unique: true
+      t.string :description
+      t.references :source, polymorphic: true
+      t.integer :year, null: false
+      t.string :implementing_agency, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -6,7 +6,10 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
-      t.references :source, polymorphic: true
+      t.references :project,
+                   null: false,
+                   index: { name: 'project_on_commodity_indx' },
+                   foreign_key: { to_table: :cats_core_projects }
       t.float :quantity, null: false
       t.string :description
       t.date :best_use_before, null: false

data/lib/cats/core/version.rb

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

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     batch_no { FFaker::Name.name }
     description { FFaker::Name.name }
     unit_of_measure
-    source factory: :gift_certificate
+    project
     quantity { 100 }
     best_use_before { Date.today + 2.month }
     volume_per_metric_ton { 10 }

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :project, class: 'Cats::Core::Project' do
+    code { FFaker::Name.name }
+    description { FFaker::Name.name }
+    source factory: :gift_certificate
+    year { 2022 }
+    implementing_agency { FFaker::Name.name }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.36
+  version: 1.4.39
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -258,6 +258,7 @@ files:
 - app/controllers/cats/core/unit_of_measures_controller.rb
 - app/controllers/cats/core/users_controller.rb
 - app/controllers/concerns/cats/core/common.rb
+- app/helpers/cats/core/document_helper.rb
 - app/jobs/cats/core/application_job.rb
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb
@@ -292,6 +293,7 @@ files:
 - app/models/cats/core/plan_item.rb
 - app/models/cats/core/plan_item_detail.rb
 - app/models/cats/core/program.rb
+- app/models/cats/core/project.rb
 - app/models/cats/core/purchase_order.rb
 - app/models/cats/core/ration.rb
 - app/models/cats/core/receipt.rb
@@ -387,6 +389,7 @@ files:
 - db/migrate/20210717032330_create_cats_core_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
 - db/migrate/20210717033223_create_cats_core_commodities.rb
 - db/migrate/20210717140855_create_cats_core_stores.rb
 - db/migrate/20210717171101_create_cats_core_stacks.rb
@@ -467,6 +470,7 @@ files:
 - spec/factories/cats/core/plan_items.rb
 - spec/factories/cats/core/plans.rb
 - spec/factories/cats/core/programs.rb
+- spec/factories/cats/core/projects.rb
 - spec/factories/cats/core/purchase_orders.rb
 - spec/factories/cats/core/rations.rb
 - spec/factories/cats/core/receipt_authorizations.rb