cats_core 1.4.16 → 1.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36927796d66593ac4278b63814fe55f4410c43505830d3f19f82838fd2847401
-  data.tar.gz: b9f46292e06d38bae7f0acf358d39621bafed44f5d1f0741aedfcd457c9b6801
+  metadata.gz: 4f2cc951417c8b5c1586ad4deb540c51e54177eac53c54a689f31c35bfbfbb67
+  data.tar.gz: f25cbb325f2eb8b8c9081ec0660b3c3028fe45ee0b7f003c40e96c91cdfebd15
 SHA512:
-  metadata.gz: dfaa8320d2d0c180c6cb8bffe62b0fc2aaa13df1fc9eb0d25719985223fe3605e665568ec17594f043b939fa94654a6b8be78a2db7e0317171f506d8bc19013f
-  data.tar.gz: 50f77f7c891f56390c90702887d6ad5bade3bd145451a6cc3d1b262da70e895417f81de0c43d6c742bbd39be2f7e43011fa336eb2844e8b8ad7fe5af5ff1efb9
+  metadata.gz: 610169114a8fd878d1fd47b771f55a5bfef3e79c3d660b8148642a8fd9def6e018f4cea2b6cda50ee381970f2bee3e9e98ff5d5f0a3f66436d340b8334e4bf75
+  data.tar.gz: b0d90834aba82fd86dfb53bd6b51a875ff1131c4a3096813d6132efc860915e89ea4dd63c7272518158af8c0d21b355557e055b86d08938e82f063ce743a8f0a

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.rb

@@ -10,6 +10,8 @@ module Cats
       validates :full_name, :age, :gender, presence: true
       validates :gender, inclusion: { in: GENDERS }
       validates :age, numericality: { greater_than: 0, less_than: 100 }
+
+      delegate(:name, to: :beneficiary_category, prefix: true)
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Cats
 
       validates :code, :name, presence: true
       validates :code, uniqueness: true
+
+      delegate(:reference_no, to: :plan, prefix: true)
     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/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.16'.freeze
+    VERSION = '1.4.19'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.16
+  version: 1.4.19
 platform: ruby
 authors:
 - Henock L.