dscf-marketplace 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e78e06c64d774042664b8ba02e9d5ac6f0a7b1edc2dd8b621740b5a3f5f3258
-  data.tar.gz: 22a32b77cadface2b85a415d35db9093feb9fb48d4b2912757fb2c957e5b85cc
+  metadata.gz: 70882435873ee86597be2d46062d0f957ccfbf839e41c5b65a8fe7ec9cbedca2
+  data.tar.gz: 2c4c404bac6fec1acac34345399219c50cfb1b996394b581d9c99f804704e07a
 SHA512:
-  metadata.gz: a02541d7065df2625c9794c2f1b7457dd8b9d69c1047f5a28c6cd40142c2c55cce3dfaa727b16128db5687d1ecfad756d5325366088265e8e17cdf278032159d
-  data.tar.gz: bca014066a994dd65a3a32cb04be0d84eb2fcf2a2d076af52213b140bfd22920825ec091a037734acdcf3770b7f6a1a60ad9cca4c309751cdeb620e298f11d41
+  metadata.gz: d388ab9e9a400904a630f43ac2cc63c4f7f0e12302b4a7000f3e48a4d7155e2a3bf3a904e2685b8c9f32ecf0de00111950e7ccc858d8413504cc56318c758657
+  data.tar.gz: 9d556b6d0adc478bcf4bed2db6c46f25b34e8c2f29caf2b640111648e826dd9237dc877104af9d18b8a4e03136ec3db6ff24f9fcc8acd9d625f40b36e77893c7

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

@@ -42,14 +42,21 @@ module Dscf
         service = MyResourceService.new(current_user)
         businesses = service.my_businesses(params)
 
+        # Ensure reviewed_by is loaded for reviews
+        businesses.each do |business|
+          business.reviews.each do |review|
+            review.reviewed_by
+          end
+        end
+
         options = {
-          include: [ :business_type, :user, :documents, {reviews: {reviewed_by: :user_profile}} ],
+          include: [ :business_type, :user, :documents, {reviews: :reviewed_by} ],
           meta: {resource_type: "my_businesses"}
         }
 
         # Manually serialize to ensure reviews are included
         serialized = businesses.map do |business|
-          BusinessSerializer.new(business, options).as_json
+          Dscf::Core::BusinessSerializer.new(business, options).as_json
         end
 
         render_success(data: serialized, meta: {resource_type: "my_businesses"})
@@ -67,7 +74,7 @@ module Dscf
       def eager_loaded_associations
         [
           :business_type, :user, :documents,
-          reviews: {reviewed_by: :user_profile}
+          reviews: :reviewed_by
         ]
       end
 
@@ -76,20 +83,20 @@ module Dscf
           index: [
             :business_type, :user, :documents,
             {
-              reviews: {reviewed_by: :user_profile}
+              reviews: :reviewed_by
             }
           ],
           show: [
             :business_type, :user, :documents,
             {
-              reviews: {reviewed_by: :user_profile}
+              reviews: :reviewed_by
             }
           ],
           create: [ :business_type, :user, :documents, :reviews ],
           update: [
             :business_type, :user, :documents,
             {
-              reviews: {reviewed_by: :user_profile}
+              reviews: :reviewed_by
             }
           ]
         }

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

@@ -11,7 +11,7 @@ module Dscf
 
       def thumbnail_url
           if object.thumbnail.attached?
-            ActiveStorage::Current.set(url_options: {host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api/marketplace"}) do
+            ActiveStorage::Current.set(url_options: {host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api"}) do
               object.thumbnail.url
             end
           end
@@ -19,7 +19,7 @@ module Dscf
 
         def image_urls
           if object.images.attached?
-            ActiveStorage::Current.set(url_options: {host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api/marketplace"}) do
+            ActiveStorage::Current.set(url_options: {host: "dscf.bitscollege.edu.et", protocol: "https", script_name: "/api"}) do
               object.images.map(&:url)
             end
           else

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, reviews: {reviewed_by: :user_profile})
+        @current_user.businesses.includes(:business_type, :user, :documents, reviews: :reviewed_by)
       end
 
       def my_listings(params = {})

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.5.7".freeze
+    VERSION = "0.5.9".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-10-12 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -451,7 +451,6 @@ files:
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
-- app/serializers/dscf/marketplace/business_serializer.rb
 - app/serializers/dscf/marketplace/category_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_serializer.rb
@@ -464,7 +463,6 @@ 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

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

@@ -1,13 +0,0 @@
-module Dscf
-  module Marketplace
-    class BusinessSerializer < ActiveModel::Serializer
-      attributes :id, :name, :description, :contact_email, :contact_phone,
-        :tin_number, :created_at, :updated_at
-
-      belongs_to :business_type
-      belongs_to :user
-      has_many :documents
-      has_many :reviews, serializer: Dscf::Core::ReviewSerializer
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-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