cats_core 1.5.19 → 1.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0a7b1c5b85319ee7dbeee051bc4e934a0d37d0e7fc1605f0e15adbf5f0640e
-  data.tar.gz: 4eee6bb631559b0a984aa3b3feb55bd0668c8780ea95b066be7b8f705a4e67df
+  metadata.gz: 3f009c7cb5782eac61ebe0e03b07db78fd40bfd88bdbe690b047bd3abf5ab3d6
+  data.tar.gz: 9985511c1fd14c0e3dc5d9764a2bd7842fc556c916f3d0b0ef629d5d6bc9f617
 SHA512:
-  metadata.gz: 19064ad4da0b187b85339ebc515d0a210bd28159189cde3fd647a5d1b3f4f32ed71eb2fdd58c4cf4c58bb3d1c6f72d6f3370c485bb984bebb30565d7c1ef4e18
-  data.tar.gz: d497e8b77728f310660af1b684650cffe13f7294d613640a776de1df5ad69e3de021a7b8cf4b48a0a99c2a7ab0a7593d73695f65129c7735078f56773f7162bc
+  metadata.gz: 663bc3e411d28fab8c1bfa5a18d5932aa81a4968f47602813382dd7e5082ba0e40d726de954427b0fb27b402900bbb8e12f86a1196c3e9ab726da91c860f5822
+  data.tar.gz: f532090a4b59dcecbe2b122bc3b941df3be5e5e64e2c6208569f4d7f181ba3feaa0e0c251e517878d0dd26a344aa7375f5307ed24fdc802d3426c31058f98cc0

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

@@ -13,7 +13,7 @@ module Cats
         commodity = Commodity.find(params[:id])
         result = commodity.approve
         render json: {success: result, data: serialize(commodity)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -26,8 +26,8 @@ module Cats
 
       def model_params
         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, :package_unit_id)
+                                        :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
+                                        :arrival_status, :shipping_reference, :package_unit_id)
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Cats
         authorization = DispatchAuthorization.find(params[:id])
         authorization = authorization.confirm
         render json: {success: true, data: serialize(authorization)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -33,9 +33,9 @@ module Cats
         storekeeper = User.find(params[:id])
         stores = storekeeper.stores
         authorizations = DispatchAuthorization.joins(:dispatch)
-          .includes(:dispatch, :store, :authorized_by, :unit)
-          .where(store: stores, dispatch: {dispatch_status: Dispatch::APPROVED})
-          .reverse_order
+                                              .includes(:dispatch, :store, :authorized_by, :unit)
+                                              .where(store: stores, dispatch: {dispatch_status: Dispatch::APPROVED})
+                                              .reverse_order
         render json: {success: true, data: serialize(authorizations)}
       end
 

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

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

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

@@ -23,7 +23,7 @@ module Cats
         service = DispatchPlanService.new
         plan = service.create(model_params, current_user)
         render json: {success: true, data: serialize(plan)}, status: :created
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}, status: :unprocessable_entity
       end
 
@@ -44,7 +44,7 @@ module Cats
         plan = DispatchPlan.find(params[:id])
         plan = service.approve(plan)
         render json: {success: true, data: serialize(plan)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 

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

@@ -38,7 +38,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:source_id, :dispatch_authorization_id, :transaction_date, :quantity, :unit_id,
-          :reference_no)
+                                        :reference_no)
       end
     end
   end

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

@@ -30,21 +30,21 @@ module Cats
         dispatch = set_object
         dispatch.approve
         render json: {success: true, data: serialize(dispatch)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def start
         dispatch = @service.start(set_object)
         render json: {success: true, data: serialize(dispatch)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def start_with_pin
         dispatch = @service.start_with_pin(params[:id], start_with_pin_params[:pin])
         render json: {success: true, data: serialize(dispatch)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -52,7 +52,7 @@ module Cats
         dispatch = set_object
         dispatch.confirm
         render json: {success: true, data: serialize(dispatch)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -84,7 +84,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:reference_no, :dispatch_plan_item_id, :transporter_id, :plate_no, :unit_id,
-          :driver_name, :driver_phone, :remark)
+                                        :driver_name, :driver_phone, :remark)
       end
 
       def start_with_pin_params

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

@@ -13,7 +13,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:reference_no, :description, :lender, :agreement_date, :repayment_date,
-          :quantity, :unit_id, :commodity_category_id)
+                                        :quantity, :unit_id, :commodity_category_id)
       end
     end
   end

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

@@ -16,8 +16,8 @@ module Cats
 
       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, :description)
+                                        :commodity_category_id, :quantity, :purchase_type, :unit_id, :price,
+                                        :currency_id, :description)
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Cats
         authorization = ReceiptAuthorization.find(params[:id])
         authorization.confirm
         render json: {success: true, data: serialize(authorization)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -35,7 +35,7 @@ module Cats
           params[:id], driver_confirm_params[:pin], driver_confirm_params[:receipt_number]
         )
         render json: {success: true, data: serialize(authorization)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -44,7 +44,7 @@ module Cats
         authorization = ReceiptAuthorization.find(params[:id])
         authorization = service.stack(authorization.id)
         render json: {success: true, data: serialize(authorization)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -53,7 +53,7 @@ module Cats
         status = params[:status]
         stores = storekeeper.stores
         authorizations = ReceiptAuthorization.includes(:dispatch, :store, :authorized_by, :unit)
-          .where(store: stores, status: status)
+                                             .where(store: stores, status: status)
         render json: {success: true, data: serialize(authorizations)}
       end
 
@@ -71,7 +71,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:dispatch_id, :store_id, :quantity, :unit_id, :remark, :status,
-          :authorized_by_id)
+                                        :authorized_by_id)
       end
 
       def driver_confirm_params

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

@@ -6,7 +6,7 @@ module Cats
       def index
         super do
           ReceiptTransaction.includes(:destination, {receipt_authorization: :dispatch}, :unit)
-            .where(receipt_authorization_id: params[:id])
+                            .where(receipt_authorization_id: params[:id])
         end
       end
 
@@ -19,7 +19,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:receipt_authorization_id, :receipt_number, :destination_id,
-          :transaction_date, :quantity, :unit_id)
+                                        :transaction_date, :quantity, :unit_id)
       end
     end
   end

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

@@ -13,7 +13,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:receipt_authorization_id, :commodity_status, :commodity_grade, :quantity,
-          :unit_id, :remark, :reference_no)
+                                        :unit_id, :remark, :reference_no)
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Cats
       def index
         super do
           Role.joins(:application_module)
-            .where(cats_core_application_modules: {prefix: params[:prefix]})
+              .where(cats_core_application_modules: {prefix: params[:prefix]})
         end
       end
 

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

@@ -5,8 +5,8 @@ module Cats
 
       def index
         beneficiaries = RoundBeneficiary.joins(:round_plan_item)
-          .where(round_plan_item: {round_plan_id: params[:id]})
-          .includes(:beneficiary, :commodity_category, :unit)
+                                        .where(round_plan_item: {round_plan_id: params[:id]})
+                                        .includes(:beneficiary, :commodity_category, :unit)
         render json: {success: true, data: serialize(beneficiaries)}
       end
 
@@ -14,7 +14,7 @@ module Cats
         service = BeneficiaryService.new
         result = service.generate_distribution_list(params[:id])
         render json: {success: result}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -27,7 +27,7 @@ module Cats
         service = BeneficiaryService.new
         result = service.remove_items(params[:id], common_params[:ids])
         render json: {success: result}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -35,7 +35,7 @@ module Cats
         service = BeneficiaryService.new
         result = service.confirm_receipt(params[:id], common_params[:ids])
         render json: {success: result}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 

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

@@ -20,7 +20,7 @@ module Cats
       def approve
         plan = @service.approve(params[:id])
         render json: {success: true, data: serialize(plan)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}, status: :unprocessable_entity
       end
 
@@ -33,14 +33,14 @@ module Cats
       def generate_round_needs
         plan = @service.generate_round_needs(params[:id])
         render json: {success: true, data: serialize(plan)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def remove_items
         plan = @service.remove_items(params[:id], remove_params[:ids])
         render json: {success: true, data: serialize(plan)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 

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

@@ -6,7 +6,7 @@ module Cats
       def index
         super do
           StackTransaction.joins({source: :store}, :unit)
-            .where(cats_core_stacks: {cats_core_stores: {warehouse_id: params[:id]}})
+                          .where(cats_core_stacks: {cats_core_stores: {warehouse_id: params[:id]}})
         end
       end
 

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

@@ -44,7 +44,7 @@ module Cats
         stack = set_object
         stack.destroy_stack
         render json: {success: true, data: serialize(stack)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e}
       end
 
@@ -52,7 +52,7 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:code, :length, :width, :height, :start_x, :start_y, :commodity_id, :store_id,
-          :commodity_status, :stack_status, :quantity, :unit_id)
+                                        :commodity_status, :stack_status, :quantity, :unit_id)
       end
     end
   end

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

@@ -54,7 +54,7 @@ module Cats
 
       def model_params
         params.require("payload").permit(:id, :code, :name, :length, :width, :height, :temporary, :has_gangway,
-          :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id)
+                                         :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id)
       end
 
       def store_params

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

@@ -13,8 +13,8 @@ module Cats
 
       def model_params
         params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id, :description,
-          :issued_quantity, :received_commodity_id, :received_quantity, :issued_unit_id,
-          :received_unit_id)
+                                        :issued_quantity, :received_commodity_id, :received_quantity, :issued_unit_id,
+                                        :received_unit_id)
       end
     end
   end

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

@@ -48,7 +48,7 @@ module Cats
         user = service.change_password(email, old_pass, new_pass, confirmation)
 
         render json: {success: true, data: serialize(user)}
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e}
       end
 

data/app/controllers/concerns/cats/core/common.rb

@@ -10,10 +10,10 @@ module Cats
 
       def index
         data = if block_given?
-          yield
-        else
-          @clazz.all
-        end
+                 yield
+               else
+                 @clazz.all
+               end
         render json: {success: true, data: serialize(data)}
       end
 
@@ -23,31 +23,31 @@ module Cats
 
       def create
         obj = if block_given?
-          yield
-        else
-          @clazz.new(model_params)
-        end
+                yield
+              else
+                @clazz.new(model_params)
+              end
         if obj.save
           render json: {success: true, data: serialize(obj)}, status: :created
         else
           render json: {success: false, error: obj.errors.full_messages[0]}, status: :unprocessable_entity
         end
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def update
         obj = if block_given?
-          yield
-        else
-          obj = @obj
-        end
+                yield
+              else
+                obj = @obj
+              end
         if obj.update(model_params)
           render json: {success: true, data: serialize(obj)}
         else
           render json: {success: false, error: obj.errors.full_messages[0]}, status: :unprocessable_entity
         end
-      rescue => e
+      rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
@@ -66,8 +66,7 @@ module Cats
       end
 
       # This class should be overridden by respective child controllers
-      def model_params
-      end
+      def model_params; end
     end
   end
 end

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

@@ -52,7 +52,7 @@ module Cats
       def transactions
         return dispatch_transactions if instance_of?(DispatchAuthorization)
 
-        return receipt_transactions if instance_of?(ReceiptAuthorization)
+        receipt_transactions if instance_of?(ReceiptAuthorization)
       end
 
       def confirm

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

@@ -10,7 +10,7 @@ module Cats
 
       validates :rounds, presence: true, numericality: {greater_than: 0}, if: :psnp?
       validates :rounds_served, presence: true, numericality: {greater_than_or_equal_to: 0}, allow_nil: true,
-        if: :psnp?
+                                if: :psnp?
       validates :rounds, :rounds_served, absence: true, unless: :psnp?
       validate :validate_rounds
 

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

@@ -24,7 +24,7 @@ module Cats
       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
+                            UNDERWEIGHT_PACKAGE].freeze
 
       # Arrival Statuses
       AT_SOURCE = "At Source".freeze
@@ -109,19 +109,23 @@ module Cats
         UnitConversion.harmonized_total(requests, unit_of_measure)
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        [
-          "arrival_status",
-          "batch_no",
-          "best_use_before",
-          "commodity_grade",
-          "package_unit_id",
-          "project_id",
-          "quantity",
-          "shipping_reference",
-          "status"
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          arrival_status
+          batch_no
+          best_use_before
+          commodity_grade
+          package_unit_id
+          project_id
+          quantity
+          shipping_reference
+          status
         ]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[package_unit project unit_of_measure]
+      end
     end
   end
 end

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

@@ -15,12 +15,12 @@ module Cats
         left, right = ratio.split(":")
         left_correct = begin
           Integer(left).is_a?(Integer)
-        rescue
+        rescue StandardError
           false
         end
         right_correct = begin
           Integer(right).is_a?(Integer)
-        rescue
+        rescue StandardError
           false
         end
 

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

@@ -102,10 +102,10 @@ module Cats
       def self.search_commodity(batch_no)
         commodity = Commodity.find_by(batch_no: batch_no)
         dispatches = Dispatch.includes(:dispatch_transactions)
-          .joins(:transporter)
-          .where(
-            dispatch_status: [APPROVED, STARTED]
-          )
+                             .joins(:transporter)
+                             .where(
+                               dispatch_status: [APPROVED, STARTED]
+                             )
         dispatches.map do |dispatch|
           {
             batch_no: batch_no,
@@ -119,18 +119,31 @@ module Cats
         end
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        [
-          "commodity_status",
-          "dispatch_plan_item_id",
-          "dispatch_status",
-          "driver_name",
-          "driver_phone",
-          "plate_no",
-          "prepared_by_id",
-          "quantity",
-          "transporter_id",
-          "unit_id"
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          commodity_status
+          dispatch_plan_item_id
+          dispatch_status
+          driver_name
+          driver_phone
+          plate_no
+          prepared_by_id
+          quantity
+          transporter_id
+          unit_id
+        ]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[
+          prepared_by
+          transporter
+          dispatch_plan_item
+          unit
+          dispatch_authorizations
+          receipt_authorizations
+          dispatch_transactions
+          receipt_transactions
         ]
       end
     end

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

@@ -31,7 +31,7 @@ module Cats
 
         commodity = dispatch.dispatch_plan_item.commodity
         stacks = Stack.where(store: store, commodity: commodity)
-        if stacks.count == 0
+        if stacks.count.zero?
           errors.add(:store, "does not contain commodity #{commodity.batch_no}.")
           return
         end
@@ -44,8 +44,12 @@ module Cats
         errors.add(:quantity, "exceeds available quantity in store by #{diff} #{unit.abbreviation}.") if diff.positive?
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        ["authorized_by_id", "dispatch_id", "quantity", "status", "store_id", "unit_id"]
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[authorized_by_id dispatch_id quantity status store_id unit_id]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[dispatch_transactions]
       end
     end
   end

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

@@ -67,12 +67,20 @@ module Cats
         dispatchable.region.name
       end
 
-      def self.ransackable_attributes(auth_object = nil)
-        [
-          "approved_by_id",
-          "prepared_by_id",
-          "status",
-          "upstream"
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          approved_by_id
+          prepared_by_id
+          status
+          upstream
+        ]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[
+          dispatchable
+          reported_by
+          approved_by
         ]
       end
     end