cats_core 1.4.30 → 1.4.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4956ad89bea4861d95aaffc40534eab2b319009d2a10f2762e9b1ee6b68b60e
-  data.tar.gz: 6d5aaf08e18bb95e8fd09c0957bbfeb982df76c1061f1b001028f1e91a1ac8ff
+  metadata.gz: e34b55e4d9cc5537027134594fd2f39946cd9b1001ab3a3d20c24109402a7797
+  data.tar.gz: 2437a6f18cab7ce976653738467dd0849182281f2fb1e5b2e832390538adf112
 SHA512:
-  metadata.gz: 88a42101e62d3a13b23a905bcc06852115797cd3a0e160ae7204510777cb494b03f108500f7e0c5201439695ac084d737f903c619a4e1fc9d0e926ceec7aa396
-  data.tar.gz: 7de9d35e696f2b2421cefa54da0e706b0826b3c63389eff498d4e0964f354cf61f7ae3eb4baba80f16b214b405615a2adcd3c2c19f1e97649a6fe4313c7b598f
+  metadata.gz: a574e2522a5d9c2ba8257ee18c5217023c23e7b6f5d69dddd9dc0d81f9169a697afc6fde167f4b41a36fd861f78abc7a3b3ad156859a1e49dc1bf412dab771e4
+  data.tar.gz: f1d30af5df117fb71047df56a7602024df16270e2531c94e65acf1f77e58fe56f3a895e64c14d6629ae88ce0b48f1a4aa3e3095c2bb5872cda31d44ad0c52a16

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

@@ -19,7 +19,7 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id,
+        params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :source_id, :commodity_grade,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
                                         :arrival_status, :shipping_reference)
       end

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

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

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

@@ -0,0 +1,32 @@
+module Cats
+  module Core
+    class StoresController < ApplicationController
+      include Common
+
+      def index
+        stores = Cats::Core::Store.where(warehouse_id: params[:id])
+        render json: { success: true, data: serialize(stores) }
+      end
+
+      def filter
+        query = Store.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
+      def stores_for_hub
+        warehouses = Cats::Core::Location.find(params[:id]).children
+        ids = warehouses.map(&:id)
+        stores = Cats::Core::Store.where(warehouse_id: ids)
+        render json: { success: true, data: serialize(stores) }
+      end
+
+      private
+
+      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,
+                                         :store_keeper_id)
+      end
+    end
+  end
+end

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

@@ -7,6 +7,12 @@ module Cats
       ALLOCATED = 'Allocated'.freeze
       STATUSES = [DRAFT, APPROVED, ALLOCATED].freeze
 
+      # Grades
+      GRADE1 = 'Grade1'.freeze
+      GRADE2 = 'Grade2'.freeze
+      GRADE3 = 'Grade3'.freeze
+      COMMODITY_GRADES = [GRADE1, GRADE2, GRADE3].freeze
+
       # Commodity statuses
       GOOD = 'Good'.freeze
       DAMAGED = 'Damaged'.freeze
@@ -37,6 +43,7 @@ module Cats
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
       validates :arrival_status, presence: true, inclusion: { in: ARRIVAL_STATUSES }
       validates :status, presence: true, inclusion: { in: STATUSES }
+      validates :commodity_grade, inclusion: { in: COMMODITY_GRADES }, allow_nil: true
       validate :validate_updateability, on: :update
 
       delegate(:abbreviation, to: :unit_of_measure, prefix: 'unit')

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

@@ -20,6 +20,8 @@ module Cats
       has_many :beneficiary_plan_items, through: :plan_items
       has_many :plan_item_details, through: :beneficiary_plan_items
 
+      delegate(:code, to: :program, prefix: true)
+
       validates :reference_no, :year, :status, presence: true
       validates :total_days, :rounds, presence: true, numericality: { greater_than: 0 }
       validates :season, presence: true, inclusion: { in: SEASONS }

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

@@ -4,6 +4,7 @@ module Cats
       belongs_to :receipt_authorization
 
       validates :commodity_status, presence: true, inclusion: { in: Commodity::COMMODITY_STATUSES }
+      validates :commodity_grade, inclusion: { in: Commodity::COMMODITY_GRADES }, allow_nil: true
       validates :quantity, presence: true, numericality: { greater_than: 0 }
     end
   end

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

@@ -26,6 +26,7 @@ module Cats
 
       delegate(:reference_no, to: :plan, prefix: true)
       delegate(:name, to: :region, prefix: true)
+      delegate(:program_code, to: :plan)
 
       def request_reference
         reference_no

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

@@ -3,7 +3,7 @@ module Cats
     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
+                 :arrival_status, :status, :shipping_reference, :commodity_grade
     end
   end
 end

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

@@ -2,7 +2,8 @@ module Cats
   module Core
     class ReceiptAuthorizationSerializer < ActiveModel::Serializer
       attributes :id, :dispatch_id, :dispatch_reference_no, :store_id, :store_name, :quantity, :received_quantity,
-                 :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details
+                 :remark, :status, :authorized_by_id, :authorizer_full_name, :auth_details, :plate_no, :driver_name,
+                 :dispatch_status
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Cats
   module Core
     class ReceiptSerializer < ActiveModel::Serializer
-      attributes :id, :receipt_authorization_id, :commodity_status, :quantity, :remark
+      attributes :id, :receipt_authorization_id, :commodity_status, :commodity_grade, :quantity, :remark
     end
   end
 end

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

@@ -1,7 +1,8 @@
 module Cats
   module Core
     class RoundPlanSerializer < ActiveModel::Serializer
-      attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :rounds
+      attributes :id, :reference_no, :status, :plan_id, :plan_reference_no, :region_id, :region_name, :rounds,
+                 :program_code
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class StoreSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :store_keeper_name, :store_keeper_phone_number, :length, :width, :height,
+                 :temporary, :has_gangway, :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id,
+                 :store_keeper_id
+
+      has_many :stacks
+    end
+  end
+end

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

@@ -48,12 +48,10 @@ module Cats
             quantity: ration.quantity,
             unit_of_measure_id: ration.unit_of_measure_id,
             round_plan_id: round_plan.id,
-            no_of_days: ration.no_of_days,
-            created_at: Date.today,
-            updated_at: Date.today
+            no_of_days: ration.no_of_days
           }
         end
-        Cats::Core::RoundRation.insert_all!(round_rations)
+        Cats::Core::RoundRation.insert_all!(round_rations, record_timestamps: true)
         plan_items = Cats::Core::PlanItem.where(plan_id: plan_id, region_id: region_id)
         ben_plan_items = Cats::Core::BeneficiaryPlanItem.where(plan_item: plan_items)
         round_plan_items = plan_items.map do |plan_item|
@@ -87,8 +85,18 @@ module Cats
         round_plan
       end
 
+      # This method deletes beneficiary round plan items based on the selection of the
+      # user in a given round.
+      #
+      # Params:
+      #   plan_id => The id of the round plan.
+      #   ids => A list of beneficiary round plan item ids to delete.
+      #
+      # When deleting the selected beneficiary round plan items, if the corresponding
+      # round plan item becomes empty, then it too should be deleted.
+      #
       def remove_items(plan_id, ids)
-        raise(StandardError, 'No plan items specified.') if ids.count.zero?
+        raise(StandardError, 'No beneficiary plan items specified.') if ids.count.zero?
 
         begin
           plan = Cats::Core::RoundPlan.find(plan_id)
@@ -96,12 +104,33 @@ module Cats
           raise(StandardError, 'Round plan not found.') unless plan
         end
 
-        plans = Cats::Core::RoundPlan.includes(:round_plan_items).where(round_plan_items: { id: ids })
-        raise(StandardError, 'Plan items should be from the same plan.') if plans.count > 1
+        plans = Cats::Core::RoundPlan.includes(:beneficiary_round_plan_items)
+                                     .where(beneficiary_round_plan_items: { id: ids })
+        raise(StandardError, 'Round plan items should be from the same plan.') if plans.count > 1
 
-        raise(StandardError, 'Items are not from the given round plan.') unless 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
+
+        to_delete = Cats::Core::BeneficiaryRoundPlanItem.where(id: ids)
+        keys = to_delete.map(&:round_plan_item_id).uniq
+
+        item_counts = Cats::Core::BeneficiaryRoundPlanItem.where(round_plan_item_id: keys)
+                                                          .group(:round_plan_item_id).count
+
+        delete_hash = {}
+        keys.each { |k| delete_hash[k] = [] }
+        to_delete.each { |td| delete_hash[td.round_plan_item_id] << td.id }
+
+        parent_ids = []
+        child_ids = []
+        delete_hash.each_key do |key|
+          child_ids += delete_hash[key]
+          parent_ids << key if delete_hash[key].count == item_counts[key]
+        end
 
-        Cats::Core::RoundPlanItem.delete_by(id: ids)
+        Cats::Core::BeneficiaryRoundPlanItem.delete_by(id: child_ids) if child_ids.count.positive?
+        Cats::Core::RoundPlanItem.delete_by(id: parent_ids) if parent_ids.count.positive?
         plan
       end
 

data/config/routes.rb

@@ -169,4 +169,9 @@ Cats::Core::Engine.routes.draw do
   get '/receipts/:id/stacks', controller: :stacks, action: :receipt_stacks, as: :receipt_stacks
   get '/dispatches/:id/stacks', controller: :stacks, action: :dispatch_stacks, as: :dispatch_stacks
   resources :stacks, only: %i[show index create update]
+
+  get '/warehouses/:id/stores', controller: :stores, action: :index, as: :stores_warehouse
+  get '/hubs/:id/stores', controller: :stores, action: :stores_for_hub, as: :stores_hub
+  resources :stores, only: %i[index show create update]
+  post '/stores/filter', controller: :stores, action: :filter
 end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -14,6 +14,7 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
       t.string :arrival_status, null: false, default: 'At Source'
       t.boolean :approved, null: false, default: false
       t.string :shipping_reference
+      t.string :commodity_grade
 
       t.timestamps
     end

data/db/migrate/20210727105834_create_cats_core_receipts.rb

@@ -6,6 +6,7 @@ class CreateCatsCoreReceipts < ActiveRecord::Migration[7.0]
                    index: { name: 'ra_on_receipts_indx' },
                    foreign_key: { to_table: :cats_core_receipt_authorizations }
       t.string :commodity_status, null: false
+      t.string :commodity_grade
       t.float :quantity, null: false
       t.string :remark
 

data/db/migrate/20220107125025_create_cats_core_round_plan_items.rb

@@ -4,7 +4,7 @@ class CreateCatsCoreRoundPlanItems < ActiveRecord::Migration[6.1]
       t.references :round_plan,
                    null: false,
                    index: { name: 'mp_on_mpi_indx' },
-                   foreign_key: { to_table: :cats_core_round_plans }
+                   foreign_key: { to_table: :cats_core_round_plans, on_delete: :cascade }
       t.references :region,
                    null: false,
                    index: { name: 'region_on_round_plan_items_indx' },

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.30'.freeze
+    VERSION = '1.4.33'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.30
+  version: 1.4.33
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -252,6 +252,7 @@ files:
 - app/controllers/cats/core/routes_controller.rb
 - 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/transporters_controller.rb
 - app/controllers/cats/core/unit_conversions_controller.rb
 - app/controllers/cats/core/unit_of_measures_controller.rb
@@ -348,6 +349,7 @@ files:
 - app/serializers/cats/core/round_plan_serializer.rb
 - 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/transporter_serializer.rb
 - app/serializers/cats/core/unit_conversion_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb