From b200e2cb945d7f1a3c67fd62c3563a8e65500b79 Mon Sep 17 00:00:00 2001
From: Mayank Mishra <mayank.mishra@wdimails.com>
Date: Fri, 6 Mar 2026 15:49:13 +0530
Subject: [PATCH] sending the distance in the getbyid of activity

---
 src/modules/user/services/user.service.ts | 42 ++++++++---------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/modules/user/services/user.service.ts b/src/modules/user/services/user.service.ts
index 8f5c674..68982a2 100644
--- a/src/modules/user/services/user.service.ts
+++ b/src/modules/user/services/user.service.ts
@@ -2038,28 +2038,22 @@ export class UserService {
       const userLat = userLocation?.locationLat ?? null;
       const userLng = userLocation?.locationLong ?? null;
 
-      console.log(userLat, "UserLat")
-      console.log(userLng, "UserLong")
-      console.log(activity.checkInLat, "activityCheckIn")
-      console.log(activity.checkInLong, "activityCheckLong")
+      let distance = 0;
 
-      // let distance = 0;
+      if (
+        userLat &&
+        userLng &&
+        activity?.checkInLat &&
+        activity?.checkInLong
+      ) {
+        distance = calculateDistance(
+          userLat,
+          userLng,
+          activity.checkInLat,
+          activity.checkInLong
+        )
+      };
 
-      // if (
-      //   userLat &&
-      //   userLng &&
-      //   activity?.checkInLat &&
-      //   activity?.checkInLong
-      // ) {
-      //   distance = calculateDistance(
-      //     userLat,
-      //     userLng,
-      //     activity.checkInLat,
-      //     activity.checkInLong
-      //   )
-      // };
-
-      // console.log(distance, "Distance is this")
 
       // ================= PRESIGNED URL SECTION =================
 
@@ -2233,13 +2227,7 @@ export class UserService {
         cheapestPrice,
         totalCapacity,
         rating: 0, // ⭐ Placeholder, implement rating logic as needed
-        // distance: calculateDistance(
-        //   userLat,
-        //   userLng,
-        //   activity?.checkInLat ?? null,
-        //   activity?.checkInLong ?? null
-        // ),
-        distance: 0,
+        distance: distance || 0,
         interestedUserImages
       };
     });