cats_core 1.4.17 → 1.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41699f66a4650b220cf3d02f028da8baade6d675d25f06823342d8fb11287309
-  data.tar.gz: a1e7903ad574573c09a87df11fc67ca133546abee2a44efd3e2d12cd0d44982f
+  metadata.gz: d78b456ef9b9082680246207509f81b33ba4c9584136bafc00ac1dd9085e77cb
+  data.tar.gz: f1138cb24c4f94d7c42dd84b15916762c1f27c321531b1057f2b9e96a2da5c75
 SHA512:
-  metadata.gz: a32b2685361ee616976123043970cf782d6180ac5b5d1d885ed3bf78dc4a36774ae004fc5640dd0fa50223f522c5c009a7be3ffb988c3edd05f7e454119e950b
-  data.tar.gz: 4cf9dcd0928eeaec7bceb628cb21486263b07f426cb9846ae587c8112eec488e938a1735ebac5d7338a5a65cea507d15223a9a7eb2499575348106b893dc3acc
+  metadata.gz: 74b5f1fc12c9851dd07224c07b6a00912d44012f2347f87b3264cad20882f5950b9d27d9820c3c0b1526e26f32dfb83ee16263d77b4bcf2efdcd8f5ca30aaef9
+  data.tar.gz: 349b6c6a81040bf195ea723e9920f97711be1dce7c4257a5c7f03459d4b0cebd3d59ae650265ed952791c85330891df00d51c621c81c4948c85819f30ce07903

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

@@ -8,11 +8,34 @@ module Cats
         render json: { success: true, data: serialize(query.result) }
       end
 
+      def bulk_create
+        p = bulk_create_params
+        source = Location.find(p[:source_id])
+        destinations = Location.where(id: p[:destination_ids]).pluck(:id, :name)
+        data = p[:destination_ids].each_with_object([]) do |id, res|
+          destination_name = destinations.find { |d| d[0] == id }[1]
+          res << {
+            region_id: p[:region_id],
+            source_id: p[:source_id],
+            destination_id: id,
+            name: "#{source.name} - #{destination_name}"
+          }
+        end
+
+        result = Route.insert_all!(data, record_timestamps: true)
+        routes = Route.where(id: result.rows.flatten)
+        render json: { success: true, data: serialize(routes) }
+      end
+
       private
 
       def model_params
         params.require(:payload).permit(:region_id, :source_id, :destination_id)
       end
+
+      def bulk_create_params
+        params.require(:payload).permit(:region_id, :source_id, destination_ids: [])
+      end
     end
   end
 end

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

@@ -7,6 +7,8 @@ module Cats
 
       validates :beneficiaries, presence: true, numericality: { greater_than: 0 }
       validates :plan_item_id, uniqueness: { scope: :beneficiary_category_id }
+
+      delegate(:name, to: :beneficiary_category, prefix: true)
     end
   end
 end

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

@@ -59,7 +59,7 @@ module Cats
           # Commit transactions
           dispatch_transactions.each(&:commit)
           self.quantity = total_quantity
-          self.dispatch_status = Dispatch::APPROVED
+          self.dispatch_status = APPROVED
           save!
         end
       end
@@ -67,7 +67,7 @@ module Cats
       def start
         raise(StandardError, 'Dispatch has to be approved first.') unless dispatch_status == Dispatch::APPROVED
 
-        self.dispatch_status = Dispatch::STARTED
+        self.dispatch_status = STARTED
         save!
       end
 
@@ -83,12 +83,32 @@ module Cats
         end
 
         Dispatch.transaction do
-          self.dispatch_status = Dispatch::RECEIVED
+          self.dispatch_status = RECEIVED
           receipts.each { |r| r.status = Receipt::CONFIRMED }
           save!
           receipts.each(&:save!)
         end
       end
+
+      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, ARRIVED, UNLOADED]
+                             )
+        dispatches.map do |dispatch|
+          {
+            batch_no: batch_no,
+            commodity_name: commodity.name,
+            quantity: dispatch.total_quantity,
+            unit: commodity.unit_abbreviation,
+            location: dispatch.transporter.name,
+            location_detail: "Plate No.: #{dispatch.plate_no}, Driver: #{dispatch.driver_name}",
+            stack: ''
+          }
+        end
+      end
     end
   end
 end

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

@@ -146,6 +146,25 @@ module Cats
 
         store.save
       end
+
+      def self.search_commodity(batch_no)
+        commodity = Commodity.find_by(batch_no: batch_no)
+        stacks = Stack.joins(:commodity, store: :warehouse).where(
+          commodity: { batch_no: batch_no },
+          stack_status: Stack::ALLOCATED
+        )
+        stacks.map do |stack|
+          {
+            batch_no: batch_no,
+            commodity_name: commodity.name,
+            quantity: stack.quantity,
+            unit: commodity.unit_abbreviation,
+            location: stack.store.warehouse.name,
+            location_detail: stack.store.name,
+            stack: stack.code
+          }
+        end
+      end
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Cats
 
       validates :status, presence: true, inclusion: { in: STATUSES }
       validates :order_date, presence: true
-      validate :validate_against_requisition
+      validate :validate_against_requisition, :validate_status
 
       delegate(:full_name, to: :prepared_by, prefix: true)
       delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
@@ -26,6 +26,30 @@ module Cats
 
         errors.add(:transport_requisition, 'is not approved.')
       end
+
+      def validate_status
+        return unless status
+
+        return if status == DRAFT
+
+        return if transport_order_items.count.positive?
+
+        errors.add(:status, 'cannot be set to "APPROVED" because the order has no items.') if status == APPROVED
+      end
+
+      def approve(user)
+        raise(StandardError, 'Transport order is already approved.') if status == APPROVED
+
+        begin
+          self.status = APPROVED
+          self.approved_by = user
+          save!
+          self
+        rescue ActiveRecord::RecordInvalid => e
+          error = e.record.errors.full_messages_for(:status)[0]
+          raise(StandardError, error)
+        end
+      end
     end
   end
 end

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

@@ -26,11 +26,12 @@ module Cats
         quantities.sum
       end
 
-      def approve
+      def approve(user)
         raise(StandardError, 'Transport requisition is already approved.') if status == APPROVED
 
         begin
           self.status = APPROVED
+          self.approved_by = user
           save!
           self
         rescue ActiveRecord::RecordInvalid => e

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

@@ -9,6 +9,7 @@ module Cats
 
       delegate(:reference_no, to: :transport_requisition, prefix: 'requisition')
       delegate(:abbreviation, to: :unit, prefix: true)
+      delegate(:source_name, to: :dispatch_plan_item, prefix: false)
 
       def commodity_name
         dispatch_plan_item.commodity.source.commodity_category.name
@@ -17,6 +18,10 @@ module Cats
       def woreda
         dispatch_plan_item.destination.name
       end
+
+      def region
+        dispatch_plan_item.destination.root.name
+      end
     end
   end
 end

data/config/routes.rb

@@ -80,6 +80,7 @@ Cats::Core::Engine.routes.draw do
   resources :transporters, except: %i[destroy]
 
   post '/routes/filter', controller: :routes, action: :filter
+  post '/routes/bulk_create', controller: :routes, action: :bulk_create
   resources :routes, except: %i[destroy]
 
   post '/dispatch_plans/filter', controller: :dispatch_plans, action: :filter

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.17'.freeze
+    VERSION = '1.4.20'.freeze
   end
 end

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

@@ -3,5 +3,6 @@ FactoryBot.define do
     region factory: :location
     source factory: :woreda
     destination factory: :woreda
+    name { "#{source.name} - #{destination.name}" }
   end
 end

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

@@ -9,8 +9,9 @@ FactoryBot.define do
 
     trait :approved do
       after(:create) do |requisition|
+        user = create(:user)
         create(:transport_requisition_item, transport_requisition: requisition)
-        requisition.approve
+        requisition.approve(user)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.4.20
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers