From f10677b4d042efe2ba8fd295f4fe9e601a656052 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Fri, 15 May 2026 09:35:53 +0700
Subject: [PATCH] update

---
 src/controllers/service_fare.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/controllers/service_fare.ts b/src/controllers/service_fare.ts
index 3570f75..1d3e658 100644
--- a/src/controllers/service_fare.ts
+++ b/src/controllers/service_fare.ts
@@ -60,16 +60,20 @@ export class ServiceFareController {
                             .select('sf."serviceId"', "serviceId")
                             .addSelect("COALESCE(MIN(sf.fare), 0)", "min")
                             .addSelect("COALESCE(MAX(sf.fare), 0)", "max")
+                            .addSelect("st.name", "service_type_name")
                             .from("service_fares", "sf")
                             .innerJoin("fare_type", "ft", 'sf."faretypeId" = ft.id AND ft.deleted_at IS NULL')
                             .innerJoin("service_classes", "sc", 'sf."serviceClassId" = sc.id AND sc.deleted_at IS NULL')
-                            .groupBy('sf."serviceId"');
+                            .innerJoin("services", "s", 'sf."serviceId" = s.id AND s.deleted_at IS NULL')
+                            .innerJoin("service_types", "st", 's."serviceTypeId" = st.id AND st.deleted_at IS NULL') // ← fix di sini
+                            .groupBy('sf."serviceId", st.name');
                     },
                     "sfa",
                     'sfa."serviceId" = Service.id'
                 )
                 .addSelect('COALESCE(sfa.min, 0)', "min_fare")
                 .addSelect('COALESCE(sfa.max, 0)', "max_fare")
+                .addSelect('sfa.service_type_name', "service_type_name")
                 .orderBy("Service." + param.order_field, param.order_direction)
                 .skip(offset)
                 .take(limit);
@@ -87,6 +91,7 @@ export class ServiceFareController {
                 ...entity,
                 min_fare: list_data.raw[index]?.min_fare ?? null,
                 max_fare: list_data.raw[index]?.max_fare ?? null,
+                service_type_name: list_data.raw[index]?.service_type_name ?? null,
             }));
 
             const count_data = CommonHelper.countObject(merged);