dscf-marketplace 0.2.94 → 0.2.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d9e2b9c6d302c05aba856c7add2d572e6c48c763b29022c165c32fb0ae6d39
-  data.tar.gz: c1a4ed98de21d1ae80ce116f9db768e24e43baa4785896c9bcbb62bfcfb604e3
+  metadata.gz: 337301146588e5fb9301adbb623f086e2cbc44ab193247ef22095868e2bcfc6e
+  data.tar.gz: 07f2f4c37075de27e77f71f09043aae1ef6e67ac0d8b9cb3ec6c13a87aad6b43
 SHA512:
-  metadata.gz: f88c9ecdd32d85066805cb205d3eb7e28df0f540d27ab6c9ecdfada565b3b068f3bb9ded7bdaae8c3d7f73581c4684633579da25b606c8460cf068c0075a26b3
-  data.tar.gz: ae10f6ddcdb722a28ecf61d00152984cbf20523bbf23fc33c385ea5378e1e22935304c636ff18e86e7f6fec2f33704def9a92087b43b33a71c809d5728660a57
+  metadata.gz: 6953d8e4c94403e5856d6f6095ad6891886d186c5f69a12c86c002974fb90c07f4f21b12051aaac77443b1830334b509da64b97f712e2bd21f97c395358a2c46
+  data.tar.gz: 3e3e8c5b5d5f627a186ba00c07559c73716410bafc426f18ec140d427b5171ee39d49dc28d0914b164bd4df2dae3a173ca13e184933bc30c2a0122cd2c319232

data/app/controllers/dscf/marketplace/delivery_vehicles_controller.rb

@@ -3,24 +3,102 @@ module Dscf
     class DeliveryVehiclesController < ApplicationController
       include Dscf::Core::Common
 
+      def create
+        vehicle = @clazz.new(model_params.except(:vehicle_license, :driver_license))
+        if vehicle.save
+          # Handle vehicle license upload
+          if params[:delivery_vehicle][:vehicle_license].present?
+            document = Dscf::Core::Document.new(
+              documentable: vehicle,
+              document_type: :business_license
+            )
+            document.file.attach(params[:delivery_vehicle][:vehicle_license])
+            document.save!
+          end
+
+          # Handle driver license upload
+          if params[:delivery_vehicle][:driver_license].present?
+            driver_document = Dscf::Core::Document.new(
+              documentable: vehicle.driver,
+              document_type: :drivers_license
+            )
+            driver_document.file.attach(params[:delivery_vehicle][:driver_license])
+            driver_document.save!
+          end
+
+          vehicle = @clazz.includes(eager_loaded_associations).find(vehicle.id) if eager_loaded_associations.present?
+          includes = serializer_includes_for_action(:create)
+          options = {include: includes} if includes.present?
+          render_success(data: vehicle, serializer_options: options, status: :created)
+        else
+          render_error(errors: vehicle.errors.full_messages[0], status: :unprocessable_entity)
+        end
+      rescue => e
+        render_error(error: e.message)
+      end
+
+      def update
+        vehicle = @clazz.find(params[:id])
+        if vehicle.update(model_params.except(:vehicle_license, :driver_license))
+          # Handle vehicle license update/replacement
+          if params[:delivery_vehicle][:vehicle_license].present?
+            # Remove existing vehicle license if any
+            vehicle.documents.where(document_type: :business_license).destroy_all
+
+            # Add new vehicle license
+            document = Dscf::Core::Document.new(
+              documentable: vehicle,
+              document_type: :business_license
+            )
+            document.file.attach(params[:delivery_vehicle][:vehicle_license])
+            document.save!
+          end
+
+          # Handle driver license update/replacement
+          if params[:delivery_vehicle][:driver_license].present?
+            # Remove existing driver license if any
+            vehicle.driver.documents.where(document_type: :drivers_license).destroy_all
+
+            # Add new driver license
+            driver_document = Dscf::Core::Document.new(
+              documentable: vehicle.driver,
+              document_type: :drivers_license
+            )
+            driver_document.file.attach(params[:delivery_vehicle][:driver_license])
+            driver_document.save!
+          end
+
+          vehicle = @clazz.includes(eager_loaded_associations).find(vehicle.id) if eager_loaded_associations.present?
+          includes = serializer_includes_for_action(:update)
+          options = {include: includes} if includes.present?
+          render_success(data: vehicle, serializer_options: options)
+        else
+          render_error(errors: vehicle.errors.full_messages[0], status: :unprocessable_entity)
+        end
+      rescue => e
+        render_error(error: e.message)
+      end
+
       private
 
       def model_params
         params.require(:delivery_vehicle).permit(
-          :driver_id, :plate_number, :vehicle_type, :year, :brand, :model, :color
+          :driver_id, :plate_number, :vehicle_type, :year, :brand, :model, :color,
+          vehicle_license: :file,
+          driver_license: :file
         )
       end
 
       def eager_loaded_associations
-        [ :driver, :delivery_orders ]
+        [ :driver, :delivery_orders, :documents ]
       end
 
       def default_serializer_includes
         {
-          index: [ :driver ],
-          show: [ :driver, :delivery_orders ],
-          create: [ :driver ],
-          update: [ :driver ]
+          index: [ :driver, :documents ],
+          show: [ :driver, :delivery_orders, :documents ],
+          create: [ :driver, :documents ],
+          update: [ :driver, :documents ]
         }
       end
     end

data/app/models/dscf/marketplace/delivery_vehicle.rb

@@ -5,6 +5,7 @@ module Dscf
 
       belongs_to :driver, class_name: "Dscf::Core::User"
       has_many :delivery_orders, dependent: :nullify
+      has_many :documents, as: :documentable, class_name: "Dscf::Core::Document"
 
       validates :driver_id, presence: true
       validates :plate_number, presence: true, uniqueness: true
@@ -20,7 +21,7 @@ module Dscf
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[driver delivery_orders]
+        %w[driver delivery_orders documents]
       end
 
       def motorcycle?
@@ -65,6 +66,14 @@ module Dscf
         return 0 if total_deliveries.zero?
         (completed_deliveries.count.to_f / total_deliveries * 100).round(2)
       end
+
+      def vehicle_license
+        documents.find_by(document_type: :business_license)
+      end
+
+      def driver_license
+        driver.documents.find_by(document_type: :drivers_license)
+      end
     end
   end
 end

data/app/serializers/dscf/marketplace/delivery_vehicle_serializer.rb

@@ -5,8 +5,9 @@ module Dscf
         :model, :color, :created_at, :updated_at, :display_name,
         :total_deliveries, :success_rate
 
-      belongs_to :driver
+      belongs_to :driver, serializer: Dscf::Marketplace::UserSerializer
       has_many :delivery_orders
+      has_many :documents, each_serializer: Dscf::Marketplace::DocumentSerializer
     end
   end
 end

data/app/serializers/dscf/marketplace/document_serializer.rb

@@ -2,6 +2,10 @@ module Dscf
   module Marketplace
     class DocumentSerializer < ActiveModel::Serializer
       attributes :id, :document_type, :file_url, :is_verified, :verified_at, :created_at, :updated_at
+
+      def file_url
+        object.file_url
+      end
     end
   end
 end

data/app/serializers/dscf/marketplace/user_serializer.rb

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class UserSerializer < ActiveModel::Serializer
+      attributes :id, :email, :phone, :verified_at, :temp_password, :created_at, :updated_at
+
+      has_many :documents, each_serializer: Dscf::Marketplace::DocumentSerializer
+    end
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.94".freeze
+    VERSION = "0.2.96".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.94
+  version: 0.2.96
 platform: ruby
 authors:
 - Asrat
@@ -468,6 +468,7 @@ files:
 - app/serializers/dscf/marketplace/supplier_product_serializer.rb
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
+- app/serializers/dscf/marketplace/user_serializer.rb
 - app/services/dscf/marketplace/my_resource_service.rb
 - app/services/dscf/marketplace/rfq_response_service.rb
 - config/environments/production.rb