cats_core 1.4.44 → 1.4.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba88be856ad7a27b81c7eca20c2867775d1bd9963b84d6fa4b48ddaa688008f
-  data.tar.gz: 50ed67dd7ae4dca66b27205764d13c9a72b53d4088158c09b0165c45f4bd12e2
+  metadata.gz: 6cd51ff40bb6a3dc2aa226e29abbcec7fe47e833095bfabfefbe6e32d4d15a28
+  data.tar.gz: 05726c3a11c58983b9360d9ff8cf4384927148cc67d825e9b21114c823c07e78
 SHA512:
-  metadata.gz: 2ed1ee00dbfc76d8bee529ac9e2788b83183159c8f27059b5c14fafab2129ba60b04d83bf503e5efd1e45581391f9a033d18c00ba24bdc6ca15aee3155f5706e
-  data.tar.gz: 2ed989fb152cf0488ce958c373b66b0e1dca324453d82d1ffe3139e4abca362c9926373bc6eb60e85ddb9a7901b466f07711766b682f90de3f020f01df2764df
+  metadata.gz: bea7b46396f1f5ab18cb30d0fbacaa2275f72840fd0fa0d27a0e33cab49be523eb2ddcaa5747d15bb3a5a9120987cf59ee2cae402f2d0e282d6fe72d115f7ac3
+  data.tar.gz: f7a48bf8792e57e5580a44e471a5efbf6e5a66aace12eb5b648685e7105e56b295c218ea6c7f4ad96cb31edadbe568245a3c781b16c1b483a120f777c55bee7b

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

@@ -61,7 +61,7 @@ module Cats
           :dispatchable_type,
           items: %i[
             reference_no region zone woreda fdp commodity_category unit_id unit quantity source_id destination_id
-            commodity_id
+            commodity_id commodity_status
           ]
         )
       end

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

@@ -29,6 +29,11 @@ module Cats
         end
       end
 
+      def filter
+        query = DispatchTransaction.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

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

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

@@ -25,11 +25,22 @@ module Cats
         render json: { success: true, data: serialize(woredas) }
       end
 
+      def create_fdp
+        service = LocationService.new
+        p = fdp_params
+        fdp = service.create_fdp(p[:code], p[:name], p[:parent_id], p[:description])
+        render json: { success: true, data: serialize(fdp) }
+      end
+
       private
 
       def model_params
         params.require(:payload).permit(:code, :name, :location_type, :description, :parent_id)
       end
+
+      def fdp_params
+        params.require(:payload).permit(:code, :name, :description, :parent_id)
+      end
     end
   end
 end

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

@@ -17,7 +17,7 @@ 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)
+                                        :currency_id, :description)
       end
     end
   end

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

@@ -10,6 +10,11 @@ module Cats
         end
       end
 
+      def filter
+        query = ReceiptTransaction.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -4,28 +4,59 @@ module Cats
       include Common
 
       def index
-        stores = Store.includes(:store_keeper, :stacks).where(warehouse_id: params[:id])
+        stores = Store.includes(:stacks).where(warehouse_id: params[:id])
         render json: { success: true, data: serialize(stores) }
       end
 
       def filter
-        query = Store.includes(:store_keeper, :stacks).ransack(params[:q])
+        query = Store.includes(:stacks).ransack(params[:q])
         render json: { success: true, data: serialize(query.result) }
       end
 
       def stores_for_hub
         warehouses = Location.find(params[:id]).children
         ids = warehouses.map(&:id)
-        stores = Store.includes(:store_keeper, :stacks).where(warehouse_id: ids)
+        stores = Store.includes(:stacks).where(warehouse_id: ids)
         render json: { success: true, data: serialize(stores) }
       end
 
+      def assign_store
+        store_keeper = User.find(params[:id])
+        store_keeper.details['stores'] ||= []
+        store_keeper.details['stores'] += store_params[:store_ids]
+        store_keeper.save!
+        render json: { success: true, data: serialize(store_keeper) }
+      end
+
+      def unassign_store
+        store_keeper = User.find(params[:id])
+        if store_keeper.details.key?('stores')
+          store_keeper.details['stores'] -= store_params[:store_ids]
+          render json: { success: true, data: serialize(store_keeper) }
+        else
+          render json: { success: false, error: 'User has no stores assigned.' }
+        end
+      end
+
+      def fdp
+        store = Store.find(params[:id])
+        location = store.warehouse.parent
+        if location.location_type == Location::FDP
+          render json: { success: true, data: serialize(location) }
+        else
+          render json: { success: false, error: 'No FDP is associated with store.' }
+        end
+      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)
+                                         :gangway_length, :gangway_width, :gangway_corner_dist, :warehouse_id)
+      end
+
+      def store_params
+        params.require(:payload).permit(store_ids: [])
       end
     end
   end

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

@@ -12,9 +12,9 @@ module Cats
       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)
+        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)
       end
     end
   end

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

@@ -60,7 +60,7 @@ module Cats
       def name
         # For this to be efficient, our query should use includes like
         # Commodity.includes(project: { source: commodity_category })
-        project.source.commodity_category.name
+        project.source.commodity_name
       end
 
       def validate_updateability

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

@@ -10,6 +10,10 @@ module Cats
       delegate(:reference_no, to: :plan, prefix: true, allow_nil: true)
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -75,6 +75,21 @@ module Cats
       def start
         self.dispatch_status = STARTED
         save!
+
+        # Check if destination is an FDP and create receipt authorization
+        location = dispatch_plan_item.destination
+        authorized_by = User.find_by(first_name: 'SYSTEM-USER')
+        return unless location.location_type == Location::FDP
+
+        store = location.fdp_store
+        ReceiptAuthorization.create!(
+          dispatch: self,
+          store: store,
+          quantity: quantity,
+          received_quantity: 0,
+          status: Authorization::AUTHORIZED,
+          authorized_by: authorized_by
+        )
       end
 
       def receive

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

@@ -10,6 +10,10 @@ module Cats
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -5,11 +5,10 @@ module Cats
       ZONE = 'Zone'.freeze
       WOREDA = 'Woreda'.freeze
       FDP = 'Fdp'.freeze
-      KEBELE = 'Kebele'.freeze
       HUB = 'Hub'.freeze
       WAREHOUSE = 'Warehouse'.freeze
 
-      LOCATION_TYPES = [REGION, ZONE, WOREDA, KEBELE, HUB, WAREHOUSE, FDP].freeze
+      LOCATION_TYPES = [REGION, ZONE, WOREDA, FDP, HUB, WAREHOUSE].freeze
 
       has_ancestry
 
@@ -23,10 +22,9 @@ module Cats
           REGION => [],
           ZONE => [REGION],
           WOREDA => [REGION, ZONE],
-          KEBELE => [REGION, ZONE, WOREDA],
           FDP => [REGION, ZONE, WOREDA],
-          HUB => [REGION, ZONE, WOREDA, KEBELE],
-          WAREHOUSE => [REGION, ZONE, WOREDA, KEBELE, HUB]
+          HUB => [REGION, ZONE, WOREDA, FDP],
+          WAREHOUSE => [REGION, ZONE, WOREDA, FDP, HUB]
         }
 
         return if location_type.nil? || location_type.empty?
@@ -46,6 +44,12 @@ module Cats
         # wrong type of parent to our location.
         errors.add(:location, "cannot have #{parent.location_type} as parent")
       end
+
+      def fdp_store
+        return nil unless location_type == FDP
+
+        Store.find_by(code: "FDP-ST-#{code}")
+      end
     end
   end
 end

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

@@ -18,6 +18,10 @@ module Cats
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :unit, prefix: true)
       delegate(:code, to: :currency, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -21,7 +21,8 @@ module Cats
       validates :stack_status, inclusion: { in: STACK_STATUSES }
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
                :validate_space_between_stack, :validate_max_height, :validate_max_length, :validate_max_width,
-               :validate_distance_from_ceiling, unless: -> { store && store.code == 'SUP-STORE' }
+               :validate_distance_from_ceiling,
+               unless: -> { store && (store.code == 'SUP-STORE' || store.code.start_with?('FDP-ST')) }
 
       delegate :batch_no, to: :commodity, prefix: true
 

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

@@ -2,7 +2,6 @@ module Cats
   module Core
     class Store < ApplicationRecord
       belongs_to :warehouse, class_name: 'Cats::Core::Location'
-      belongs_to :store_keeper, class_name: 'Cats::Core::User'
       has_many :stacks
 
       validates :code, :name, :length, :width, :height, presence: true
@@ -17,7 +16,6 @@ module Cats
       validate :validate_location
 
       before_create :update_usable_space
-      after_save :update_store_keeper
 
       def validate_location
         return if warehouse.nil?
@@ -25,33 +23,11 @@ module Cats
         errors.add(:warehouse, 'must be a valid warehouse') unless warehouse.location_type == Location::WAREHOUSE
       end
 
-      def store_keeper_name
-        "#{store_keeper.first_name} #{store_keeper.last_name}"
-      end
-
       def update_usable_space
         self.usable_space = (length - 2) * (width - 2)
         self.usable_space -= (gangway_length * gangway_width) if has_gangway
         self.available_space = self.usable_space
       end
-
-      def update_store_keeper
-        return unless store_keeper_id_previously_changed?
-
-        unless id_previously_changed?
-          old_storekeeper = Cats::Core::User.find(store_keeper_id_previously_was)
-          old_storekeeper.details['stores'].delete(id)
-          old_storekeeper.save
-        end
-        if store_keeper.details.key?('stores')
-          store_keeper.details['stores'] << id
-        else
-          store_keeper.details['stores'] = [id]
-        end
-        store_keeper.save
-      end
-
-      delegate(:phone_number, to: :store_keeper, prefix: true)
     end
   end
 end

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

@@ -14,6 +14,10 @@ module Cats
       delegate(:name, to: :received_commodity, prefix: true)
       delegate(:abbreviation, to: :issued_unit, prefix: true)
       delegate(:abbreviation, to: :received_unit, prefix: true)
+
+      def commodity_name
+        received_commodity.name
+      end
     end
   end
 end

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

@@ -1,9 +1,8 @@
 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
+      attributes :id, :code, :name, :length, :width, :height, :temporary, :has_gangway, :gangway_length,
+                 :gangway_width, :gangway_corner_dist, :warehouse_id
 
       has_many :stacks
     end

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

@@ -24,9 +24,42 @@ module Cats
         statuses = authorization.dispatch.receipt_authorizations.map(&:driver_confirmed).uniq
         authorization.dispatch.receive if statuses.length == 1 && statuses[0]
 
+        # Create destination stack and transaction for FDP
+        location = authorization.dispatch.dispatch_plan_item.destination
+        if location.location_type == Location::FDP
+          create_stack(authorization_id)
+          stack(authorization_id)
+        end
+
         authorization
       end
 
+      # A method to create stack and stack transactions for FDP
+      def create_stack(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        commodity = authorization.dispatch.dispatch_plan_item.commodity
+        stack = Stack.create!(
+          code: commodity.batch_no,
+          length: 100,
+          width: 100,
+          height: 100,
+          start_x: 2,
+          start_y: 2,
+          commodity: commodity,
+          store: authorization.store,
+          commodity_status: Commodity::GOOD,
+          stack_status: Stack::ALLOCATED
+        )
+        ReceiptTransaction.create!(
+          receipt_authorization: authorization,
+          destination: stack,
+          quantity: authorization.received_quantity,
+          status: Transaction::DRAFT,
+          transaction_date: Date.today
+        )
+        stack
+      end
+
       def stack(authorization_id)
         authorization = ReceiptAuthorization.find(authorization_id)
         unless authorization.dispatch.dispatch_status == Dispatch::RECEIVED
@@ -43,6 +76,23 @@ module Cats
         authorization.dispatch.stack
         authorization
       end
+
+      def receipt_authorization(id)
+        item = DispatchPlanItem.find(id).includes(
+          :destination,
+          :unit,
+          commodity: { project: :source }
+        )
+        {
+          date: Date.today,
+          reference_no: item.reference_no,
+          destination: item.destination.name,
+          source: item.commodity.project.source.description,
+          commodity: "#{item.commodity.project.source.commodity_name} (#{item.commodity.batch_no})",
+          unit: item.unit.abbreviation,
+          quantity: item.quantity
+        }
+      end
     end
   end
 end

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

@@ -0,0 +1,25 @@
+module Cats
+  module Core
+    class LocationService
+      # This method creates FDP from location params, but also creates the
+      # related dummy warehouse and store for the FDP
+      def create_fdp(code, name, parent_id, description = nil)
+        ActiveRecord::Base.transaction do
+          fdp = Location.create!(
+            code: code, name: name, description: description, location_type: Location::FDP, parent_id: parent_id
+          )
+          wh_code = "FDP-WH-#{fdp.code}"
+          st_code = "FDP-ST-#{fdp.code}"
+
+          warehouse = Location.create!(
+            code: wh_code, name: wh_code, location_type: Location::WAREHOUSE, parent: fdp
+          )
+          Store.create!(
+            code: st_code, name: st_code, length: 200, width: 200, height: 200, warehouse: warehouse
+          )
+          fdp
+        end
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -41,6 +41,7 @@ Cats::Core::Engine.routes.draw do
 
   get '/regions/:id/woredas', controller: :locations, action: :woredas, as: :region_woredas
   post '/locations/filter', controller: :locations, action: :filter
+  post '/locations/fdp/create', controller: :locations, action: :create_fdp
   resources :locations, except: %i[destroy] do
     member do
       get 'children'
@@ -142,6 +143,18 @@ Cats::Core::Engine.routes.draw do
     action: :storekeeper_authorizations,
     as: :storekeeper_receipt_authorizations
   )
+  post(
+    '/storekeeper/:id/assign_stores',
+    controller: :stores,
+    action: :assign_store,
+    as: :assign_stores_to_storekeeper
+  )
+  post(
+    '/storekeeper/:id/unassign_stores',
+    controller: :stores,
+    action: :unassign_store,
+    as: :unassign_stores_to_storekeeper
+  )
   post(
     '/receipt_authorizations/generate',
     controller: :receipt_authorizations,
@@ -167,7 +180,9 @@ Cats::Core::Engine.routes.draw do
     action: :create_allocation,
     as: :allocation_transaction
   )
+  post '/dispatch_transactions/filter', controller: :dispatch_transactions, action: :filter
   resources :dispatch_transactions, except: %i[index new edit destroy]
+  post '/receipt_transactions/filter', controller: :receipt_transactions, action: :filter
   resources :receipt_transactions, except: %i[index new edit destroy]
   resources :lost_commodities, except: %i[index destroy]
   get '/plans/:id/round_plans', controller: :round_plans, action: :index, as: :round_plans_plan
@@ -198,6 +213,10 @@ Cats::Core::Engine.routes.draw do
 
   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]
+  resources :stores, only: %i[index show create update] do
+    member do
+      get 'fdp'
+    end
+  end
   post '/stores/filter', controller: :stores, action: :filter
 end

data/db/migrate/20210717032855_create_cats_core_purchase_orders.rb

@@ -2,6 +2,7 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_purchase_orders do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.date :order_date, null: false
       t.string :requisition_no
       t.string :supplier, null: false

data/db/migrate/20210717140855_create_cats_core_stores.rb

@@ -17,10 +17,7 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'warehouse_on_stores_indx' },
                    foreign_key: { to_table: :cats_core_locations }
-      t.references :store_keeper,
-                   null: false,
-                   index: { name: 'store_keeper_on_store_indx' },
-                   foreign_key: { to_table: :cats_core_users }
+
       t.timestamps
     end
   end

data/db/migrate/20220626063501_create_cats_core_loans.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreLoans < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_loans do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :lender, null: false
       t.date :agreement_date, null: false
       t.date :repayment_date

data/db/migrate/20220626063757_create_cats_core_swaps.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreSwaps < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_swaps do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :swapper, null: false
       t.date :agreement_date, null: false
       t.float :issued_quantity, null: false

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.44'.freeze
+    VERSION = '1.4.48'.freeze
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
     reference_no { FFaker::Name.name }
     source factory: :location
-    destination factory: :location
+    destination factory: :woreda
     dispatch_plan
     quantity { 100 }
     unit factory: :unit_of_measure

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :loan, class: 'Cats::Core::Loan' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     lender { FFaker::Name.name }
     agreement_date { Date.today }
     repayment_date { agreement_date.next_month }

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

@@ -19,6 +19,15 @@ FactoryBot.define do
   factory :fdp, parent: :woreda, class: 'Cats::Core::Location' do
     location_type { Cats::Core::Location::FDP }
     parent factory: :woreda
+
+    trait :with_store do
+      after(:create) do |obj|
+        wh_code = "FDP-WH-#{obj.code}"
+        st_code = "FDP-ST-#{obj.code}"
+        warehouse = create(:warehouse, code: wh_code, name: wh_code, parent: obj)
+        create(:store, code: st_code, name: st_code, warehouse: warehouse)
+      end
+    end
   end
 
   factory :hub, parent: :location, class: 'Cats::Core::Location' do

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :purchase_order, class: 'Cats::Core::PurchaseOrder' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     order_date { Date.today }
     requisition_no { FFaker::Name.name }
     supplier { FFaker::Name.name }

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

@@ -11,7 +11,5 @@ FactoryBot.define do
     gangway_width { 4 }
     gangway_corner_dist { 18 }
     warehouse
-    store_keeper factory: :user
-    store_keeper_id { create(:user).id }
   end
 end

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :swap, class: 'Cats::Core::Swap' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     swapper { FFaker::Name.name }
     agreement_date { Date.yesterday }
     issued_commodity factory: :commodity_category

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.44
+  version: 1.4.48
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -377,6 +377,7 @@ files:
 - app/services/cats/core/beneficiary_service.rb
 - app/services/cats/core/dispatch_plan_service.rb
 - app/services/cats/core/dispatch_service.rb
+- app/services/cats/core/location_service.rb
 - app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb
 - app/services/cats/core/round_plan_service.rb