dscf-marketplace 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0582ea15ed7f2ed54a2de719fb3ad10fc370ba4f0970f8f4eddce28fcaeb691e'
-  data.tar.gz: 613ed7646eba81daace3b5fe0e77fad4eab6eaff70e2213b2650526482b94b5c
+  metadata.gz: a36cea2c52f86ddd9e201a684e5392883e7e9ea75b9f8a51de3ee205f9868883
+  data.tar.gz: 79743b73e332628ca62d6dcb139c8340f6ffebd681a81a0e158b29afadee7185
 SHA512:
-  metadata.gz: 7e42ed4742f2fd0e28d1e57bea40e74c6994c21e90977383818abe83feb26e8e94ee69aa9d9851371570c7f1bc9c05b9cd28290aa5036b7e2b1f622a4f94475d
-  data.tar.gz: f32221713776581a14b6a98ca6459dec58fb4e27e020c0f49709191b7ace5be5f5d515a712e6c9ce01b14f48a704be46f935f53ded5d049e1502490faddeb3c2
+  metadata.gz: a6efaf45a41ce405b3f433b1b475ea75e362abaa4eae679b66e7087a1bdb0856ce8f8f1f516deeabdf9a8138ea48a831a102cdd5eaaca2290725f5c81ab407d5
+  data.tar.gz: 9dc8436d4ff38cad70ae33fdea699deb8af22aaac6263d47986995d14bbacb98ca6a247b5e6f4c4c01fa2da1d6a5722f6424a639468dad3c013ab9816246eaae

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

@@ -40,11 +40,16 @@ module Dscf
         businesses = service.my_businesses(params)
 
         options = {
-          include: default_serializer_includes[:index] || [],
+          include: [ :business_type, :user, :documents, {reviews: {reviewed_by: :user_profile}} ],
           meta: {resource_type: "my_businesses"}
         }
 
-        render_success("businesses.success.index", data: businesses, serializer_options: options)
+        # Manually serialize to ensure reviews are included
+        serialized = businesses.map do |business|
+          BusinessSerializer.new(business, options).as_json
+        end
+
+        render_success(data: serialized, meta: {resource_type: "my_businesses"})
       end
 
       private
@@ -90,20 +95,6 @@ module Dscf
       def allowed_order_columns
         %w[id name description contact_email contact_phone tin_number created_at updated_at]
       end
-
-      def render_success(message = nil, data: nil, serializer_options: {}, status: :ok)
-        # Ensure reviews are included in serializer options for business-related responses
-        unless serializer_options[:include]&.any? { |inc| inc.is_a?(Hash) && inc.key?(:reviews) }
-          if action_name == "index" || action_name == "my_businesses"
-            includes = default_serializer_includes[:index] || []
-            serializer_options = serializer_options.merge(include: includes)
-          elsif action_name == "show"
-            includes = default_serializer_includes[:show] || []
-            serializer_options = serializer_options.merge(include: includes)
-          end
-        end
-        super
-      end
     end
   end
 end

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

@@ -7,8 +7,11 @@ module Dscf
       belongs_to :business_type
       belongs_to :user
       has_many :documents
+      has_many :reviews, serializer: ReviewSerializer
 
-      has_many :reviews, serializer: Dscf::Core::ReviewSerializer
+      def reviews
+        object.reviews.includes(reviewed_by: :user_profile)
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ReviewSerializer < ActiveModel::Serializer
+      attributes :id, :context, :status, :feedback, :reviewed_at, :created_at, :updated_at
+
+      attribute :reviewed_by do
+        if object.reviewed_by
+          UserSerializer.new(object.reviewed_by).as_json
+        end
+      end
+    end
+  end
+end

data/app/services/dscf/marketplace/my_resource_service.rb

@@ -28,7 +28,7 @@ module Dscf
       end
 
       def my_businesses(params = {})
-        @current_user.businesses.includes(:business_type, :user, :documents)
+        @current_user.businesses.includes(:business_type, :user, :documents, reviews: {reviewed_by: :user_profile})
       end
 
       def my_listings(params = {})

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.5.2".freeze
+    VERSION = "0.5.3".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Asrat
@@ -464,6 +464,7 @@ files:
 - app/serializers/dscf/marketplace/quotation_item_serializer.rb
 - app/serializers/dscf/marketplace/quotation_serializer.rb
 - app/serializers/dscf/marketplace/request_for_quotation_serializer.rb
+- app/serializers/dscf/marketplace/review_serializer.rb
 - app/serializers/dscf/marketplace/rfq_item_serializer.rb
 - app/serializers/dscf/marketplace/supplier_product_serializer.rb
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb