From accfc4b7690fb1709748accab7d6a17caec09ef4 Mon Sep 17 00:00:00 2001
From: Mayank Mishra <mayank.mishra@wdimails.com>
Date: Thu, 5 Mar 2026 16:15:15 +0530
Subject: [PATCH 1/2] sending the safety instruction and cancellations in the
 getbyid api of activity in user

---
 src/modules/user/services/user.service.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/user/services/user.service.ts b/src/modules/user/services/user.service.ts
index c8f9529..2cd0a89 100644
--- a/src/modules/user/services/user.service.ts
+++ b/src/modules/user/services/user.service.ts
@@ -1761,6 +1761,8 @@ export class UserService {
             select: {
               id: true,
               exclusiveNotes: true,
+              SafetyInstruction: true,
+              Cancellations: true,
               dosNotes: true,
               dontsNotes: true,
               tipsNotes: true,

From 4a069cc67a688ac8cefed0f2edab14c0f2ca8102 Mon Sep 17 00:00:00 2001
From: Mayank Mishra <mayank.mishra@wdimails.com>
Date: Thu, 5 Mar 2026 18:12:35 +0530
Subject: [PATCH 2/2] if there is no slot then the venue will not be sent

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

diff --git a/src/modules/user/services/user.service.ts b/src/modules/user/services/user.service.ts
index 2cd0a89..7972645 100644
--- a/src/modules/user/services/user.service.ts
+++ b/src/modules/user/services/user.service.ts
@@ -1917,6 +1917,9 @@ export class UserService {
           ActivityVenues: {
             where: {
               isActive: true,
+              ScheduleHeader: {
+                some: {}
+              }
             },
             select: {
               id: true,
@@ -1935,6 +1938,18 @@ export class UserService {
                   mediaType: true,
                 },
               },
+              ScheduleHeader: {
+                select: {
+                  id: true,
+                  scheduleType: true,
+                  startDate: true,
+                  endDate: true,
+                  earlyCheckInMins: true,
+                  bookingCutOffMins: true,
+                  effectiveFromDt: true,
+                  effectiveToDt: true,
+                }
+              },
               ActivityPrices: {
                 select: {
                   id: true,