Merge branch 'Split-lambda' of http://git.wdipl.com/Mayank.Mishra/MinglarBackendNestJS into mayankSprint2

prepopulate change
Made getUserItineraryDetails api for the prepopulate data of itinerary page in mobile
2026-03-16 11:30:53 +05:30 · 2026-03-16 11:19:54 +05:30 · 2026-03-15 20:33:45 +05:30 · 2026-03-13 17:31:29 +05:30 · 2026-03-13 17:30:27 +05:30 · 2026-03-13 17:27:51 +05:30
100 changed files with 17315 additions and 3118 deletions
--- a/62
+++ b/62
@@ -1,62 +0,0 @@
-# Multi-stage build for NestJS Serverless Application
-FROM node:18-alpine AS builder
-
-# Set working directory
-WORKDIR /app
-
-# Copy package files
-COPY package*.json ./
-COPY prisma ./prisma/
-
-# Install dependencies
-RUN npm ci --only=production && npm cache clean --force
-
-# Copy source code
-COPY . .
-
-# Generate Prisma client
-RUN npx prisma generate
-
-# Build the application
-RUN npm run build
-
-# Production stage
-FROM node:18-alpine AS production
-
-# Set working directory
-WORKDIR /app
-
-# Install serverless framework globally
-RUN npm install -g serverless
-
-# Copy package files
-COPY package*.json ./
-
-# Install production dependencies
-RUN npm ci --only=production && npm cache clean --force
-
-# Copy built application
-COPY --from=builder /app/dist ./dist
-COPY --from=builder /app/prisma ./prisma
-COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
-
-# Copy serverless configuration
-COPY serverless*.yml ./
-
-# Create non-root user
-RUN addgroup -g 1001 -S nodejs
-RUN adduser -S nestjs -u 1001
-
-# Change ownership
-RUN chown -R nestjs:nodejs /app
-USER nestjs
-
-# Expose port
-EXPOSE 3000
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost:3000/health || exit 1
-
-# Start the application
-CMD ["npm", "run", "start:prod"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,86 +0,0 @@
-version: '3.8'
-
-services:
-  # PostgreSQL Database
-  postgres:
-    image: postgres:15-alpine
-    container_name: nestjs-postgres
-    restart: unless-stopped
-    environment:
-      POSTGRES_DB: nestjs_user_crud
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-    networks:
-      - nestjs-network
-
-  # Redis for caching (optional)
-  redis:
-    image: redis:7-alpine
-    container_name: nestjs-redis
-    restart: unless-stopped
-    ports:
-      - "6379:6379"
-    volumes:
-      - redis_data:/data
-    networks:
-      - nestjs-network
-
-  # NestJS Application
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      target: production
-    container_name: nestjs-app
-    restart: unless-stopped
-    ports:
-      - "3000:3000"
-    environment:
-      NODE_ENV: development
-      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/nestjs_user_crud?schema=public
-      JWT_SECRET: docker-jwt-secret-key
-      JWT_EXPIRES_IN: 7d
-      API_PREFIX: api/v1
-      API_VERSION: 1.0.0
-      THROTTLE_TTL: 60
-      THROTTLE_LIMIT: 10
-      CORS_ORIGIN: http://localhost:3000
-    depends_on:
-      - postgres
-      - redis
-    networks:
-      - nestjs-network
-    volumes:
-      - ./src:/app/src
-      - ./prisma:/app/prisma
-
-  # Prisma Studio
-  prisma-studio:
-    image: node:18-alpine
-    container_name: nestjs-prisma-studio
-    restart: unless-stopped
-    ports:
-      - "5555:5555"
-    environment:
-      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/nestjs_user_crud?schema=public
-    working_dir: /app
-    volumes:
-      - .:/app
-    command: sh -c "npm install && npx prisma generate && npx prisma studio --hostname 0.0.0.0"
-    depends_on:
-      - postgres
-    networks:
-      - nestjs-network
-
-volumes:
-  postgres_data:
-  redis_data:
-
-networks:
-  nestjs-network:
-    driver: bridge
--- a/init.sql
+++ b/init.sql
@@ -1,19 +0,0 @@
-- Initialize database for NestJS Serverless Application
-- This file is executed when the PostgreSQL container starts
-
-- Create database if it doesn't exist
-SELECT 'CREATE DATABASE nestjs_user_crud'
-WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'nestjs_user_crud')\gexec
-
-- Connect to the database
-\c nestjs_user_crud;
-
-- Create extensions if needed
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-
-- Set timezone
-SET timezone = 'UTC';
-
-- Create a user for the application (optional)
-- CREATE USER nestjs_user WITH PASSWORD 'nestjs_password';
-- GRANT ALL PRIVILEGES ON DATABASE nestjs_user_crud TO nestjs_user;
--- a/insertCities.js
+++ b/insertCities.js
@@ -0,0 +1,53 @@
+import { PrismaClient } from '@prisma/client';
+import fs from 'fs';
+import path from 'path';
+
+const prisma = new PrismaClient();
+
+async function insertCities() {
+  try {
+    const statesFolder = path.join(process.cwd(), 'states-cities');
+    const files = fs.readdirSync(statesFolder);
+
+    for (const file of files) {
+      if (!file.endsWith('.json')) continue;
+
+      const stateName = file.replace('.json', '');
+
+      const state = await prisma.states.findFirst({
+        where: { stateName },
+      });
+
+      if (!state) {
+        console.log(`❌ State not found: ${stateName}`);
+        continue;
+      }
+
+      const filePath = path.join(statesFolder, file);
+      const citiesData = JSON.parse(
+        fs.readFileSync(filePath, 'utf-8')
+      );
+
+      await prisma.cities.createMany({
+        data: citiesData.map((city) => ({
+          stateXid: state.id,
+          cityName:
+            typeof city === 'string'
+              ? city.trim()
+              : city.cityName.trim(),
+        })),
+        skipDuplicates: true,
+      });
+
+      console.log(`✅ ${stateName} cities inserted`);
+    }
+
+    console.log('🎉 All cities inserted successfully');
+  } catch (error) {
+    console.error('Error inserting cities:', error);
+  } finally {
+    await prisma.$disconnect();
+  }
+}
+
+insertCities();
--- a/layers/prisma/nodejs/package-lock.json
+++ b/layers/prisma/nodejs/package-lock.json
@@ -15,23 +15,21 @@
      }
    },
    "node_modules/@prisma/adapter-pg": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@prisma/adapter-pg/-/adapter-pg-7.0.1.tgz",
-      "integrity": "sha512-01GpPPhLMoDMF4ipgfZz0L87fla/TV/PBQcmHy+9vV1ml6gUoqF8dUIRNI5Yf2YKpOwzQg9sn8C7dYD1Yio9Ug==",
-      "license": "Apache-2.0",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@prisma/adapter-pg/-/adapter-pg-7.2.0.tgz",
+      "integrity": "sha512-euIdQ13cRB2wZ3jPsnDnFhINquo1PYFPCg6yVL8b2rp3EdinQHsX9EDdCtRr489D5uhphcRk463OdQAFlsCr0w==",
      "dependencies": {
-        "@prisma/driver-adapter-utils": "7.0.1",
+        "@prisma/driver-adapter-utils": "7.2.0",
        "pg": "^8.16.3",
        "postgres-array": "3.0.4"
      }
    },
    "node_modules/@prisma/client": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.0.1.tgz",
-      "integrity": "sha512-O74T6xcfaGAq5gXwCAvfTLvI6fmC3and2g5yLRMkNjri1K8mSpEgclDNuUWs9xj5AwNEMQ88NeD3asI+sovm1g==",
-      "license": "Apache-2.0",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.2.0.tgz",
+      "integrity": "sha512-JdLF8lWZ+LjKGKpBqyAlenxd/kXjd1Abf/xK+6vUA7R7L2Suo6AFTHFRpPSdAKCan9wzdFApsUpSa/F6+t1AtA==",
      "dependencies": {
-        "@prisma/client-runtime-utils": "7.0.1"
+        "@prisma/client-runtime-utils": "7.2.0"
      },
      "engines": {
        "node": "^20.19 || ^22.12 || >=24.0"
@@ -50,31 +48,27 @@
      }
    },
    "node_modules/@prisma/client-runtime-utils": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@prisma/client-runtime-utils/-/client-runtime-utils-7.0.1.tgz",
-      "integrity": "sha512-R26BVX9D/iw4toUmZKZf3jniM/9pMGHHdZN5LVP2L7HNiCQKNQQx/9LuMtjepbgRqSqQO3oHN0yzojHLnKTGEw==",
-      "license": "Apache-2.0"
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client-runtime-utils/-/client-runtime-utils-7.2.0.tgz",
+      "integrity": "sha512-dn7oB53v0tqkB0wBdMuTNFNPdEbfICEUe82Tn9FoKAhJCUkDH+fmyEp0ClciGh+9Hp2Tuu2K52kth2MTLstvmA=="
    },
    "node_modules/@prisma/debug": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.0.1.tgz",
-      "integrity": "sha512-5+25XokVeAK2Z2C9W457AFw7Hk032Q3QI3G58KYKXPlpgxy+9FvV1+S1jqfJ2d4Nmq9LP/uACrM6OVhpJMSr8w==",
-      "license": "Apache-2.0"
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-7.2.0.tgz",
+      "integrity": "sha512-YSGTiSlBAVJPzX4ONZmMotL+ozJwQjRmZweQNIq/ER0tQJKJynNkRB3kyvt37eOfsbMCXk3gnLF6J9OJ4QWftw=="
    },
    "node_modules/@prisma/driver-adapter-utils": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@prisma/driver-adapter-utils/-/driver-adapter-utils-7.0.1.tgz",
-      "integrity": "sha512-sBbxm/yysHLLF2iMAB+qcX/nn3WFgsiC4DQNz0uM6BwGSIs8lIvgo0u8nR9nxe5gvFgKiIH8f4z2fgOEMeXc8w==",
-      "license": "Apache-2.0",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@prisma/driver-adapter-utils/-/driver-adapter-utils-7.2.0.tgz",
+      "integrity": "sha512-gzrUcbI9VmHS24Uf+0+7DNzdIw7keglJsD5m/MHxQOU68OhGVzlphQRobLiDMn8CHNA2XN8uugwKjudVtnfMVQ==",
      "dependencies": {
-        "@prisma/debug": "7.0.1"
+        "@prisma/debug": "7.2.0"
      }
    },
    "node_modules/pg": {
      "version": "8.16.3",
      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
-      "license": "MIT",
      "dependencies": {
        "pg-connection-string": "^2.9.1",
        "pg-pool": "^3.10.1",
@@ -101,20 +95,17 @@
      "version": "1.2.7",
      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
-      "license": "MIT",
      "optional": true
    },
    "node_modules/pg-connection-string": {
      "version": "2.9.1",
      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
-      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
-      "license": "MIT"
+      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w=="
    },
    "node_modules/pg-int8": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
-      "license": "ISC",
      "engines": {
        "node": ">=4.0.0"
      }
@@ -123,7 +114,6 @@
      "version": "3.10.1",
      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
-      "license": "MIT",
      "peerDependencies": {
        "pg": ">=8.0"
      }
@@ -131,14 +121,12 @@
    "node_modules/pg-protocol": {
      "version": "1.10.3",
      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
-      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
-      "license": "MIT"
+      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ=="
    },
    "node_modules/pg-types": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "license": "MIT",
      "dependencies": {
        "pg-int8": "1.0.1",
        "postgres-array": "~2.0.0",
@@ -154,7 +142,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "license": "MIT",
      "engines": {
        "node": ">=4"
      }
@@ -163,7 +150,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
-      "license": "MIT",
      "dependencies": {
        "split2": "^4.1.0"
      }
@@ -172,16 +158,14 @@
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.4.tgz",
      "integrity": "sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==",
-      "license": "MIT",
      "engines": {
        "node": ">=12"
      }
    },
    "node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "license": "MIT",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
+      "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
      "engines": {
        "node": ">=0.10.0"
      }
@@ -190,7 +174,6 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-      "license": "MIT",
      "engines": {
        "node": ">=0.10.0"
      }
@@ -199,7 +182,6 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "license": "MIT",
      "dependencies": {
        "xtend": "^4.0.0"
      },
@@ -211,7 +193,6 @@
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-      "license": "ISC",
      "engines": {
        "node": ">= 10.x"
      }
@@ -220,16 +201,14 @@
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "license": "MIT",
      "engines": {
        "node": ">=0.4"
      }
    },
    "node_modules/zod": {
-      "version": "4.1.13",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.13.tgz",
-      "integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==",
-      "license": "MIT",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.2.1.tgz",
+      "integrity": "sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==",
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
        "@aws-crypto/sha256-browser": "^5.2.0",
        "@aws-crypto/sha256-js": "^5.2.0",
        "@aws-sdk/client-s3": "^3.928.0",
-        "@aws-sdk/s3-request-presigner": "^3.310.0",
+        "@aws-sdk/s3-request-presigner": "^3.928.0",
        "@aws/lambda-invoke-store": "^0.2.1",
        "@nestjs/common": "^10.3.0",
        "@nestjs/config": "^3.1.1",
@@ -31,18 +31,27 @@
        "@types/http-status": "^1.1.2",
        "ajv": "8.12.0",
        "aws-lambda": "^1.0.7",
+        "aws-sdk": "^2.1692.0",
        "bcrypt": "^6.0.0",
        "bcryptjs": "^2.4.3",
        "class-transformer": "^0.5.1",
        "class-validator": "^0.14.0",
        "date-fns": "^4.1.0",
+        "dayjs": "^1.11.19",
+        "docx": "^9.6.0",
+        "docxtemplater": "^3.68.3",
        "fast-xml-parser": "^5.3.1",
+        "fs": "^0.0.1-security",
        "helmet": "^7.1.0",
        "http-status": "^2.1.0",
        "moment": "^2.30.1",
+        "number-to-words": "^1.2.4",
        "passport": "^0.7.0",
        "passport-jwt": "^4.0.1",
        "passport-local": "^1.0.0",
+        "path": "^0.12.7",
+        "pdf-lib": "^1.17.1",
+        "pizzip": "^3.2.0",
        "prisma": "^7.0.1",
        "reflect-metadata": "^0.1.13",
        "rxjs": "^7.8.1",
@@ -73,6 +82,7 @@
        "prettier": "^3.2.5",
        "serverless-esbuild": "^1.55.1",
        "serverless-offline": "^14.4.0",
+        "serverless-plugin-split-stacks": "^1.14.0",
        "source-map-support": "^0.5.21",
        "supertest": "^6.3.4",
        "ts-jest": "^29.1.2",
@@ -4650,6 +4660,24 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/@pdf-lib/standard-fonts": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz",
+      "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "^1.0.6"
+      }
+    },
+    "node_modules/@pdf-lib/upng": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz",
+      "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "^1.0.10"
+      }
+    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -5751,6 +5779,13 @@
      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
      "license": "MIT"
    },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/@tsconfig/node10": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
@@ -6546,6 +6581,15 @@
        "@xtuc/long": "4.2.2"
      }
    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.8.tgz",
+      "integrity": "sha512-p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.6"
+      }
+    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6624,6 +6668,16 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/aggregate-error": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -6964,6 +7018,19 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/async": {
      "version": "3.2.6",
      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
@@ -6992,6 +7059,13 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/aws-info": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/aws-info/-/aws-info-1.3.0.tgz",
+      "integrity": "sha512-dYE3J2GQOMXjirx54IonDisZ6Ok4vBSYjNklNAGGDj2FzGHkWpGOlGAn5/BC8TRh8ttmYRy+Fsmxc8EJMnzSCg==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/aws-lambda": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/aws-lambda/-/aws-lambda-1.0.7.tgz",
@@ -7257,6 +7331,16 @@
        "baseline-browser-mapping": "dist/cli.js"
      }
    },
+    "node_modules/basic-ftp": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.0.tgz",
+      "integrity": "sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
    "node_modules/bcrypt": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-6.0.0.tgz",
@@ -8386,7 +8470,6 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/cors": {
@@ -8539,6 +8622,12 @@
        "url": "https://github.com/sponsors/kossnocorp"
      }
    },
+    "node_modules/dayjs": {
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
+      "license": "MIT"
+    },
    "node_modules/debug": {
      "version": "4.4.3",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -8633,6 +8722,21 @@
      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
      "license": "MIT"
    },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/delayed-stream": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -8763,6 +8867,50 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/docx": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/docx/-/docx-9.6.0.tgz",
+      "integrity": "sha512-y6EaJJMDvt4P7wgGQB9KsZf4wsRkQMJfkc9LlNufRshggI5BT35hGNkXBCAeEoI3MLMwApKguxzjdqqVcBCqNA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "^25.2.3",
+        "hash.js": "^1.1.7",
+        "jszip": "^3.10.1",
+        "nanoid": "^5.1.3",
+        "xml": "^1.0.1",
+        "xml-js": "^1.6.8"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/docx/node_modules/@types/node": {
+      "version": "25.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.0.tgz",
+      "integrity": "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.18.0"
+      }
+    },
+    "node_modules/docx/node_modules/undici-types": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
+      "license": "MIT"
+    },
+    "node_modules/docxtemplater": {
+      "version": "3.68.3",
+      "resolved": "https://registry.npmjs.org/docxtemplater/-/docxtemplater-3.68.3.tgz",
+      "integrity": "sha512-hTZfGcHgN60A09w68Qj0EQRCnF5kf2/ohFlZlUVqAOozCFwx9QMm8naCTvmTsXafuO3nG9qpS4pQWSjFdaCWfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.9.8"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
    "node_modules/dotenv": {
      "version": "16.4.5",
      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
@@ -9031,6 +9179,39 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/eslint": {
      "version": "8.57.1",
      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
@@ -10022,6 +10203,12 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/fs": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+      "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
+      "license": "ISC"
+    },
    "node_modules/fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -10199,6 +10386,31 @@
        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
      }
    },
+    "node_modules/get-uri": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
+      "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-uri/node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/giget": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz",
@@ -10437,6 +10649,16 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
    "node_modules/hasown": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -10499,6 +10721,20 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/http-status": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/http-status/-/http-status-2.1.0.tgz",
@@ -10514,6 +10750,20 @@
      "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==",
      "license": "MIT"
    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/human-signals": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -10556,7 +10806,6 @@
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/import-fresh": {
@@ -10661,6 +10910,16 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/ip-address": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
    "node_modules/ipaddr.js": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -11986,7 +12245,6 @@
      "version": "3.10.1",
      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
-      "dev": true,
      "license": "(MIT OR GPL-3.0-or-later)",
      "dependencies": {
        "lie": "~3.3.0",
@@ -11999,7 +12257,6 @@
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "core-util-is": "~1.0.0",
@@ -12015,14 +12272,12 @@
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/jszip/node_modules/string_decoder": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "safe-buffer": "~5.1.0"
@@ -12149,7 +12404,6 @@
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-      "dev": true,
      "license": "MIT",
      "dependencies": {
        "immediate": "~3.0.5"
@@ -12548,6 +12802,12 @@
        "node": ">=6"
      }
    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "license": "ISC"
+    },
    "node_modules/minimatch": {
      "version": "9.0.3",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
@@ -12698,6 +12958,24 @@
        "node": ">=12"
      }
    },
+    "node_modules/nanoid": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
+      "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      }
+    },
    "node_modules/natural-compare": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -12722,6 +13000,16 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
    "node_modules/nock": {
      "version": "13.5.6",
      "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.6.tgz",
@@ -12873,6 +13161,12 @@
        "node": ">=8"
      }
    },
+    "node_modules/number-to-words": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/number-to-words/-/number-to-words-1.2.4.tgz",
+      "integrity": "sha512-/fYevVkXRcyBiZDg6yzZbm0RuaD6i0qRfn8yr+6D0KgBMOndFPxuW10qCHpzs50nN8qKuv78k8MuotZhcVX6Pw==",
+      "license": "MIT"
+    },
    "node_modules/nypm": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.2.tgz",
@@ -13118,6 +13412,40 @@
        "node": ">=6"
      }
    },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
+      "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/package-json-from-dist": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -13128,7 +13456,6 @@
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true,
      "license": "(MIT AND Zlib)"
    },
    "node_modules/parent-module": {
@@ -13219,6 +13546,16 @@
        "node": ">= 0.4.0"
      }
    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "license": "MIT",
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
    "node_modules/path-exists": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -13293,6 +13630,21 @@
        "node": ">=8"
      }
    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "license": "ISC"
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
    "node_modules/pathe": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -13304,6 +13656,24 @@
      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
    },
+    "node_modules/pdf-lib": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz",
+      "integrity": "sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==",
+      "license": "MIT",
+      "dependencies": {
+        "@pdf-lib/standard-fonts": "^1.0.0",
+        "@pdf-lib/upng": "^1.0.1",
+        "pako": "^1.0.11",
+        "tslib": "^1.11.1"
+      }
+    },
+    "node_modules/pdf-lib/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
+    },
    "node_modules/perfect-debounce": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
@@ -13438,6 +13808,21 @@
        "node": ">= 6"
      }
    },
+    "node_modules/pizzip": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/pizzip/-/pizzip-3.2.0.tgz",
+      "integrity": "sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==",
+      "license": "(MIT OR GPL-3.0)",
+      "dependencies": {
+        "pako": "^2.1.0"
+      }
+    },
+    "node_modules/pizzip/node_modules/pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "license": "(MIT AND Zlib)"
+    },
    "node_modules/pkg-dir": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -13689,11 +14074,19 @@
        }
      }
    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
    "node_modules/process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/prompts": {
@@ -13756,6 +14149,36 @@
        "node": ">= 0.10"
      }
    },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/proxy-from-env": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -14756,6 +15179,23 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/serverless-plugin-split-stacks": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/serverless-plugin-split-stacks/-/serverless-plugin-split-stacks-1.14.0.tgz",
+      "integrity": "sha512-VksNqvJUPnGHqef0jHNiN0BzTVr0Hy0cWaLxCG75HiQ3vnIog8qeyiu7uWH6LKNhJnGP1jiTNh0YcheCN8kaKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aws-info": "^1.2.0",
+        "lodash": "^4.17.21",
+        "proxy-agent": "^6.3.1",
+        "semver": "^7.3.5",
+        "throat": "^6.0.1"
+      },
+      "peerDependencies": {
+        "serverless": "1 || 2 || 3 || 4"
+      }
+    },
    "node_modules/serverless/node_modules/rimraf": {
      "version": "5.0.10",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
@@ -14792,7 +15232,6 @@
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true,
      "license": "MIT"
    },
    "node_modules/setprototypeof": {
@@ -14923,6 +15362,47 @@
        "node": ">=8"
      }
    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
    "node_modules/sorted-array-functions": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz",
@@ -15504,6 +15984,13 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/throat": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
+      "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/through": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -17076,6 +17563,30 @@
        }
      }
    },
+    "node_modules/xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
+      "license": "MIT"
+    },
+    "node_modules/xml-js": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
+      "license": "MIT",
+      "dependencies": {
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "xml-js": "bin/cli.js"
+      }
+    },
+    "node_modules/xml-js/node_modules/sax": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz",
+      "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
+      "license": "BlueOak-1.0.0"
+    },
    "node_modules/xml2js": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "@aws-crypto/sha256-browser": "^5.2.0",
    "@aws-crypto/sha256-js": "^5.2.0",
    "@aws-sdk/client-s3": "^3.928.0",
-    "@aws-sdk/s3-request-presigner": "^3.310.0",
+    "@aws-sdk/s3-request-presigner": "^3.928.0",
    "@aws/lambda-invoke-store": "^0.2.1",
    "@nestjs/common": "^10.3.0",
    "@nestjs/config": "^3.1.1",
@@ -48,18 +48,27 @@
    "@types/http-status": "^1.1.2",
    "ajv": "8.12.0",
    "aws-lambda": "^1.0.7",
+    "aws-sdk": "^2.1692.0",
    "bcrypt": "^6.0.0",
    "bcryptjs": "^2.4.3",
    "class-transformer": "^0.5.1",
    "class-validator": "^0.14.0",
    "date-fns": "^4.1.0",
+    "dayjs": "^1.11.19",
+    "docx": "^9.6.0",
+    "docxtemplater": "^3.68.3",
    "fast-xml-parser": "^5.3.1",
+    "fs": "^0.0.1-security",
    "helmet": "^7.1.0",
    "http-status": "^2.1.0",
    "moment": "^2.30.1",
+    "number-to-words": "^1.2.4",
    "passport": "^0.7.0",
    "passport-jwt": "^4.0.1",
    "passport-local": "^1.0.0",
+    "path": "^0.12.7",
+    "pdf-lib": "^1.17.1",
+    "pizzip": "^3.2.0",
    "prisma": "^7.0.1",
    "reflect-metadata": "^0.1.13",
    "rxjs": "^7.8.1",
@@ -90,6 +99,7 @@
    "prettier": "^3.2.5",
    "serverless-esbuild": "^1.55.1",
    "serverless-offline": "^14.4.0",
+    "serverless-plugin-split-stacks": "^1.14.0",
    "source-map-support": "^0.5.21",
    "supertest": "^6.3.4",
    "ts-jest": "^29.1.2",
--- a/prisma/citiesSeeder.ts
+++ b/prisma/citiesSeeder.ts
@@ -0,0 +1,64 @@
+import fs from 'fs'
+import path from 'path'
+import { PrismaClient } from '@prisma/client'
+
+export async function seedCities(prisma: PrismaClient) {
+
+    const statesFolder = path.join(process.cwd(), 'states-cities')
+    const files = fs.readdirSync(statesFolder)
+
+    for (const file of files) {
+        if (!file.endsWith('.json')) continue
+
+        const stateName = file.replace('.json', '')
+
+        const state = await prisma.states.findFirst({
+            where: {
+                stateName: {
+                    equals: stateName,
+                    mode: 'insensitive',
+                },
+            },
+        })
+
+        if (!state) {
+            console.log(`❌ State not found: ${stateName}`)
+            continue
+        }
+
+        const filePath = path.join(statesFolder, file)
+        const rawData = JSON.parse(fs.readFileSync(filePath, 'utf-8'))
+
+        if (!rawData.districts) {
+            console.log(`❌ Invalid structure in ${file}`)
+            continue
+        }
+
+        const allVillages: string[] = []
+
+        for (const district of rawData.districts) {
+            for (const sub of district.subDistricts || []) {
+                for (const village of sub.villages || []) {
+                    if (village && village.trim()) {
+                        allVillages.push(village.trim())
+                    }
+                }
+            }
+        }
+
+        console.log(`📦 Total villages found in ${stateName}:`, allVillages.length)
+
+        const result = await prisma.cities.createMany({
+            data: allVillages.map((village) => ({
+                stateXid: state.id,
+                cityName: village,
+            })),
+            skipDuplicates: true,
+        })
+
+        console.log(`✅ ${stateName} inserted: ${result.count}`)
+    }
+
+    console.log('🎉 All states processed successfully!')
+}
+
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,7 +1,8 @@
 generator client {
  provider        = "prisma-client-js"
-  binaryTargets   = ["native", "rhel-openssl-3.0.x"] // Add Linux target
+  binaryTargets   = ["native", "rhel-openssl-3.0.x"] // Lambda Node 18/20 (Amazon Linux) target
  previewFeatures = ["multiSchema"]
+  engineType = "library"
 }

 datasource db {
@@ -16,12 +17,13 @@ model User {
  lastName         String?   @map("last_name") @db.VarChar(50)
  roleXid          Int?      @map("role_xid")
  dateOfBirth      DateTime? @map("date_of_birth")
+  genderName       String?   @map("gender_name") @db.VarChar(20)
  role             Roles?    @relation(fields: [roleXid], references: [id], onDelete: Restrict)
-  emailAddress     String    @unique @map("email_address") @db.VarChar(150)
+  emailAddress     String?   @unique @map("email_address") @db.VarChar(150)
  isdCode          String?   @map("isd_code") @db.VarChar(6) // +91, +1, +971 etc.
-  mobileNumber     String?   @map("mobile_number") @db.VarChar(15) // international safe limit
+  mobileNumber     String?   @unique @map("mobile_number") @db.VarChar(15) // international safe limit
  userPassword     String?   @map("user_password") @db.VarChar(255) // hashed passwords
-  userPasscode     String?   @map("user_passcode") @db.VarChar(10) // 4–6 digit passcode
+  userPasscode     String?   @map("user_passcode") @db.VarChar(255) // 4–6 digit passcode
  profileImage     String?   @map("profile_image") @db.VarChar(500) // S3 key or URL
  userLat          String?   @map("user_lat") @db.VarChar(20) // "-23.44444"
  userLong         String?   @map("user_long") @db.VarChar(20)
@@ -29,7 +31,7 @@ model User {
  isEmailVerfied   Boolean?  @default(false) @map("is_email_verified")
  isMobileVerfied  Boolean?  @default(false) @map("is_mobile_verified")
  isProfileUpdated Boolean?  @default(false) @map("is_profile_updated")
-  userRefNumber    String?   @map("user_ref_number") @db.VarChar(20)
+  userRefNumber    String?   @unique @map("user_ref_number") @db.VarChar(20)
  isActive         Boolean?  @default(true) @map("is_active")
  createdAt        DateTime? @default(now()) @map("created_at")
  updatedAt        DateTime? @updatedAt @map("updated_at")
@@ -67,6 +69,13 @@ model User {
  userAddressDetails     UserAddressDetails[]
  userDocuments          UserDocuments[]
  activityTracks         ActivityTrack[]
+  // 🔹 Activities created by this user
+  createdActivities      Activities[]             @relation("UserActivities")
+  userBucketInterests    UserBucketInterested[]
+
+  // 🔹 Activities where this user is Account Manager
+  managedActivities Activities[]      @relation("ActivityAccountManager")
+  activitySortings  ActivitySorting[]

  @@map("users")
  @@schema("usr")
@@ -168,16 +177,35 @@ model UserRevenue {
  @@schema("usr")
 }

+model ActivitySorting {
+  id              Int                @id @default(autoincrement())
+  userXid         Int                @map("user_xid")
+  user            User               @relation(fields: [userXid], references: [id], onDelete: Cascade)
+  activitySortXid Int                @map("activity_sort_xid")
+  activitySort    ActivitySortFilter @relation(fields: [activitySortXid], references: [id], onDelete: Restrict)
+  sortOrder       String             @map("sort_order") @db.VarChar(20) // "asc", "desc"
+  filterValue     String             @map("filter_value") @db.VarChar(50) // e.g. "frequency", "created_at", "activity_date"
+  displayOrder    Int                @map("display_order")
+  isActive        Boolean            @default(true) @map("is_active")
+  createdAt       DateTime           @default(now()) @map("created_at")
+  updatedAt       DateTime           @updatedAt @map("updated_at")
+  deletedAt       DateTime?          @map("deleted_at")
+
+  @@unique([userXid, activitySortXid])
+  @@map("activity_sorting")
+  @@schema("usr")
+}
+
 model ConnectDetails {
-  id         Int         @id @default(autoincrement())
-  userXid    Int         @map("user_xid")
-  user       User        @relation(fields: [userXid], references: [id], onDelete: Cascade)
-  connectXid Int         @map("connect_xid")
-  connect    Connections @relation(fields: [connectXid], references: [id], onDelete: Cascade)
-  isActive   Boolean     @default(true) @map("is_active")
-  createdAt  DateTime    @default(now()) @map("created_at")
-  updatedAt  DateTime    @updatedAt @map("updated_at")
-  deletedAt  DateTime?   @map("deleted_at")
+  id               Int           @id @default(autoincrement())
+  userXid          Int           @map("user_xid")
+  user             User          @relation(fields: [userXid], references: [id], onDelete: Cascade)
+  schoolCompanyXid Int           @map("school_company_xid")
+  schoolCompany    SchoolCompany @relation(fields: [schoolCompanyXid], references: [id], onDelete: Restrict)
+  isActive         Boolean       @default(true) @map("is_active")
+  createdAt        DateTime      @default(now()) @map("created_at")
+  updatedAt        DateTime      @updatedAt @map("updated_at")
+  deletedAt        DateTime?     @map("deleted_at")

  @@map("connect_details")
  @@schema("usr")
@@ -213,6 +241,40 @@ model UserInterests {
  @@schema("usr")
 }

+model UserBucketInterested {
+  id             Int        @id @default(autoincrement())
+  userXid        Int        @map("user_xid")
+  user           User       @relation(fields: [userXid], references: [id], onDelete: Cascade)
+  isBucket       Boolean    @default(true) @map("is_bucket")
+  activityXid    Int        @map("activity_xid")
+  Activities     Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  bucketTypeName String?    @map("bucket_type_name") @db.VarChar(20) // "want_to_do", "tried_and_loved", "tried_and_disliked"
+  activityStatus String?    @map("activity_status") @db.VarChar(20) // "pending", "completed", "removed"
+  isActive       Boolean    @default(true) @map("is_active")
+  createdAt      DateTime   @default(now()) @map("created_at")
+  updatedAt      DateTime   @updatedAt @map("updated_at")
+  deletedAt      DateTime?  @map("deleted_at")
+
+  @@map("user_bucket_interested")
+  @@schema("usr")
+}
+
+model SchoolCompany {
+  id                Int              @id @default(autoincrement())
+  schoolCompanyName String           @map("school_company_name") @db.VarChar(255)
+  isSchool          Boolean          @map("is_school")
+  cityXid           Int              @map("city_xid")
+  cities            Cities           @relation(fields: [cityXid], references: [id], onDelete: Restrict)
+  isActive          Boolean          @default(true) @map("is_active")
+  createdAt         DateTime         @default(now()) @map("created_at")
+  updatedAt         DateTime         @updatedAt @map("updated_at")
+  deletedAt         DateTime?        @map("deleted_at")
+  connectDetails    ConnectDetails[]
+
+  @@map("school_company")
+  @@schema("mst")
+}
+
 model Countries {
  id                 Int                  @id @default(autoincrement())
  countryName        String               @unique @map("country_name") @db.VarChar(50)
@@ -229,6 +291,9 @@ model Countries {
  HostHeader         HostHeader[]
  hostParent         HostParent[]
  userAddressDetails UserAddressDetails[]
+  // 🔹 Activity relations
+  checkInActivities  Activities[]         @relation("CheckInCountry")
+  checkOutActivities Activities[]         @relation("CheckOutCountry")

  @@map("countries")
  @@schema("mst")
@@ -266,6 +331,9 @@ model States {
  HostHeader         HostHeader[]
  hostParent         HostParent[]
  userAddressDetails UserAddressDetails[]
+  // 🔹 Activity relations
+  checkInActivities  Activities[]         @relation("CheckInState")
+  checkOutActivities Activities[]         @relation("CheckOutState")

  @@map("states")
  @@schema("mst")
@@ -275,7 +343,7 @@ model Cities {
  id                 Int                  @id @default(autoincrement())
  stateXid           Int                  @map("state_xid")
  states             States               @relation(fields: [stateXid], references: [id], onDelete: Cascade)
-  cityName           String               @unique @map("city_name") @db.VarChar(50)
+  cityName           String               @map("city_name") @db.VarChar(50)
  isActive           Boolean              @default(true) @map("is_active")
  createdAt          DateTime             @default(now()) @map("created_at")
  updatedAt          DateTime             @updatedAt @map("updated_at")
@@ -284,7 +352,12 @@ model Cities {
  HostHeader         HostHeader[]
  hostParent         HostParent[]
  userAddressDetails UserAddressDetails[]
+  // 🔹 Activity relations
+  checkInActivities  Activities[]         @relation("CheckInCity")
+  checkOutActivities Activities[]         @relation("CheckOutCity")
+  schoolCompanies    SchoolCompany[]

+  @@unique([stateXid, cityName])
  @@map("cities")
  @@schema("mst")
 }
@@ -327,6 +400,21 @@ model Banks {
  @@schema("mst")
 }

+model ActivitySortFilter {
+  id               Int               @id @default(autoincrement())
+  sortFilterName   String            @map("sort_filter_name") @db.VarChar(50)
+  isSort           Boolean           @default(false) @map("is_sort")
+  displayOrder     Int               @map("display_order")
+  isActive         Boolean           @default(true) @map("is_active")
+  createdAt        DateTime          @default(now()) @map("created_at")
+  updatedAt        DateTime          @updatedAt @map("updated_at")
+  deletedAt        DateTime?         @map("deleted_at")
+  activitySortings ActivitySorting[]
+
+  @@map("activity_sort_filter")
+  @@schema("mst")
+}
+
 model BankBranches {
  id              Int               @id @default(autoincrement())
  bankXid         Int               @map("bank_xid")
@@ -350,6 +438,9 @@ model BankBranches {
 model Interests {
  id            Int             @id @default(autoincrement())
  interestName  String          @unique @map("interest_name") @db.VarChar(50)
+  interestColor String          @map("interest_color") @db.VarChar(20)
+  interestImage String          @map("interest_image") @db.VarChar(500)
+  interestCode  String          @unique @map("interest_code") @db.VarChar(10)
  displayOrder  Int             @map("display_order")
  isActive      Boolean         @default(true) @map("is_active")
  createdAt     DateTime        @default(now()) @map("created_at")
@@ -366,7 +457,9 @@ model ActivityTypes {
  id               Int          @id @default(autoincrement())
  interestXid      Int          @map("interest_xid")
  interests        Interests    @relation(fields: [interestXid], references: [id], onDelete: Restrict)
-  activityTypeName String       @unique @map("activity_type_name") @db.VarChar(30)
+  activityTypeName String       @unique @map("activity_type_name") @db.VarChar(50)
+  energyLevelXid   Int          @map("energy_level_xid")
+  energyLevel      EnergyLevels @relation(fields: [energyLevelXid], references: [id], onDelete: Restrict)
  isActive         Boolean      @default(true) @map("is_active")
  createdAt        DateTime     @default(now()) @map("created_at")
  updatedAt        DateTime     @updatedAt @map("updated_at")
@@ -394,12 +487,13 @@ model DocumentType {
 }

 model FoodCuisines {
-  id          Int       @id @default(autoincrement())
-  cuisineName String    @unique @map("cuisine_name") @db.VarChar(30)
-  isActive    Boolean   @default(true) @map("is_active")
-  createdAt   DateTime  @default(now()) @map("created_at")
-  updatedAt   DateTime  @updatedAt @map("updated_at")
-  deletedAt   DateTime? @map("deleted_at")
+  id               Int               @id @default(autoincrement())
+  cuisineName      String            @unique @map("cuisine_name") @db.VarChar(30)
+  isActive         Boolean           @default(true) @map("is_active")
+  createdAt        DateTime          @default(now()) @map("created_at")
+  updatedAt        DateTime          @updatedAt @map("updated_at")
+  deletedAt        DateTime?         @map("deleted_at")
+  activityCuisines ActivityCuisine[]

  @@map("food_cuisines")
  @@schema("mst")
@@ -423,6 +517,7 @@ model CompanyTypes {
 model Amenities {
  id                Int                 @id @default(autoincrement())
  amenitiesName     String              @unique @map("amenities_name") @db.VarChar(30)
+  amenitiesIcon     String              @map("amenities_icon") @db.VarChar(500)
  isActive          Boolean             @default(true) @map("is_active")
  createdAt         DateTime            @default(now()) @map("created_at")
  updatedAt         DateTime            @updatedAt @map("updated_at")
@@ -434,13 +529,14 @@ model Amenities {
 }

 model FoodTypes {
-  id                  Int                   @id @default(autoincrement())
-  foodTypeName        String                @unique @map("food_type_name") @db.VarChar(30)
-  isActive            Boolean               @default(true) @map("is_active")
-  createdAt           DateTime              @default(now()) @map("created_at")
-  updatedAt           DateTime              @updatedAt @map("updated_at")
-  deletedAt           DateTime?             @map("deleted_at")
-  ActivityFoodDetails ActivityFoodDetails[]
+  id                Int                 @id @default(autoincrement())
+  foodTypeName      String              @unique @map("food_type_name") @db.VarChar(30)
+  isActive          Boolean             @default(true) @map("is_active")
+  createdAt         DateTime            @default(now()) @map("created_at")
+  updatedAt         DateTime            @updatedAt @map("updated_at")
+  deletedAt         DateTime?           @map("deleted_at")
+  ActivityFoodCost  ActivityFoodCost[]
+  activityFoodTypes ActivityFoodTypes[]

  @@map("food_types")
  @@schema("mst")
@@ -459,20 +555,6 @@ model Frequencies {
  @@schema("mst")
 }

-model NavigationModes {
-  id                      Int                       @id @default(autoincrement())
-  navigationModeName      String                    @unique @map("navigation_mode_name") @db.VarChar(30)
-  navigationModeIcon      String                    @map("navigation_mode_icon") @db.VarChar(500)
-  isActive                Boolean                   @default(true) @map("is_active")
-  createdAt               DateTime                  @default(now()) @map("created_at")
-  updatedAt               DateTime                  @updatedAt @map("updated_at")
-  deletedAt               DateTime?                 @map("deleted_at")
-  ActivityNavigationModes ActivityNavigationModes[]
-
-  @@map("navigation_modes")
-  @@schema("mst")
-}
-
 model TransportModes {
  id                      Int                       @id @default(autoincrement())
  transportModeName       String                    @unique @map("transport_mode_name") @db.VarChar(60)
@@ -554,15 +636,15 @@ model PQQAnswers {
 }

 model AgeRestrictions {
-  id                  Int                   @id @default(autoincrement())
-  ageRestrictionName  String                @unique @map("age_restriction_name") @db.VarChar(30)
-  minAge              Int                   @map("min_age")
-  maxAge              Int                   @map("max_age")
-  isActive            Boolean               @default(true) @map("is_active")
-  createdAt           DateTime              @default(now()) @map("created_at")
-  updatedAt           DateTime              @updatedAt @map("updated_at")
-  deletedAt           DateTime?             @map("deleted_at")
-  ActivityEligibility ActivityEligibility[]
+  id                 Int       @id @default(autoincrement())
+  ageRestrictionName String    @unique @map("age_restriction_name") @db.VarChar(30)
+  minAge             Int       @map("min_age")
+  maxAge             Int       @map("max_age")
+  isActive           Boolean   @default(true) @map("is_active")
+  createdAt          DateTime  @default(now()) @map("created_at")
+  updatedAt          DateTime  @updatedAt @map("updated_at")
+  deletedAt          DateTime? @map("deleted_at")
+  // ActivityEligibility ActivityEligibility[]

  @@map("age_restrictions")
  @@schema("mst")
@@ -595,31 +677,32 @@ model Roles {
 }

 model Connections {
-  id              Int              @id @default(autoincrement())
-  connectionType  String           @unique @map("connection_type") @db.VarChar(30)
-  connectionName  String           @map("connection_name") @db.VarChar(30)
-  locationDetails String           @map("location_details") @db.VarChar(100)
-  isActive        Boolean          @default(true) @map("is_active")
-  createdAt       DateTime         @default(now()) @map("created_at")
-  updatedAt       DateTime         @updatedAt @map("updated_at")
-  deletedAt       DateTime?        @map("deleted_at")
+  id              Int       @id @default(autoincrement())
+  connectionType  String    @unique @map("connection_type") @db.VarChar(30)
+  connectionName  String    @map("connection_name") @db.VarChar(30)
+  locationDetails String    @map("location_details") @db.VarChar(100)
+  isActive        Boolean   @default(true) @map("is_active")
+  createdAt       DateTime  @default(now()) @map("created_at")
+  updatedAt       DateTime  @updatedAt @map("updated_at")
+  deletedAt       DateTime? @map("deleted_at")
  User            User[]
-  connectDetails  ConnectDetails[]

  @@map("connections")
  @@schema("mst")
 }

 model EnergyLevels {
-  id              Int          @id @default(autoincrement())
-  energyLevelName String       @map("energy_level_name") @db.VarChar(30)
-  energyIcon      String       @map("energy_icon") @db.VarChar(400)
-  isActive        Boolean      @default(true) @map("is_active")
-  createdAt       DateTime     @default(now()) @map("created_at")
-  updatedAt       DateTime     @updatedAt @map("updated_at")
-  deletedAt       DateTime?    @map("deleted_at")
+  id              Int             @id @default(autoincrement())
+  energyLevelName String          @unique @map("energy_level_name") @db.VarChar(30)
+  energyIcon      String          @map("energy_icon") @db.VarChar(400)
+  energyColor     String          @map("energy_color") @db.VarChar(20)
+  displayOrder    Int             @map("display_order")
+  isActive        Boolean         @default(true) @map("is_active")
+  createdAt       DateTime        @default(now()) @map("created_at")
+  updatedAt       DateTime        @updatedAt @map("updated_at")
+  deletedAt       DateTime?       @map("deleted_at")
  User            User[]
-  Activities      Activities[]
+  activityTypes   ActivityTypes[]

  @@map("energy_levels")
  @@schema("mst")
@@ -707,6 +790,7 @@ model HostHeader {
  hostParent              HostParent[]
  HostTrack               HostTrack[]
  Activities              Activities[]
+  hostAgreements          HostAgreement[]

  @@map("host_header")
  @@schema("hst")
@@ -751,11 +835,26 @@ model HostDocuments {
  @@schema("hst")
 }

+model HostAgreement {
+  id            Int        @id @default(autoincrement())
+  hostXid       Int        @map("host_xid")
+  host          HostHeader @relation(fields: [hostXid], references: [id], onDelete: Cascade)
+  filePath      String     @map("file_path") @db.VarChar(400)
+  versionNumber String     @map("version_number") @db.VarChar(20)
+  isActive      Boolean    @default(true) @map("is_active")
+  createdAt     DateTime   @default(now()) @map("created_at")
+  updatedAt     DateTime   @updatedAt @map("updated_at")
+  deletedAt     DateTime?  @map("deleted_at")
+
+  @@map("host_agreement")
+  @@schema("hst")
+}
+
 model HostSuggestion {
  id            Int        @id @default(autoincrement())
  hostXid       Int        @map("host_xid")
  host          HostHeader @relation(fields: [hostXid], references: [id], onDelete: Cascade)
-  title         String     @map("title") @db.VarChar(20)
+  title         String     @map("title") @db.VarChar(50)
  comments      String     @map("comments") @db.VarChar(200)
  isparent      Boolean    @default(false) @map("is_parent")
  isreviewed    Boolean    @default(false) @map("is_reviewed")
@@ -844,38 +943,57 @@ model HostTrack {
 // ACTIVITY MODELS

 model Activities {
-  id                            Int                       @id @default(autoincrement())
-  hostXid                       Int                       @map("host_xid")
-  host                          HostHeader                @relation(fields: [hostXid], references: [id], onDelete: Cascade)
-  activityTypeXid               Int                       @map("activity_type_xid")
-  activityType                  ActivityTypes             @relation(fields: [activityTypeXid], references: [id], onDelete: Restrict)
-  frequenciesXid                Int?                      @map("frequencies_xid")
-  frequency                     Frequencies?              @relation(fields: [frequenciesXid], references: [id], onDelete: Restrict)
-  activityRefNumber             String?                   @map("activity_ref_number") @db.VarChar(30)
-  activityTitle                 String?                   @map("activity_title") @db.VarChar(30)
-  activityDescription           String?                   @map("activity_description") @db.VarChar(80)
-  checkInLat                    Float?                    @map("check_in_lat")
-  checkInLong                   Float?                    @map("check_in_long")
-  checkInAddress                String?                   @map("check_in_address") @db.VarChar(150)
-  isCheckOutSame                Boolean?                  @default(true) @map("is_check_out_same")
-  checkOutLat                   Float?                    @map("check_out_lat")
-  checkOutLong                  Float?                    @map("check_out_long")
-  checkOutAddress               String?                   @map("check_out_address") @db.VarChar(150)
-  energyLevelXid                Int?                      @map("energy_level_xid")
-  energyLevel                   EnergyLevels?             @relation(fields: [energyLevelXid], references: [id], onDelete: Restrict)
-  activityDurationMins          Int?                      @map("activity_duration_mins")
-  foodAvailable                 Boolean?                  @default(false) @map("food_available")
-  foodIsChargeable              Boolean?                  @default(false) @map("food_is_chargeable")
-  alcoholAvailable              Boolean?                  @default(false) @map("alcohol_available")
-  trainerAvailable              Boolean?                  @default(false) @map("trainer_available")
-  trainerIsChargeable           Boolean?                  @default(false) @map("trainer_is_chargeable")
-  pickUpDropAvailable           Boolean?                  @default(false) @map("pick_up_drop_available")
-  pickUpDropIsChargeable        Boolean?                  @default(false) @map("pick_up_drop_is_chargeable")
-  inActivityAvailable           Boolean?                  @default(false) @map("in_activity_available")
-  inActivityIsChargeable        Boolean?                  @default(false) @map("in_activity_is_chargeable")
-  equipmentAvailable            Boolean?                  @default(false) @map("equipment_available")
-  equipmentIsChargeable         Boolean?                  @default(false) @map("equipment_is_chargeable")
-  cancellationAvailable         Boolean?                  @default(false) @map("cancellation_available")
+  id                          Int           @id @default(autoincrement())
+  hostXid                     Int           @map("host_xid")
+  host                        HostHeader    @relation(fields: [hostXid], references: [id], onDelete: Cascade)
+  activityTypeXid             Int           @map("activity_type_xid")
+  activityType                ActivityTypes @relation(fields: [activityTypeXid], references: [id], onDelete: Restrict)
+  frequenciesXid              Int?          @map("frequencies_xid")
+  frequency                   Frequencies?  @relation(fields: [frequenciesXid], references: [id], onDelete: Restrict)
+  activityRefNumber           String?       @map("activity_ref_number") @db.VarChar(30)
+  activityTitle               String?       @map("activity_title") @db.VarChar(150)
+  activityDescription         String?       @map("activity_description") @db.VarChar(2000)
+  checkInLat                  Float?        @map("check_in_lat")
+  checkInLong                 Float?        @map("check_in_long")
+  checkInAddress              String?       @map("check_in_address") @db.VarChar(150)
+  isCheckOutSame              Boolean?      @default(true) @map("is_check_out_same")
+  checkOutLat                 Float?        @map("check_out_lat")
+  checkOutLong                Float?        @map("check_out_long")
+  checkOutAddress             String?       @map("check_out_address") @db.VarChar(150)
+  set_early_checkin_time_mins String        @default("null") @map("set_early_checkin_time_mins") @db.VarChar(200)
+  activityDurationMins        Int?          @map("activity_duration_mins")
+  foodAvailable               Boolean?      @map("food_available")
+  foodIsChargeable            Boolean?      @map("food_is_chargeable")
+  alcoholAvailable            Boolean?      @map("alcohol_available")
+  trainerAvailable            Boolean?      @map("trainer_available")
+  trainerIsChargeable         Boolean?      @map("trainer_is_chargeable")
+  pickUpDropAvailable         Boolean?      @map("pick_up_drop_available")
+  pickUpDropIsChargeable      Boolean?      @map("pick_up_drop_is_chargeable")
+  inActivityAvailable         Boolean?      @map("in_activity_available")
+  inActivityIsChargeable      Boolean?      @map("in_activity_is_chargeable")
+  isLateCheckingAllowed       Boolean?      @map("is_late_checking_allowed")
+  equipmentAvailable          Boolean?      @map("equipment_available")
+  equipmentIsChargeable       Boolean?      @map("equipment_is_chargeable")
+  cancellationAvailable       Boolean?      @map("cancellation_available")
+  checkInStateXid             Int?          @map("check_in_state_xid")
+  checkInState                States?       @relation("CheckInState", fields: [checkInStateXid], references: [id], onDelete: Restrict)
+  checkInCityXid              Int?          @map("check_in_city_xid")
+  checkInCity                 Cities?       @relation("CheckInCity", fields: [checkInCityXid], references: [id], onDelete: Restrict)
+  checkInCountryXid           Int?          @map("check_in_country_xid")
+  checkInCountry              Countries?    @relation("CheckInCountry", fields: [checkInCountryXid], references: [id], onDelete: Restrict)
+  checkOutStateXid            Int?          @map("check_out_state_xid")
+  checkOutState               States?       @relation("CheckOutState", fields: [checkOutStateXid], references: [id], onDelete: Restrict)
+  checkOutCityXid             Int?          @map("check_out_city_xid")
+  checkOutCity                Cities?       @relation("CheckOutCity", fields: [checkOutCityXid], references: [id], onDelete: Restrict)
+  checkOutCountryXid          Int?          @map("check_out_country_xid")
+  checkOutCountry             Countries?    @relation("CheckOutCountry", fields: [checkOutCountryXid], references: [id], onDelete: Restrict)
+  // 🔹 Creator / owner
+  userId                      Int?
+  user                        User?         @relation("UserActivities", fields: [userId], references: [id])
+
+  // 🔹 Account Manager
+  accountManagerXid             Int?
+  accountManager                User?                     @relation("ActivityAccountManager", fields: [accountManagerXid], references: [id], onDelete: Restrict)
  cancellationAllowedBeforeMins Int?                      @map("cancellation_allowed_before_mins")
  currencyXid                   Int?                      @map("currency_xid")
  currencies                    Currencies?               @relation(fields: [currencyXid], references: [id], onDelete: Restrict)
@@ -898,19 +1016,20 @@ model Activities {
  ActivityEligibility           ActivityEligibility[]
  ActivitySuggestions           ActivitySuggestions[]
  ActivityAmDetails             ActivityAmDetails[]
-  ActivityPrices                ActivityPrices[]
-  ActivityVenueArtifacts        ActivityVenueArtifacts[]
  ActivityPQQheader             ActivityPQQheader[]
  ActivityAllowedEntry          ActivityAllowedEntry[]
-  ActivityFoodDetails           ActivityFoodDetails[]
+  ActivityFoodCost              ActivityFoodCost[]
  ActivityEquipments            ActivityEquipments[]
  ActivityNavigationModes       ActivityNavigationModes[]
  ActivityPickUpDetails         ActivityPickUpDetails[]
  ActivityAmenities             ActivityAmenities[]
-  ActivityEquipmentTaxes        ActivityEquipmentTaxes[]
  ScheduleHeader                ScheduleHeader[]
  ItineraryActivities           ItineraryActivities[]
  activityTracks                ActivityTrack[]
+  activityFoodTypes             ActivityFoodTypes[]
+  activityCuisines              ActivityCuisine[]
+  activityPickUpTransports      ActivityPickUpTransport[]
+  userBucketInterests           UserBucketInterested[]

  @@map("activities")
  @@schema("act")
@@ -920,12 +1039,13 @@ model ActivityOtherDetails {
  id                Int        @id @default(autoincrement())
  activityXid       Int        @map("activity_xid")
  activity          Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  foodCuisines      String?    @map("food_cuisines") @db.VarChar(30)
-  exclusiveNotes    String?    @map("exclusive_notes") @db.VarChar(50)
-  dosNotes          String?    @map("dos_notes") @db.VarChar(200)
-  dontsNotes        String?    @map("donts_notes") @db.VarChar(200)
-  tipsNotes         String?    @map("tips_notes") @db.VarChar(100)
-  termsAndCondition String?    @map("terms_and_condition") @db.VarChar(500)
+  exclusiveNotes    String?    @map("exclusive_notes") @db.Text
+  SafetyInstruction String?    @map("safety_instruction") @db.Text
+  Cancellations     String?    @map("cancellations") @db.Text
+  dosNotes          String?    @map("dos_notes") @db.Text
+  dontsNotes        String?    @map("donts_notes") @db.Text
+  tipsNotes         String?    @map("tips_notes") @db.Text
+  termsAndCondition String?    @map("terms_and_condition") @db.Text
  isActive          Boolean    @default(true) @map("is_active")
  createdAt         DateTime   @default(now()) @map("created_at")
  updatedAt         DateTime   @updatedAt @map("updated_at")
@@ -960,6 +1080,7 @@ model ActivitiesMedia {
  activity      Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
  mediaType     String     @map("media_type") @db.VarChar(30)
  mediaFileName String     @map("media_file_name") @db.VarChar(400)
+  isCoverImage  Boolean    @default(false) @map("is_cover_image")
  displayOrder  Int        @map("display_order")
  isActive      Boolean    @default(true) @map("is_active")
  createdAt     DateTime   @default(now()) @map("created_at")
@@ -971,22 +1092,25 @@ model ActivitiesMedia {
 }

 model ActivityVenues {
-  id                         Int                   @id @default(autoincrement())
-  activityXid                Int                   @map("activity_xid")
-  activity                   Activities            @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  venueName                  String                @map("venue_name") @db.VarChar(50)
-  venueCapacity              Int                   @map("venue_capacity")
-  availableSeats             Int                   @map("available_seats")
-  isMinPeopleReqMandatory    Boolean               @default(false) @map("is_min_people_req_mandatory")
-  minPeopleRequired          Int?                  @map("min_people_required")
-  minReqfullfilledBeforeMins Int?                  @map("min_req_fullfilled_before_mins")
-  venueDescription           String?               @map("venue_description") @db.VarChar(200)
-  isActive                   Boolean               @default(true) @map("is_active")
-  createdAt                  DateTime              @default(now()) @map("created_at")
-  updatedAt                  DateTime              @updatedAt @map("updated_at")
-  deletedAt                  DateTime?             @map("deleted_at")
+  id                         Int                      @id @default(autoincrement())
+  activityXid                Int                      @map("activity_xid")
+  activity                   Activities               @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  venueName                  String?                  @map("venue_name") @db.VarChar(50)
+  venueLabel                 String?                  @map("venue_label") @db.VarChar(70)
+  venueCapacity              Int?                     @map("venue_capacity")
+  availableSeats             Int?                     @map("available_seats")
+  isMinPeopleReqMandatory    Boolean                  @default(false) @map("is_min_people_req_mandatory")
+  minPeopleRequired          Int?                     @map("min_people_required")
+  minReqfullfilledBeforeMins Int?                     @map("min_req_fullfilled_before_mins")
+  venueDescription           String?                  @map("venue_description") @db.VarChar(400)
+  isActive                   Boolean                  @default(true) @map("is_active")
+  createdAt                  DateTime                 @default(now()) @map("created_at")
+  updatedAt                  DateTime                 @updatedAt @map("updated_at")
+  deletedAt                  DateTime?                @map("deleted_at")
  ScheduleHeader             ScheduleHeader[]
  ItineraryActivities        ItineraryActivities[]
+  ActivityPrices             ActivityPrices[] // <-- Added opposite relation
+  ActivityVenueArtifacts     ActivityVenueArtifacts[] // <-- Added opposite relation

  @@map("activity_venues")
  @@schema("act")
@@ -1026,24 +1150,35 @@ model ActivityTrainerTaxes {
 }

 model ActivityEligibility {
-  id                    Int              @id @default(autoincrement())
-  activityXid           Int              @map("activity_xid")
-  activity              Activities       @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  isAgeRestriction      Boolean          @default(false) @map("is_age_restriction")
-  ageRestrictionXid     Int?             @map("age_restriction_xid")
-  ageRestriction        AgeRestrictions? @relation(fields: [ageRestrictionXid], references: [id], onDelete: Restrict)
-  isWeightRestriction   Boolean          @default(false) @map("is_weight_restriction")
-  weightRestrictionName String?          @map("weight_restriction_name") @db.VarChar(30)
-  weightEntered         Int?             @map("weight_entered")
-  weightIn              String?          @map("weight_in") @db.VarChar(30)
-  isHeightRestriction   Boolean          @default(false) @map("is_height_restriction")
-  heightRestrictionName String?          @map("height_restriction_name") @db.VarChar(30)
-  heightEntered         Int?             @map("height_entered")
-  heightIn              String?          @map("height_in") @db.VarChar(30)
-  isActive              Boolean          @default(true) @map("is_active")
-  createdAt             DateTime         @default(now()) @map("created_at")
-  updatedAt             DateTime         @updatedAt @map("updated_at")
-  deletedAt             DateTime?        @map("deleted_at")
+  id                    Int        @id @default(autoincrement())
+  activityXid           Int        @map("activity_xid")
+  activity              Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  isAgeRestriction      Boolean    @default(false) @map("is_age_restriction")
+  // ageRestrictionXid     Int?             @map("age_restriction_xid")
+  // ageRestriction        AgeRestrictions? @relation(fields: [ageRestrictionXid], references: [id], onDelete: Restrict)
+  ageRestrictionName    String?    @map("age_restriction_name") @db.VarChar(30)
+  ageEntered            Int?       @map("age_entered")
+  ageIn                 String?    @map("age_in") @db.VarChar(30)
+  minAge                Int?       @map("min_age")
+  maxAge                Int?       @map("max_age")
+  isWeightRestriction   Boolean    @default(false) @map("is_weight_restriction")
+  weightRestrictionName String?    @map("weight_restriction_name") @db.VarChar(30)
+  weightEntered         Int?       @map("weight_entered")
+  weightIn              String?    @map("weight_in") @db.VarChar(30)
+  minWeight             Int?       @map("min_weight")
+  maxWeight             Int?       @map("max_weight")
+  isHeightRestriction   Boolean    @default(false) @map("is_height_restriction")
+  heightRestrictionName String?    @map("height_restriction_name") @db.VarChar(30)
+  heightEntered         Int?       @map("height_entered")
+  heightIn              String?    @map("height_in") @db.VarChar(30)
+  minHeight             Int?       @map("min_height")
+  maxHeight             Int?       @map("max_height")
+  isActive              Boolean    @default(true) @map("is_active")
+  createdAt             DateTime   @default(now()) @map("created_at")
+  updatedAt             DateTime   @updatedAt @map("updated_at")
+  deletedAt             DateTime?  @map("deleted_at")
+  // ageRestrictions       AgeRestrictions? @relation(fields: [ageRestrictionsId], references: [id])
+  // ageRestrictionsId     Int?

  @@map("activity_eligibility")
  @@schema("act")
@@ -1086,7 +1221,7 @@ model ActivityAmDetails {
 model ActivityPrices {
  id                       Int                  @id @default(autoincrement())
  activityVenueXid         Int                  @map("activity_venue_xid")
-  activityVenue            Activities           @relation(fields: [activityVenueXid], references: [id], onDelete: Cascade)
+  activityVenue            ActivityVenues       @relation(fields: [activityVenueXid], references: [id], onDelete: Cascade)
  noOfSession              Int                  @map("no_of_session")
  isPackage                Boolean              @default(false) @map("is_package")
  sessionValidity          Int                  @map("session_validity")
@@ -1121,15 +1256,15 @@ model ActivityPriceTaxes {
 }

 model ActivityVenueArtifacts {
-  id               Int        @id @default(autoincrement())
-  activityVenueXid Int        @map("activity_venue_xid")
-  activityVenue    Activities @relation(fields: [activityVenueXid], references: [id], onDelete: Cascade)
-  mediaType        String     @map("media_type") @db.VarChar(30)
-  mediaFileName    String     @map("media_file_name") @db.VarChar(400)
-  isActive         Boolean    @default(true) @map("is_active")
-  createdAt        DateTime   @default(now()) @map("created_at")
-  updatedAt        DateTime   @updatedAt @map("updated_at")
-  deletedAt        DateTime?  @map("deleted_at")
+  id               Int            @id @default(autoincrement())
+  activityVenueXid Int            @map("activity_venue_xid")
+  activityVenue    ActivityVenues @relation(fields: [activityVenueXid], references: [id], onDelete: Cascade)
+  mediaType        String         @map("media_type") @db.VarChar(30)
+  mediaFileName    String         @map("media_file_name") @db.VarChar(400)
+  isActive         Boolean        @default(true) @map("is_active")
+  createdAt        DateTime       @default(now()) @map("created_at")
+  updatedAt        DateTime       @updatedAt @map("updated_at")
+  deletedAt        DateTime?      @map("deleted_at")

  @@map("activity_venue_artifacts")
  @@schema("act")
@@ -1204,12 +1339,10 @@ model ActivityAllowedEntry {
  @@schema("act")
 }

-model ActivityFoodDetails {
+model ActivityFoodCost {
  id                Int                 @id @default(autoincrement())
  activityXid       Int                 @map("activity_xid")
  activity          Activities          @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  foodTypeXid       Int                 @map("food_type_xid")
-  foodType          FoodTypes           @relation(fields: [foodTypeXid], references: [id], onDelete: Restrict)
  baseAmount        Int                 @map("base_amount")
  totalAmount       Int                 @map("total_amount")
  isActive          Boolean             @default(true) @map("is_active")
@@ -1217,57 +1350,90 @@ model ActivityFoodDetails {
  updatedAt         DateTime            @updatedAt @map("updated_at")
  deletedAt         DateTime?           @map("deleted_at")
  ActivityFoodTaxes ActivityFoodTaxes[]
+  foodTypes         FoodTypes?          @relation(fields: [foodTypesId], references: [id])
+  foodTypesId       Int?

-  @@map("activity_food_details")
+  @@map("activity_food_cost")
+  @@schema("act")
+}
+
+model ActivityFoodTypes {
+  id          Int        @id @default(autoincrement())
+  activityXid Int        @map("activity_xid")
+  activity    Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  foodTypeXid Int        @map("food_type_xid")
+  foodType    FoodTypes  @relation(fields: [foodTypeXid], references: [id], onDelete: Restrict)
+  isActive    Boolean    @default(true) @map("is_active")
+  createdAt   DateTime   @default(now()) @map("created_at")
+  updatedAt   DateTime   @updatedAt @map("updated_at")
+  deletedAt   DateTime?  @map("deleted_at")
+
+  @@map("activity_food_types")
+  @@schema("act")
+}
+
+model ActivityCuisine {
+  id             Int          @id @default(autoincrement())
+  activityXid    Int          @map("activity_xid")
+  activity       Activities   @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  foodCuisineXid Int          @map("food_cuisine_xid")
+  foodCuisine    FoodCuisines @relation(fields: [foodCuisineXid], references: [id], onDelete: Restrict)
+  isActive       Boolean      @default(true) @map("is_active")
+  createdAt      DateTime     @default(now()) @map("created_at")
+  updatedAt      DateTime     @updatedAt @map("updated_at")
+  deletedAt      DateTime?    @map("deleted_at")
+
+  @@map("activity_cuisine")
  @@schema("act")
 }

 model ActivityFoodTaxes {
-  id                     Int                 @id @default(autoincrement())
-  activityFoodDetailsXid Int                 @map("activity_food_details_xid")
-  activityFoodDetails    ActivityFoodDetails @relation(fields: [activityFoodDetailsXid], references: [id], onDelete: Cascade)
-  taxXid                 Int                 @map("tax_xid")
-  taxes                  Taxes               @relation(fields: [taxXid], references: [id], onDelete: Restrict)
-  taxPer                 Float               @map("tax_per")
-  taxAmount              Int                 @map("tax_amount")
-  isActive               Boolean             @default(true) @map("is_active")
-  createdAt              DateTime            @default(now()) @map("created_at")
-  updatedAt              DateTime            @updatedAt @map("updated_at")
-  deletedAt              DateTime?           @map("deleted_at")
+  id                  Int              @id @default(autoincrement())
+  activityFoodCostXid Int              @map("activity_food_cost_xid")
+  activityFoodCost    ActivityFoodCost @relation(fields: [activityFoodCostXid], references: [id], onDelete: Cascade)
+  taxXid              Int              @map("tax_xid")
+  taxes               Taxes            @relation(fields: [taxXid], references: [id], onDelete: Restrict)
+  taxPer              Float            @map("tax_per")
+  taxAmount           Int              @map("tax_amount")
+  isActive            Boolean          @default(true) @map("is_active")
+  createdAt           DateTime         @default(now()) @map("created_at")
+  updatedAt           DateTime         @updatedAt @map("updated_at")
+  deletedAt           DateTime?        @map("deleted_at")

  @@map("activity_food_taxes")
  @@schema("act")
 }

 model ActivityEquipments {
-  id                    Int        @id @default(autoincrement())
-  activityXid           Int        @map("activity_xid")
-  activity              Activities @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  equipmentName         String     @map("equipment_name") @db.VarChar(30)
-  isEquipmentChargeable Boolean    @default(false) @map("is_equipment_chargeable")
-  equipmentBasePrice    Int        @map("equipment_base_price")
-  equipmentTotalPrice   Int        @map("equipment_total_price")
-  isActive              Boolean    @default(true) @map("is_active")
-  createdAt             DateTime   @default(now()) @map("created_at")
-  updatedAt             DateTime   @updatedAt @map("updated_at")
-  deletedAt             DateTime?  @map("deleted_at")
+  id                     Int                      @id @default(autoincrement())
+  activityXid            Int                      @map("activity_xid")
+  activity               Activities               @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  equipmentName          String                   @map("equipment_name") @db.VarChar(30)
+  isEquipmentChargeable  Boolean                  @default(false) @map("is_equipment_chargeable")
+  equipmentBasePrice     Int                      @map("equipment_base_price")
+  equipmentTotalPrice    Int                      @map("equipment_total_price")
+  isActive               Boolean                  @default(true) @map("is_active")
+  createdAt              DateTime                 @default(now()) @map("created_at")
+  updatedAt              DateTime                 @updatedAt @map("updated_at")
+  deletedAt              DateTime?                @map("deleted_at")
+  ActivityEquipmentTaxes ActivityEquipmentTaxes[]

  @@map("activity_equipments")
  @@schema("act")
 }

 model ActivityEquipmentTaxes {
-  id                   Int        @id @default(autoincrement())
-  activityEquipmentXid Int        @map("activity_equipment_xid")
-  activityEquipment    Activities @relation(fields: [activityEquipmentXid], references: [id], onDelete: Cascade)
-  taxXid               Int        @map("tax_xid")
-  taxes                Taxes      @relation(fields: [taxXid], references: [id], onDelete: Restrict)
-  taxPer               Float      @map("tax_per")
-  taxAmount            Int        @map("tax_amount")
-  isActive             Boolean    @default(true) @map("is_active")
-  createdAt            DateTime   @default(now()) @map("created_at")
-  updatedAt            DateTime   @updatedAt @map("updated_at")
-  deletedAt            DateTime?  @map("deleted_at")
+  id                   Int                @id @default(autoincrement())
+  activityEquipmentXid Int                @map("activity_equipment_xid")
+  activityEquipment    ActivityEquipments @relation(fields: [activityEquipmentXid], references: [id], onDelete: Cascade)
+  taxXid               Int                @map("tax_xid")
+  taxes                Taxes              @relation(fields: [taxXid], references: [id], onDelete: Restrict)
+  taxPer               Float              @map("tax_per")
+  taxAmount            Int                @map("tax_amount")
+  isActive             Boolean            @default(true) @map("is_active")
+  createdAt            DateTime           @default(now()) @map("created_at")
+  updatedAt            DateTime           @updatedAt @map("updated_at")
+  deletedAt            DateTime?          @map("deleted_at")

  @@map("activity_equipment_taxes")
  @@schema("act")
@@ -1277,8 +1443,7 @@ model ActivityNavigationModes {
  id                           Int                            @id @default(autoincrement())
  activityXid                  Int                            @map("activity_xid")
  activity                     Activities                     @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  navigationModeXid            Int                            @map("navigation_mode_xid")
-  navigationMode               NavigationModes                @relation(fields: [navigationModeXid], references: [id], onDelete: Restrict)
+  navigationModeName           String                         @map("navigation_mode_name") @db.VarChar(30)
  isInActivityChargeable       Boolean                        @default(false) @map("is_in_activity_chargeable")
  navigationModesBasePrice     Int                            @map("navigation_modes_base_price")
  navigationModesTotalPrice    Int                            @map("navigation_modes_total_price")
@@ -1310,54 +1475,52 @@ model ActivityNavigationModesTaxes {
 }

 model ActivityPickUpDetails {
-  id                      Int                       @id @default(autoincrement())
-  activityXid             Int                       @map("activity_xid")
-  activity                Activities                @relation(fields: [activityXid], references: [id], onDelete: Cascade)
-  isPickUp                Boolean                   @default(false) @map("is_pick_up")
-  locationLat             Float?                    @map("location_lat")
-  locationLong            Float?                    @map("location_long")
-  locationAddress         String?                   @map("location_address") @db.VarChar(150)
-  isActive                Boolean                   @default(true) @map("is_active")
-  createdAt               DateTime                  @default(now()) @map("created_at")
-  updatedAt               DateTime                  @updatedAt @map("updated_at")
-  deletedAt               DateTime?                 @map("deleted_at")
-  ActivityPickUpTransport ActivityPickUpTransport[]
-
-  @@map("activity_pick_up_details")
-  @@schema("act")
-}
-
-model ActivityPickUpTransport {
  id                           Int                            @id @default(autoincrement())
-  activityPickUpDetailsXid     Int                            @map("activity_pick_up_details_xid")
-  activityPickUpDetails        ActivityPickUpDetails          @relation(fields: [activityPickUpDetailsXid], references: [id], onDelete: Cascade)
-  transportModeXid             Int                            @map("transport_mode_xid")
-  transportMode                TransportModes                 @relation(fields: [transportModeXid], references: [id], onDelete: Restrict)
-  isTransportModeChargeable    Boolean                        @default(false) @map("is_transport_mode_chargeable")
+  activities                   Activities?                    @relation(fields: [activitiesXid], references: [id])
+  activitiesXid                Int?                           @map("activity_xid")
+  isPickUp                     Boolean                        @default(false) @map("is_pick_up")
+  locationLat                  Float?                         @map("location_lat")
+  locationLong                 Float?                         @map("location_long")
+  locationAddress              String?                        @map("location_address") @db.VarChar(150)
  transportBasePrice           Int                            @map("transport_base_price")
  transportTotalPrice          Int                            @map("transport_total_price")
  isActive                     Boolean                        @default(true) @map("is_active")
  createdAt                    DateTime                       @default(now()) @map("created_at")
  updatedAt                    DateTime                       @updatedAt @map("updated_at")
  deletedAt                    DateTime?                      @map("deleted_at")
-  ActivityPickUpTransportTaxes ActivityPickUpTransportTaxes[]
+  activityPickUpTransportTaxes ActivityPickUpTransportTaxes[]
+
+  @@map("activity_pick_up_details")
+  @@schema("act")
+}
+
+model ActivityPickUpTransport {
+  id               Int            @id @default(autoincrement())
+  activityXid      Int            @map("activity_xid")
+  activity         Activities     @relation(fields: [activityXid], references: [id], onDelete: Cascade)
+  transportModeXid Int            @map("transport_mode_xid")
+  transportMode    TransportModes @relation(fields: [transportModeXid], references: [id], onDelete: Restrict)
+  isActive         Boolean        @default(true) @map("is_active")
+  createdAt        DateTime       @default(now()) @map("created_at")
+  updatedAt        DateTime       @updatedAt @map("updated_at")
+  deletedAt        DateTime?      @map("deleted_at")

  @@map("activity_pick_up_transport")
  @@schema("act")
 }

 model ActivityPickUpTransportTaxes {
-  id                         Int                     @id @default(autoincrement())
-  activityPickUpTransportXid Int                     @map("activity_pick_up_transport_xid")
-  activityPickUpTransport    ActivityPickUpTransport @relation(fields: [activityPickUpTransportXid], references: [id], onDelete: Cascade)
-  taxXid                     Int                     @map("tax_xid")
-  taxes                      Taxes                   @relation(fields: [taxXid], references: [id], onDelete: Restrict)
-  taxPer                     Float                   @map("tax_per")
-  taxAmount                  Int                     @map("tax_amount")
-  isActive                   Boolean                 @default(true) @map("is_active")
-  createdAt                  DateTime                @default(now()) @map("created_at")
-  updatedAt                  DateTime                @updatedAt @map("updated_at")
-  deletedAt                  DateTime?               @map("deleted_at")
+  id                       Int                   @id @default(autoincrement())
+  activityPickUpDetailsXid Int                   @map("activity_pick_up_xid")
+  activityPickUpDetails    ActivityPickUpDetails @relation(fields: [activityPickUpDetailsXid], references: [id], onDelete: Cascade)
+  taxXid                   Int                   @map("tax_xid")
+  taxes                    Taxes                 @relation(fields: [taxXid], references: [id], onDelete: Restrict)
+  taxPer                   Float                 @map("tax_per")
+  taxAmount                Int                   @map("tax_amount")
+  isActive                 Boolean               @default(true) @map("is_active")
+  createdAt                DateTime              @default(now()) @map("created_at")
+  updatedAt                DateTime              @updatedAt @map("updated_at")
+  deletedAt                DateTime?             @map("deleted_at")

  @@map("activity_pick_up_transport_taxes")
  @@schema("act")
@@ -1388,9 +1551,11 @@ model ScheduleHeader {
  activityVenue       ActivityVenues        @relation(fields: [activityVenueXid], references: [id], onDelete: Cascade)
  scheduleType        String                @map("schedule_type") @db.VarChar(30)
  startDate           DateTime              @map("start_date")
-  endDate             DateTime              @map("end_date")
-  byWeekday           Boolean               @default(false) @map("by_weekday")
-  earlyCheckInMins    Int                   @map("early_check_in_mins")
+  endDate             DateTime?             @map("end_date")
+  earlyCheckInMins    Int?                  @map("early_check_in_mins")
+  bookingCutOffMins   Int?                  @map("booking_cut_off_mins")
+  effectiveFromDt     String?               @map("effective_from_dt")
+  effectiveToDt       String?               @map("effective_to_dt")
  isActive            Boolean               @default(true) @map("is_active")
  createdAt           DateTime              @default(now()) @map("created_at")
  updatedAt           DateTime              @updatedAt @map("updated_at")
@@ -1398,6 +1563,8 @@ model ScheduleHeader {
  ScheduleDetails     ScheduleDetails[]
  Cancellations       Cancellations[]
  ItineraryActivities ItineraryActivities[]
+  scheduleOccurences  ScheduleOccurences[]
+  scheduleRecurrences ScheduleRecurrence[]

  @@map("schedule_header")
  @@schema("sch")
@@ -1407,8 +1574,12 @@ model ScheduleDetails {
  id                Int            @id @default(autoincrement())
  scheduleHeaderXid Int            @map("schedule_header_xid")
  scheduleHeader    ScheduleHeader @relation(fields: [scheduleHeaderXid], references: [id], onDelete: Cascade)
+  occurenceDate     DateTime?      @map("occurence_date")
+  weekDay           String?        @map("week_day") @db.VarChar(30)
+  dayOfMonth        Int?           @map("day_of_month")
  startTime         String         @map("start_time") @db.VarChar(30)
  endTime           String         @map("end_time") @db.VarChar(30)
+  maxCapacity       Int            @map("max_capacity")
  isActive          Boolean        @default(true) @map("is_active")
  createdAt         DateTime       @default(now()) @map("created_at")
  updatedAt         DateTime       @updatedAt @map("updated_at")
@@ -1418,21 +1589,50 @@ model ScheduleDetails {
  @@schema("sch")
 }

+model ScheduleOccurences {
+  id                Int            @id @default(autoincrement())
+  scheduleHeaderXid Int            @map("schedule_header_xid")
+  scheduleHeader    ScheduleHeader @relation(fields: [scheduleHeaderXid], references: [id], onDelete: Cascade)
+  occurenceDate     DateTime       @map("occurence_date")
+  isActive          Boolean        @default(true) @map("is_active")
+  createdAt         DateTime       @default(now()) @map("created_at")
+  updatedAt         DateTime       @updatedAt @map("updated_at")
+  deletedAt         DateTime?      @map("deleted_at")
+
+  @@map("schedule_occurences")
+  @@schema("sch")
+}
+
+model ScheduleRecurrence {
+  id                Int            @id @default(autoincrement())
+  scheduleHeaderXid Int            @map("schedule_header_xid")
+  scheduleHeader    ScheduleHeader @relation(fields: [scheduleHeaderXid], references: [id], onDelete: Cascade)
+  weekDay           String?        @map("week_day") @db.VarChar(30)
+  dayOfMonth        Int?           @map("day_of_month")
+  isActive          Boolean        @default(true) @map("is_active")
+  createdAt         DateTime       @default(now()) @map("created_at")
+  updatedAt         DateTime       @updatedAt @map("updated_at")
+  deletedAt         DateTime?      @map("deleted_at")
+
+  @@map("schedule_recurrence")
+  @@schema("sch")
+}
+
 model Cancellations {
  id                 Int            @id @default(autoincrement())
  scheduleHeaderXid  Int            @map("schedule_header_xid")
  scheduleHeader     ScheduleHeader @relation(fields: [scheduleHeaderXid], references: [id], onDelete: Cascade)
-  occurenceDate      DateTime       @map("occurence_date")
-  startTime          String         @map("start_time") @db.VarChar(30)
-  endTime            String         @map("end_time") @db.VarChar(30)
-  cancellationReason String         @map("cancellation_reason")
+  occurenceDate      DateTime?      @map("occurence_date")
+  startTime          String?        @map("start_time") @db.VarChar(30)
+  endTime            String?        @map("end_time") @db.VarChar(30)
+  cancellationReason String?        @map("cancellation_reason")
  isActive           Boolean        @default(true) @map("is_active")
  createdAt          DateTime       @default(now()) @map("created_at")
  updatedAt          DateTime       @updatedAt @map("updated_at")
  deletedAt          DateTime?      @map("deleted_at")

  @@map("cancellations")
-  @@schema("act")
+  @@schema("sch")
 }

 //  ITINERARY MODELS
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
--- a/serverless.host.yml
+++ b/serverless.host.yml
@@ -0,0 +1,13 @@
+service: minglar-host
+
+useDotenv: ${file(./serverless/common.yml):useDotenv}
+params: ${file(./serverless/common.yml):params}
+provider: ${file(./serverless/common.yml):provider}
+build: ${file(./serverless/common.yml):build}
+package: ${file(./serverless/common.yml):package}
+plugins: ${file(./serverless/common.yml):plugins}
+custom: ${file(./serverless/common.yml):custom}
+
+functions:
+  - ${file(./serverless/functions/host.yml)}
+
--- a/serverless.minglaradmin.yml
+++ b/serverless.minglaradmin.yml
@@ -0,0 +1,13 @@
+service: minglar-admin
+
+useDotenv: ${file(./serverless/common.yml):useDotenv}
+params: ${file(./serverless/common.yml):params}
+provider: ${file(./serverless/common.yml):provider}
+build: ${file(./serverless/common.yml):build}
+package: ${file(./serverless/common.yml):package}
+plugins: ${file(./serverless/common.yml):plugins}
+custom: ${file(./serverless/common.yml):custom}
+
+functions:
+  - ${file(./serverless/functions/minglaradmin.yml)}
+
--- a/serverless.prepopulate.yml
+++ b/serverless.prepopulate.yml
@@ -0,0 +1,13 @@
+service: minglar-prepopulate
+
+useDotenv: ${file(./serverless/common.yml):useDotenv}
+params: ${file(./serverless/common.yml):params}
+provider: ${file(./serverless/common.yml):provider}
+build: ${file(./serverless/common.yml):build}
+package: ${file(./serverless/common.yml):package}
+plugins: ${file(./serverless/common.yml):plugins}
+custom: ${file(./serverless/common.yml):custom}
+
+functions:
+  - ${file(./serverless/functions/prepopulate.yml)}
+
--- a/serverless.prisma-layer.yml
+++ b/serverless.prisma-layer.yml
@@ -0,0 +1,32 @@
+service: minglar-prisma-layer
+
+useDotenv: true
+
+params:
+  dev:
+    stage: dev
+  test:
+    stage: test
+  uat:
+    stage: uat
+
+provider:
+  name: aws
+  runtime: nodejs22.x
+  region: ap-south-1
+  stage: ${opt:stage, 'dev'}
+  deploymentBucket:
+    # use a fixed bucket name to prevent Serverless from creating/quashing a resource
+    name: serverless-framework-deployments-ap-south-1-50264b8e-d2b9
+    # optionally uncomment below to enable serverless to create if missing
+    # serverSideEncryption: AES256
+  versionFunctions: false
+
+layers:
+  prisma:
+    path: layers/prisma
+    name: ${self:service}-prisma-layer-${sls:stage}
+    description: Prisma 7 client with pg driver adapter (no binary engines)
+    compatibleRuntimes:
+      - nodejs22.x
+    retain: false
--- a/serverless.user.yml
+++ b/serverless.user.yml
@@ -0,0 +1,13 @@
+service: minglar-user
+
+useDotenv: ${file(./serverless/common.yml):useDotenv}
+params: ${file(./serverless/common.yml):params}
+provider: ${file(./serverless/common.yml):provider}
+build: ${file(./serverless/common.yml):build}
+package: ${file(./serverless/common.yml):package}
+plugins: ${file(./serverless/common.yml):plugins}
+custom: ${file(./serverless/common.yml):custom}
+
+functions:
+  - ${file(./serverless/functions/user.yml)}
+
--- a/serverless.yml
+++ b/serverless.yml
@@ -1,4 +1,6 @@
-service: minglar
+# Legacy monolith config. For new deployments use serverless.*.yml files.
+service: minglarDev
+

 useDotenv: true

@@ -15,13 +17,19 @@ provider:
  runtime: nodejs22.x
  region: ap-south-1
  stage: ${opt:stage, 'dev'}
+  deploymentBucket:
+    # use a fixed bucket name to prevent Serverless from creating/quashing a resource
+    name: serverless-framework-deployments-ap-south-1-50264b8e-d2b9
+    # optionally uncomment below to enable serverless to create if missing
+    # serverSideEncryption: AES256
  versionFunctions: false
  memorySize: 512
  # Apply Prisma layer to all functions
  # Reference the layer defined in this stack using CloudFormation Ref
  layers:
    # Use the exported stack output so deploy function works (expects a string ARN)
-    - ${cf:${self:service}-${sls:stage}.PrismaLambdaLayerQualifiedArn}
+    # For offline/local, fall back to an empty string so the CF lookup is optional.
+    - ${cf:${self:service}-${sls:stage}.PrismaLambdaLayerQualifiedArn, ''}
  apiGateway:
    binaryMediaTypes:
      - '*/*'
@@ -56,6 +64,7 @@ provider:
    MINGLAR_ADMIN_EMAIL: ${env:MINGLAR_ADMIN_EMAIL}
    AM_INVITATION_LINK: ${env:AM_INVITATION_LINK}
    HOST_LINK: ${env:HOST_LINK}
+    HOST_LINK_PQ: ${env:HOST_LINK_PQ}
 
  iam:
    role:
@@ -70,10 +79,6 @@ provider:
            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}'
            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}/*'
 
-custom:
-  serverless-offline:
-    reloadHandler: true
- 
 build:
  esbuild:
    bundle: true
@@ -142,7 +147,18 @@ functions:
  - ${file(./serverless/functions/host.yml)}
  - ${file(./serverless/functions/minglaradmin.yml)}
  - ${file(./serverless/functions/prepopulate.yml)}
-  - ${file(./serverless/functions/pqq.yml)}
+  - ${file(./serverless/functions/user.yml)}
 
 plugins:
-  - serverless-offline
+  - serverless-offline
+  - serverless-plugin-split-stacks
+
+custom:
+  serverless-offline:
+    reloadHandler: true
+
+  # split-stacks configuration to avoid CloudFormation resource limit
+  splitStacks:
+    perFunction: true
+    perType: true
+    perGroupFunction: false
--- a/serverless.yml.backup
+++ b/serverless.yml.backup
@@ -1,764 +0,0 @@
-service: minglarDev
-
-provider:
-  name: aws
-  runtime: nodejs22.x
-  region: ap-south-1
-  versionFunctions: false
-  memorySize: 512 # Default memory for all functions (can be overridden per function)
-  apiGateway:
-    binaryMediaTypes:
-      - '*/*'
-    minimumCompressionSize: 1024
-
-  environment:
-    DATABASE_URL: ${env:DATABASE_URL}
-    DB_USERNAME: ${env:DB_USERNAME}
-    DB_PASSWORD: ${env:DB_PASSWORD}
-    DB_DATABASE_NAME: ${env:DB_DATABASE_NAME}
-    DB_HOSTNAME: ${env:DB_HOSTNAME}
-    DB_PORT: ${env:DB_PORT}
-    BY_PASS_EMAIL: ${env:BY_PASS_EMAIL}
-    BYPASS_OTP: ${env:BYPASS_OTP}
-    BREVO_EMAIL_API_KEY: ${env:BREVO_EMAIL_API_KEY}
-    BREVO_API_BASEURL: ${env:BREVO_API_BASEURL}
-    BREVO_FROM_EMAIL: ${env:BREVO_FROM_EMAIL}
-    BREVO_SMTP_HOST: ${env:BREVO_SMTP_HOST}
-    BREVO_SMTP_PORT: ${env:BREVO_SMTP_PORT}
-    BREVO_SMTP_USER: ${env:BREVO_SMTP_USER}
-    BREVO_SMTP_PASS: ${env:BREVO_SMTP_PASS}
-    REFRESH_TOKEN_SECRET: ${env:REFRESH_TOKEN_SECRET}
-    JWT_SECRET: ${env:JWT_SECRET}
-    SALT_ROUNDS: ${env:SALT_ROUNDS}
-    NODE_ENV: ${env:NODE_ENV}
-    S3_BUCKET_NAME: ${env:S3_BUCKET_NAME}
-    MINGLAR_ADMIN_NAME: ${env:MINGLAR_ADMIN_NAME}
-    MINGLAR_ADMIN_EMAIL: ${env:MINGLAR_ADMIN_EMAIL}
-
-  iam:
-    role:
-      statements:
-        - Effect: Allow
-          Action:
-            - s3:PutObject
-            - s3:GetObject
-            - s3:DeleteObject
-            - s3:ListBucket
-          Resource:
-            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}'
-            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}/*'
-
-custom:
-  esbuild:
-    bundle: true
-    minify: true
-    sourcemap: false
-    target: node20
-    platform: node
-    concurrency: 5
-    external:
-      - '@prisma/client'
-      - '.prisma'
-    exclude:
-      - 'aws-sdk'
-
-package:
-  individually: true
-  patterns:
-    - '!node_modules/**'
-    - '!**/*.test.js'
-    - '!**/*.spec.js'
-    - '!**/test/**'
-    - '!**/__tests__/**'
-    - '!package-lock.json'
-    - '!yarn.lock'
-    - '!README.md'
-    - '!*.config.js'
-    - '!.git/**'
-    - '!.github/**'
-
-functions:
-  getHosts:
-    handler: src/modules/host/handlers/host.handler
-    memorySize: 384 # Lower memory for simple GET operations
-    package:
-      patterns:
-        - 'src/modules/host/handlers/host.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host
-          method: get
-
-  verifyOtp:
-    handler: src/modules/host/handlers/verifyOtp.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/verifyOtp.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/verify-otp
-          method: post
-
-  loginForHost:
-    handler: src/modules/host/handlers/loginForHost.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/loginForHost.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/login
-          method: post
-
-  registrationOfHost:
-    handler: src/modules/host/handlers/registration.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/registration.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/registration
-          method: post
-
-  createPasswordForHost:
-    handler: src/modules/host/handlers/createPassword.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/createPassword.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/create-password
-          method: post
-
-  addPaymentDetailsForHost:
-    handler: src/modules/host/handlers/addPaymentDetails.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/addPaymentDetails.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/add-payment-details
-          method: post
-
-  addActivity:
-    handler: src/modules/host/handlers/addActivity.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/addActivity.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/add-activity
-          method: post
-
-  getHostById:
-    handler: src/modules/host/handlers/getbyidhandler.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getbyidhandler.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/getById
-          method: get
-
-  getPQQQuestionDetailsById:
-    handler: src/modules/host/handlers/getByIdPQQ.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getByIdPQQ.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/get-pqq-question-details
-          method: get
-
-  getLatestPQQQuestionDetails:
-    handler: src/modules/host/handlers/getLatestQuestionDetailsPQQ.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getLatestQuestionDetailsPQQ.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/get-latest-pqq-question-details
-          method: get
-
-  getActivityTypes:
-    handler: src/modules/host/handlers/getActivity.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getActivity.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/get-activity
-          method: get
-
-  acceptMinglarAgreement:
-    handler: src/modules/host/handlers/acceptAgreement.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/acceptAgreement.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /host/accept-agreement
-          method: patch
-
-  getStepperInfo:
-    handler: src/modules/host/handlers/getStepper.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getStepper.*'
-        - 'src/common/utils/handlers/safeHandler.*'
-        - 'src/common/database/**'
-        - 'src/modules/host/services/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /stepper
-          method: get
-
-  getSuggestion:
-    handler: src/modules/minglaradmin/handlers/getSuggestion.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-suggestion
-          method: get
-
-  minglarRegistration:
-    handler: src/modules/minglaradmin/handlers/registration.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/registration
-          method: post
-
-  minglarLoginForAdmin:
-    handler: src/modules/minglaradmin/handlers/loginForMinglar.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/login
-          method: post
-
-  minglarCreatePassword:
-    handler: src/modules/minglaradmin/handlers/createPassword.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/create-password
-          method: post
-
-  # Functions using AWS SDK - KEEP AS IS with higher memory
-  updateMinglarProfile:
-    handler: src/modules/minglaradmin/handlers/updateProfile.handler
-    memorySize: 512 # Higher memory for AWS SDK operations
-    timeout: 30
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/handlers/updateProfile.*'
-        - 'src/modules/minglaradmin/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-        - 'node_modules/@aws-sdk/**'
-        - 'node_modules/@smithy/**'
-        - 'node_modules/tslib/**'
-        - 'node_modules/fast-xml-parser/**'
-    events:
-      - httpApi:
-          path: /minglaradmin/update-profile
-          method: patch
-
-  prepopulateTeammate:
-    handler: src/modules/minglaradmin/handlers/prepopulateTeammate.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/prepopulate-Roles
-          method: get
-
-  inviteTeammate:
-    handler: src/modules/minglaradmin/handlers/inviteTeammate.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/invite-teammate
-          method: post
-
-  getAllHostApplication:
-    handler: src/modules/minglaradmin/handlers/getAllHostApplication.handler
-    memorySize: 512 # Higher memory for data-intensive operations
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-host-applications-am
-          method: get
-
-  getAllOnboardingHostApplications:
-    handler: src/modules/minglaradmin/handlers/getAllOnboardingHosts.handler
-    memorySize: 512 # Higher memory for data-intensive operations
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-host-applications-admin
-          method: get
-
-  getAllOnboardingHostApplications_New:
-    handler: src/modules/minglaradmin/handlers/getOnboardingNewApplications.handler
-    memorySize: 512 # Higher memory for data-intensive operations
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-host-applications-admin-new
-          method: get
-
-  getAllInvitationDetails:
-    handler: src/modules/minglaradmin/handlers/getAllInvitationDetails.handler
-    memorySize: 512
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-invitation-details
-          method: get
-
-  addSuggestion:
-    handler: src/modules/minglaradmin/handlers/addSuggestion.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/add-suggestion
-          method: post
-
-  getAllCoadminAndAMDetails:
-    handler: src/modules/minglaradmin/handlers/getAllCoadminAndAM.handler
-    memorySize: 512
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-coadmin-and-am-details
-          method: get
-
-  getAllInvitedCoadminAndAMDetails:
-    handler: src/modules/minglaradmin/handlers/getAllInvitedCoadminAndAM.handler
-    memorySize: 512
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/get-all-invited-coadmin-and-am
-          method: get
-
-  getAllBankAndCurrencyDetails:
-    handler: src/modules/prepopulate/handlers/getAllBankDetails.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-all-bank-currency-details
-          method: get
-
-  getCityByState:
-    handler: src/modules/prepopulate/handlers/getCityByState.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/prepopulate/handlers/getCityByState.*'
-        - 'src/modules/prepopulate/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-city-by-state
-          method: get
-
-  getBranchByBankXid:
-    handler: src/modules/prepopulate/handlers/getBranchByBank.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/prepopulate/handlers/getBranchByBank.*'
-        - 'src/modules/prepopulate/services/**'
-        - 'src/common/**'
-        - 'common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-branch-by-bank
-          method: get
-
-  getAllDocumentCountryStateCityDetails:
-    handler: src/modules/prepopulate/handlers/getAllDocTypeWithCountryState.handler
-    memorySize: 512
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-all-doc-country
-          method: get
-
-  getAllPqqQuesAns:
-    handler: src/modules/prepopulate/handlers/getAllPQQQuesWithAns.handler
-    memorySize: 512
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-all-pqq-ques-ans
-          method: get
-
-  getFrequenciesOfActivity:
-    handler: src/modules/prepopulate/handlers/getAllFrequencies.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /prepopulate/get-all-Frequencies
-          method: get
-
-  assignAMToHost:
-    handler: src/modules/minglaradmin/handlers/assignAM.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/assign-am-to-host
-          method: patch
-
-  editAgreementDetails:
-    handler: src/modules/minglaradmin/handlers/editAgreementDetails.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/edit-agreement-details
-          method: patch
-
-  acceptHostApplication:
-    handler: src/modules/minglaradmin/handlers/acceptHostApplication.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/accept-host-application
-          method: patch
-
-  acceptHostApplicationMinglar:
-    handler: src/modules/minglaradmin/handlers/acceptHostAppMinglar.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/accept-host-application-minglar
-          method: patch
-
-  rejectHostApplication:
-    handler: src/modules/minglaradmin/handlers/rejectHostApplication.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/reject-host-application
-          method: patch
-
-  rejectHostApplicationAM:
-    handler: src/modules/minglaradmin/handlers/rejectHostApplicationAM.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-    events:
-      - httpApi:
-          path: /minglaradmin/reject-host-application-am
-          method: patch
-
-  # Functions using AWS SDK and S3 - KEEP AS IS with higher memory
-  addCompanyDetails:
-    handler: src/modules/host/handlers/addCompanyDetails.handler
-    memorySize: 512
-    timeout: 30
-    package:
-      patterns:
-        - 'src/modules/host/handlers/addCompanyDetails.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-        # Only include specific AWS SDK modules needed for S3
-        - 'node_modules/@aws-sdk/client-s3/**'
-        - 'node_modules/@aws-sdk/s3-request-presigner/**'
-        - 'node_modules/@aws-sdk/types/**'
-        - 'node_modules/@aws-sdk/middleware-logger/**'
-        - 'node_modules/@aws-sdk/util-utf8-node/**'
-        - 'node_modules/@aws-sdk/util-utf8-browser/**'
-        - 'node_modules/@smithy/**'
-        - 'node_modules/tslib/**'
-        # Remove these large/unnecessary packages:
-        - 'node_modules/fast-xml-parser/**' # Remove if not used
-        - 'node_modules/lambda-multipart-parser/**' # You're using busboy directly
-        - 'node_modules/busboy/**'
-        # Remove these AWS utility packages (included in main SDK):
-        - 'node_modules/@aws-crypto/**'
-        # - 'node_modules/uuid/**'  # AWS SDK includes its own
-        # - 'node_modules/@aws/util-uri-escape/**'
-        # - 'node_modules/@aws/util-middleware/**'
-        - 'node_modules/@aws/smithy-client/**'
-        # - 'node_modules/@aws/lambda-invoke-store/**'
-    events:
-      - httpApi:
-          path: /host/add-company-details
-          method: patch
-
-  submitPqqAnswer:
-    handler: src/modules/host/handlers/submitPqqAns.handler
-    memorySize: 512
-    timeout: 30
-    package:
-      patterns:
-        - 'src/modules/host/handlers/submitPqqAns.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-        - 'node_modules/@aws-sdk/**'
-        - 'node_modules/@smithy/**'
-        - 'node_modules/tslib/**'
-        - 'node_modules/fast-xml-parser/**'
-        - 'node_modules/lambda-multipart-parser/**'
-        - 'node_modules/busboy/**'
-        - 'node_modules/@aws-crypto/**'
-        - 'node_modules/uuid/**'
-        - 'node_modules/@aws/util-uri-escape/**'
-        - 'node_modules/@aws/util-middleware/**'
-        - 'node_modules/@aws/smithy-client/**'
-        - 'node_modules/@aws/lambda-invoke-store/**'
-    events:
-      - httpApi:
-          path: /host/submit-pqq-ans
-          method: patch
-
-  submitFinalPqqAnswer:
-    handler: src/modules/host/handlers/getPQQScore.handler
-    memorySize: 512
-    timeout: 30
-    package:
-      patterns:
-        - 'src/modules/host/handlers/getPQQScore.*'
-        - 'src/modules/host/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
-        - 'node_modules/@aws-sdk/**'
-        - 'node_modules/@smithy/**'
-        - 'node_modules/tslib/**'
-        - 'node_modules/fast-xml-parser/**'
-        - 'node_modules/lambda-multipart-parser/**'
-        - 'node_modules/busboy/**'
-        - 'node_modules/@aws-crypto/**'
-        - 'node_modules/uuid/**'
-        - 'node_modules/@aws/util-uri-escape/**'
-        - 'node_modules/@aws/util-middleware/**'
-        - 'node_modules/@aws/smithy-client/**'
-        - 'node_modules/@aws/lambda-invoke-store/**'
-    events:
-      - httpApi:
-          path: /host/submit-final-pqq-ans
-          method: patch
-
-  addPQQSuggestion:
-    handler: src/modules/minglar/handlers/addPQQSuggestion.handler
-    memorySize: 384
-    package:
-      patterns:
-        - 'src/modules/minglaradmin/handlers/addPQQSuggestion.*'
-        - 'src/modules/minglaradmin/services/**'
-        - 'src/common/**'
-        - 'node_modules/@prisma/client/**'
-        - 'node_modules/.prisma/**'
-    events:
-      - httpApi:
-          path: /minglar/add-Pqq-suggestion
-          method: post
--- a/serverless/common.yml
+++ b/serverless/common.yml
@@ -0,0 +1,134 @@
+useDotenv: true
+
+params:
+  dev:
+    stage: dev
+  test:
+    stage: test
+  uat:
+    stage: uat
+
+provider:
+  name: aws
+  runtime: nodejs22.x
+  region: ap-south-1
+  stage: ${opt:stage, 'dev'}
+  deploymentBucket:
+    # use a fixed bucket name to prevent Serverless from creating/quashing a resource
+    name: serverless-framework-deployments-ap-south-1-50264b8e-d2b9
+    # optionally uncomment below to enable serverless to create if missing
+    # serverSideEncryption: AES256
+  versionFunctions: false
+  memorySize: 512
+  # Apply Prisma layer to all functions
+  # Reference the layer defined in the dedicated layer stack
+  layers:
+    - ${cf:minglar-prisma-layer-${sls:stage}.PrismaLambdaLayerQualifiedArn}
+  apiGateway:
+    binaryMediaTypes:
+      - '*/*'
+    minimumCompressionSize: 1024
+
+  environment:
+    DATABASE_URL: ${env:DATABASE_URL}
+    DB_USERNAME: ${env:DB_USERNAME}
+    DB_PASSWORD: ${env:DB_PASSWORD}
+    DB_DATABASE_NAME: ${env:DB_DATABASE_NAME}
+    DB_HOSTNAME: ${env:DB_HOSTNAME}
+    DB_PORT: ${env:DB_PORT}
+    BY_PASS_EMAIL: ${env:BY_PASS_EMAIL}
+    BYPASS_OTP: ${env:BYPASS_OTP}
+    BREVO_EMAIL_API_KEY: ${env:BREVO_EMAIL_API_KEY}
+    BREVO_API_BASEURL: ${env:BREVO_API_BASEURL}
+    BREVO_FROM_EMAIL: ${env:BREVO_FROM_EMAIL}
+    BREVO_SMTP_HOST: ${env:BREVO_SMTP_HOST}
+    BREVO_SMTP_PORT: ${env:BREVO_SMTP_PORT}
+    BREVO_SMTP_USER: ${env:BREVO_SMTP_USER}
+    BREVO_SMTP_PASS: ${env:BREVO_SMTP_PASS}
+    REFRESH_TOKEN_SECRET: ${env:REFRESH_TOKEN_SECRET}
+    JWT_SECRET: ${env:JWT_SECRET}
+    JWT_ACCESS_EXPIRATION_MINUTES: ${env:JWT_ACCESS_EXPIRATION_MINUTES}
+    JWT_REFRESH_EXPIRATION_DAYS: ${env:JWT_REFRESH_EXPIRATION_DAYS}
+    JWT_RESET_PASSWORD_EXPIRATION_MINUTES: ${env:JWT_RESET_PASSWORD_EXPIRATION_MINUTES}
+    JWT_VERIFY_EMAIL_EXPIRATION_MINUTES: ${env:JWT_VERIFY_EMAIL_EXPIRATION_MINUTES}
+    SALT_ROUNDS: ${env:SALT_ROUNDS}
+    NODE_ENV: ${env:NODE_ENV}
+    S3_BUCKET_NAME: ${env:S3_BUCKET_NAME}
+    MINGLAR_ADMIN_NAME: ${env:MINGLAR_ADMIN_NAME}
+    MINGLAR_ADMIN_EMAIL: ${env:MINGLAR_ADMIN_EMAIL}
+    AM_INVITATION_LINK: ${env:AM_INVITATION_LINK}
+    HOST_LINK: ${env:HOST_LINK}
+    HOST_LINK_PQ: ${env:HOST_LINK_PQ}
+
+  iam:
+    role:
+      statements:
+        - Effect: Allow
+          Action:
+            - s3:PutObject
+            - s3:GetObject
+            - s3:DeleteObject
+            - s3:ListBucket
+          Resource:
+            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}'
+            - 'arn:aws:s3:::${env:S3_BUCKET_NAME}/*'
+
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node20
+    platform: node
+    # Mark as external so they're not bundled into the JS
+    external:
+      - '@prisma/client'
+      - '.prisma/client'
+      - '.prisma'
+      - '@prisma/adapter-pg'
+      - 'pg'
+      - 'zod'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    # Exclude prevents npm install of these packages in the zip
+    exclude:
+      - 'aws-sdk'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+      - '@prisma/adapter-pg'
+      - '@prisma/client'
+      - '.prisma'
+      - '.prisma/client'
+      - 'pg'
+      - 'zod'
+      - 'pg-*'
+      - 'postgres-*'
+      - 'pgpass'
+      - 'split2'
+      - 'xtend'
+
+package:
+  individually: true
+  patterns:
+    - '!node_modules/**'
+    - '!node_modules/@prisma/**'
+    - '!node_modules/.prisma/**'
+    - '!**/*.test.js'
+    - '!**/*.spec.js'
+    - '!**/test/**'
+    - '!**/__tests__/**'
+    - '!package-lock.json'
+    - '!yarn.lock'
+    - '!README.md'
+    - '!*.config.js'
+    - '!.git/**'
+    - '!.github/**'
+
+plugins:
+  - serverless-offline
+
+custom:
+  serverless-offline:
+    reloadHandler: true
--- a/serverless/functions/host.yml
+++ b/serverless/functions/host.yml
@@ -14,7 +14,7 @@ getHosts:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host
+        path: /
        method: get

 verifyOTP:
@@ -30,7 +30,7 @@ verifyOTP:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/verify-otp
+        path: /Host_Admin/onboarding/verify-otp
        method: post

 login:
@@ -46,7 +46,7 @@ login:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/login
+        path: /Host_Admin/onboarding/login
        method: post

 signUp:
@@ -62,7 +62,7 @@ signUp:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/registration
+        path: /Host_Admin/onboarding/registration
        method: post

 createPassword:
@@ -78,7 +78,7 @@ createPassword:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/create-password
+        path: /Host_Admin/onboarding/create-password
        method: post

 updateBankDetails:
@@ -94,7 +94,7 @@ updateBankDetails:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/add-payment-details
+        path: /Host_Admin/onboarding/add-payment-details
        method: post

 saveActivity_ForPQQ:
@@ -110,7 +110,7 @@ saveActivity_ForPQQ:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/add-activity
+        path: /Activity_Hub/OnBoarding/add-activity
        method: post

 getHostById:
@@ -126,7 +126,7 @@ getHostById:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/getById
+        path: /getById
        method: get

 getPQQ_ByQuestionId:
@@ -142,7 +142,7 @@ getPQQ_ByQuestionId:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/get-pqq-question-details
+        path: /Activity_Hub/OnBoarding/get-pqq-question-details
        method: get

 getPQQ_LastUpdatedQuestion:
@@ -158,7 +158,7 @@ getPQQ_LastUpdatedQuestion:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/get-latest-pqq-question-details
+        path: /Activity_Hub/OnBoarding/get-latest-pqq-question-details
        method: get

 prePopulateNewActivity:
@@ -174,9 +174,26 @@ prePopulateNewActivity:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/prepopulate-new-activity
+        path: /Activity_Hub/OnBoarding/prepopulate-new-activity
        method: get

+createNewActivity:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/CreateNewActivity.handler
+  memorySize: 1024
+  timeout: 30
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/CreateNewActivity.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /Activity_Hub/OnBoarding/create-new-activity
+        method: patch
+
 showSuggestion:
  handler: src/modules/host/handlers/Host_Admin/onboarding/showSuggestion.handler
  memorySize: 384
@@ -190,7 +207,23 @@ showSuggestion:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/get-suggestion
+        path: /get-suggestion
+        method: get
+
+getAllActivitySuggestion:
+  handler: src/modules/host/handlers/Host_Admin/onboarding/getAllActvitySuggestion.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Host_Admin/onboarding/getAllActvitySuggestion.handler.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /get-Activity-suggestion
        method: get

 getAllHostActivity:
@@ -206,7 +239,7 @@ getAllHostActivity:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/get-all-host-activity
+        path: /Activity_Hub/OnBoarding/get-all-host-activity
        method: get

 acceptAggrement:
@@ -222,9 +255,25 @@ acceptAggrement:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/accept-agreement
+        path: /Host_Admin/onboarding/accept-agreement
        method: patch

+getLatestAgreement:
+  handler: src/modules/host/handlers/Host_Admin/onboarding/getLatestAgreement.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Host_Admin/onboarding/getLatestAgreement.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /Host_Admin/onboarding/get-latest-agreement
+        method: get
+
 getStepperInfo:
  handler: src/modules/host/handlers/getStepper.handler
  memorySize: 384
@@ -243,6 +292,22 @@ getStepperInfo:
        path: /stepper
        method: get

+updateHostProfile:
+  handler: src/modules/host/handlers/updateHostProfile.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/updateHostProfile.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /profile
+        method: patch
+
 # Functions with S3/AWS SDK dependencies
 submitCompanyDetails:
  handler: src/modules/host/handlers/Host_Admin/onboarding/submitCompanyDetails.handler
@@ -255,7 +320,7 @@ submitCompanyDetails:
      - 'src/common/**'
  events:
    - httpApi:
-        path: /host/Host_Admin/onboarding/add-company-details
+        path: /Host_Admin/onboarding/add-company-details
        method: patch

 submitPQQ_Answer:
@@ -271,7 +336,7 @@ submitPQQ_Answer:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/submit-pqq-answer
+        path: /Activity_Hub/OnBoarding/submit-pqq-answer
        method: patch

 updatePQQ_LastAnswer:
@@ -287,10 +352,9 @@ updatePQQ_LastAnswer:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/submit-final-pqq-answer
+        path: /Activity_Hub/OnBoarding/submit-final-pqq-answer
        method: post

-
 submitPQQForReview:
  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQForReview.handler
  memorySize: 384
@@ -304,7 +368,7 @@ submitPQQForReview:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/submit-pqq-for-review
+        path: /Activity_Hub/OnBoarding/submit-pqq-for-review
        method: patch

 getAllPQQwithSubmittedAns:
@@ -319,7 +383,22 @@ getAllPQQwithSubmittedAns:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/get-all-pqq-ques-submited-ans
+        path: /Activity_Hub/OnBoarding/get-all-pqq-ques-submited-ans
+        method: get
+
+getAllDetailsOfActivityAndVenue:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/getAllDetailsOfActivityAndVenue.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /Activity_Hub/OnBoarding/get-all-details-activity-venue/{activityXid}
        method: get

 updateSuggestionAsReviewed:
@@ -334,7 +413,7 @@ updateSuggestionAsReviewed:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/update-suggestion-reviewed
+        path: /Activity_Hub/OnBoarding/update-suggestion-reviewed
        method: patch

 resendOTPmail:
@@ -351,3 +430,158 @@ resendOTPmail:
    - httpApi:
        path: /resend-otp
        method: post
+
+
+mediaUploadTos3:
+  handler: src/modules/host/handlers/mediaUploadToS3.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/mediaUploadToS3/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /media/upload/activity/{activityXid}
+        method: post
+
+
+venueMediaUploadTos3:
+  handler: src/modules/host/handlers/mediaUploadForVenueToS3.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/mediaUploadForVenueToS3/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /media/upload/venue/activity/{activityXid}
+        method: post
+
+
+mediaDeleteFroms3:
+  handler: src/modules/host/handlers/mediaDeleteFromS3.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/mediaDeleteFromS3/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /media/delete
+        method: delete
+
+createSchedulingForAct:
+  handler: src/modules/host/handlers/Activity_Hub/Scheduling/createSchedulingOfAct.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/Scheduling/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /scheduling/create
+        method: post
+
+getActivitiesByStatus:
+  handler: src/modules/host/handlers/Activity_Hub/Scheduling/getSchedulingOfAct.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/Scheduling/getSchedulingOfAct.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /scheduling/get-all-activities
+        method: get
+
+getVenueDurationByAct:
+  handler: src/modules/host/handlers/Activity_Hub/Scheduling/getVenueDurationByAct.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/Scheduling/getVenueDurationByAct.*'
+      - 'src/modules/host/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /scheduling/get-venue-duration/{activityXid}
+        method: get
+
+cancelSlotForActivity:
+  handler: src/modules/host/handlers/Activity_Hub/Scheduling/cancelSlot.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/Scheduling/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /scheduling/cancel-slot
+        method: post
+
+openCanceledSlotForActivity:
+  handler: src/modules/host/handlers/Activity_Hub/Scheduling/openCanceledSlot.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/Scheduling/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /scheduling/open-canceled-slot
+        method: patch
+
+createActivityAndAllQuestionsEntry:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/createActivityAndAllQuestionsEntry.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/createActivityAndAllQuestionsEntry**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /Activity_Hub/OnBoarding/create-activity
+        method: post
+
+submitPQAnswer:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /Activity_Hub/OnBoarding/submit-pq-answer
+        method: patch
--- a/serverless/functions/minglaradmin.yml
+++ b/serverless/functions/minglaradmin.yml
@@ -327,6 +327,22 @@ RejectPQQByAM:
        path: /minglaradmin/hosthub/hosts/reject-pq-by-am
        method: patch

+rejectActivityDetailsApplicationByAM:
+  handler: src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM**'
+      - 'src/modules/minglaradmin/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /minglaradmin/hosthub/hosts/reject-activity-application-by-am
+        method: patch
+
 acceptPQByAM:
  handler: src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.handler
  memorySize: 384
@@ -343,6 +359,22 @@ acceptPQByAM:
        path: /minglaradmin/hosthub/hosts/accept-pq-by-am
        method: patch

+acceptActivityDetailsApplicationByAM:
+  handler: src/modules/minglaradmin/handlers/hosthub/hosts/acceptActivityApplicationByAM.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/hosts/acceptActivityApplicationByAM**'
+      - 'src/modules/minglaradmin/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /minglaradmin/hosthub/hosts/accept-activity-application-by-am
+        method: patch
+
 rejectHostApplication:
  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/rejectHostApplication.handler
  memorySize: 384
@@ -391,6 +423,22 @@ addPQQSuggestion:
        path: /minglaradmin/hosthub/hosts/add-Pqq-suggestion
        method: post

+addActivitySuggestion:
+  handler: src/modules/minglaradmin/handlers/hosthub/hosts/addActivtiySuggestion.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/hosts/**'
+      - 'src/modules/minglaradmin/services/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /minglaradmin/hosthub/hosts/add-Activity-suggestion
+        method: post
+
 getAllPQPDetailsForAM:
  handler: src/modules/minglaradmin/handlers/hosthub/pqp/getAllPQPDetailsForAM.handler
  memorySize: 384
@@ -407,7 +455,6 @@ getAllPQPDetailsForAM:
        path: /minglaradmin/hosthub/pqp/pqp-details-for-am/{activityXid}
        method: get

-
 getSuggestionsForAM:
  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/showSuggestionToAM.handler
  memorySize: 384
--- a/serverless/functions/pqq.yml
+++ b/serverless/functions/pqq.yml
@@ -1,29 +0,0 @@
-createActivityAndAllQuestionsEntry:
-  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/createActivityAndAllQuestionsEntry.handler
-  memorySize: 384
-  package:
-    patterns:
-      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/createActivityAndAllQuestionsEntry**'
-      - ${file(./serverless/patterns/base.yml):pattern1}
-      - ${file(./serverless/patterns/base.yml):pattern2}
-      - ${file(./serverless/patterns/base.yml):pattern3}
-      - ${file(./serverless/patterns/base.yml):pattern4}
-  events:
-    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/create-activity
-        method: post
-
-submitPQAnswer:
-  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer.handler
-  memorySize: 384
-  package:
-    patterns:
-      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer**'
-      - ${file(./serverless/patterns/base.yml):pattern1}
-      - ${file(./serverless/patterns/base.yml):pattern2}
-      - ${file(./serverless/patterns/base.yml):pattern3}
-      - ${file(./serverless/patterns/base.yml):pattern4}
-  events:
-    - httpApi:
-        path: /host/Activity_Hub/OnBoarding/submit-pq-answer
-        method: patch
--- a/serverless/functions/prepopulate.yml
+++ b/serverless/functions/prepopulate.yml
@@ -13,7 +13,7 @@ getAllBankAndCurrencyDetails:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-all-bank-currency-details
+        path: /get-all-bank-currency-details
        method: get

 getCityByState:
@@ -29,7 +29,7 @@ getCityByState:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-city-by-state
+        path: /get-city-by-state
        method: get

 getBranchByBankXid:
@@ -45,7 +45,7 @@ getBranchByBankXid:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-branch-by-bank
+        path: /get-branch-by-bank
        method: get

 getAllDocumentCountryStateCityDetails:
@@ -60,7 +60,7 @@ getAllDocumentCountryStateCityDetails:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-all-doc-country
+        path: /get-all-doc-country
        method: get

 getAllPqqQuesAns:
@@ -75,7 +75,7 @@ getAllPqqQuesAns:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-all-pqq-ques-ans
+        path: /get-all-pqq-ques-ans
        method: get

 getFrequenciesOfActivity:
@@ -90,7 +90,7 @@ getFrequenciesOfActivity:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-all-Frequencies
+        path: /get-all-Frequencies
        method: get

 getAddActivityPrePopulate:
@@ -105,5 +105,5 @@ getAddActivityPrePopulate:
      - ${file(./serverless/patterns/base.yml):pattern4}
  events:
    - httpApi:
-        path: /prepopulate/get-add-activity-prepopulate
+        path: /get-add-activity-prepopulate
        method: get
--- a/serverless/functions/user.yml
+++ b/serverless/functions/user.yml
@@ -0,0 +1,424 @@
+# Prepopulate Module Functions
+# Reference data and lookup endpoints
+
+registerUser:
+  handler: src/modules/user/handlers/authentication/registration.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /register
+        method: post
+
+submitPersonalInfo:
+  handler: src/modules/user/handlers/authentication/submitPersonalInfo.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /submit-personal-info
+        method: post
+
+verifyOtpForUser:
+  handler: src/modules/user/handlers/authentication/verifyOtpForUser.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /verify-otp
+        method: post
+
+generateAccessFromRefreshToken:
+  handler: src/modules/user/handlers/authentication/generateRefereshToAccess.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /generate-access-from-refresh
+        method: post
+
+      
+setPasscodeForMobile:
+  handler: src/modules/user/handlers/authentication/setPasscodeForMobile.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /set-passcode
+        method: post
+
+
+verifyPasscode:
+  handler: src/modules/user/handlers/authentication/verifyPasscode.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /verify-passcode
+        method: post
+
+setUserInterest:
+  handler: src/modules/user/handlers/authentication/SetuserInterest.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /set-interests
+        method: post
+
+setUserLocationss:
+  handler: src/modules/user/handlers/authentication/SetLocationofUser.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /set-location-user
+        method: post
+
+getLandingPageDetails:
+  handler: src/modules/user/handlers/activities/landingPageAllDetails.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-landing-page-details
+        method: get
+
+getSurpriseMePageDetails:
+  handler: src/modules/user/handlers/activities/surpriseMePage.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-surprise-me-page-details
+        method: get
+
+getActivityDetailsById:
+  handler: src/modules/user/handlers/activities/getByIdActivityDetails.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-activity-details-by-id/{activity_xid}
+        method: get
+
+checkAvailabilityDetails:
+  handler: src/modules/user/handlers/activities/checkAvailabilityDetails.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/check-availability/{activity_xid}
+        method: get
+
+searchActivities:
+  handler: src/modules/user/handlers/activities/getSpecificSearchApi.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/specific-search
+        method: get
+
+searchSchoolsAndCompanies:
+  handler: src/modules/user/handlers/connections/getSchoolCompanyName.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/search-schools-companies
+        method: get
+
+searchCities:
+  handler: src/modules/user/handlers/connections/searchCities.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/search-cities
+        method: get
+
+addSchoolCompanyDetail:
+  handler: src/modules/user/handlers/connections/addSchoolCompanyDetail.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/add-school-company
+        method: post
+
+removeConnectionDetails:
+  handler: src/modules/user/handlers/connections/removeConnectionDetails.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/remove-connection-details
+        method: delete
+
+getAllConnectionOfUser:
+  handler: src/modules/user/handlers/connections/getAllConnectionDetailsOfUser.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/get-all-connections-details
+        method: get
+
+getActivityFromConnectionsInterest:
+  handler: src/modules/user/handlers/connections/getActivityFromConnectionsInterest.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/connections/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /connections/get-activity-from-connections-interest
+        method: get
+
+viewMoreActivitiesByInterest:
+  handler: src/modules/user/handlers/activities/viewMoreActivities.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/view-more-activities
+        method: get
+
+viewMoreActivitiesUpperSection:
+  handler: src/modules/user/handlers/activities/viewMoreUpperSection.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/view-more-activities-upper-section
+        method: get
+
+getRandomActiveActivity:
+  handler: src/modules/user/handlers/activities/getRandomActiveActivity.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-random-active-activity
+        method: get
+
+getNearbyActivities:
+  handler: src/modules/user/handlers/activities/getNearbyActivities.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-nearby-activities
+        method: get
+
+addActivityToBucketInterested:
+  handler: src/modules/user/handlers/activities/addToBucketInterested.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/add-to-bucket-interested
+        method: post
+
+removeActivityFromBucketInterested:
+  handler: src/modules/user/handlers/activities/removeFromBucketInterested.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/user/handlers/activities/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/remove-from-bucket-interested
+        method: post
+
+getFilteredLandingPageAllDetails:
+  handler: src/modules/user/handlers/activities/filteredLandingPageAllDetails.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-filtered-landing-page-details
+        method: get
+
+getAllBucketActivities:
+  handler: src/modules/user/handlers/activities/getAllBucketActivities.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /activities/get-all-bucket-activities
+        method: get
+
+getUserItineraryDetails:
+  handler: src/modules/user/handlers/itinerary/getUserItineraryDetails.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/user/**'
+      - ${file(./serverless/patterns/base.yml):pattern1}
+      - ${file(./serverless/patterns/base.yml):pattern2}
+      - ${file(./serverless/patterns/base.yml):pattern3}
+      - ${file(./serverless/patterns/base.yml):pattern4}
+  events:
+    - httpApi:
+        path: /itinerary/get-user-itinerary-details
+        method: get
--- a/src/common/database/prisma.module.ts
+++ b/src/common/database/prisma.module.ts
@@ -1,5 +1,5 @@
 import { Global, Module } from '@nestjs/common';
-import { PrismaService } from './prisma.lambda.service';
+import { PrismaService } from './prisma.service'; // correct export location

@Global()
@Module({
--- a/src/common/utils/constants/agreementTemplate.ts
+++ b/src/common/utils/constants/agreementTemplate.ts
@@ -0,0 +1,357 @@
+export const AGREEMENT_TEMPLATE = `
+MINGLAR HOST AGREEMENT
+Effective Date: [EFFECTIVE_DATE]
+
+BETWEEN
+
+Minglar India Private Limited, a company incorporated under the Companies Act, 2013, having its registered office at 602, Aaradhya Avenue X Eve, Naidu Colony, Pant Nagar, Ghatkopar (East), Mumbai 400075 (hereinafter referred to as “Minglar India Private Limited”, which expression shall include its successors and permitted assigns);
+
+AND
+
+[HOST_LEGAL_NAME], a [COMPANY_TYPE], having its principal place of business at [FULL_ADDRESS] (hereinafter referred to as “Host”, which expression shall include its owners, partners, directors, employees, representatives, and permitted assigns).
+
+Minglar India Private Limited and Host are individually referred to as a “Party” and collectively as the “Parties”.
+
+1. PURPOSE AND RELATIONSHIP
+
+1.1 Platform Overview
+Minglar India Private Limited operates a curated digital marketplace under the brand “Minglar” that enables users (“Users”) to discover, review, and book experiential activities, events, workshops, tours, and related services (“Activities”) offered by independent Hosts.
+
+1.2 Engagement
+The Host desires to list and provide its Activities on the Minglar platform subject to the terms and standards set forth in this Agreement.
+
+1.3 Independent Contractor
+Nothing in this Agreement shall be construed as creating a partnership under the Indian Partnership Act, 1932, joint venture, agency, employment, franchise, or profit-sharing arrangement. The Host operates strictly as an independent contractor and shall have full operational control over execution of its Activities.
+
+2. TERM
+
+2.1 Duration
+This Agreement shall remain valid for a fixed term of [DURATION_TEXT] and shall automatically expire on [EXPIRY_DATE], unless terminated earlier in accordance with Section 16.
+
+2.2 Renewal
+Renewal shall be subject to mutual agreement. Commission adjustments, if any, shall apply only at renewal due to inflation or additional expenses incurred by Minglar India Private Limited for platform upgrades or new features.
+
+3. HOST RESPONSIBILITIES
+
+3.1 Legal Compliance and Document Submission
+3.1.1 Compliance
+The Host shall obtain, maintain, and keep valid at all times all licenses, permits, approvals, registrations, certifications, insurance policies, and governmental permissions required under applicable laws for the lawful conduct of the Activities.
+
+3.1.2 Document Upload
+The Host shall, at the time of onboarding on the Minglar platform, upload true, complete, and legible copies of licenses, permits, registrations, tax certificates (including GST registration, where applicable), identity proof, business registration documents, insurance certificates, and any other documents reasonably required by Minglar India Private Limited for verification purposes.
+
+3.1.3 Accuracy and Updates
+The Host represents and warrants that all documents submitted are authentic, valid, and up to date. The Host shall promptly upload updated copies whenever any document expires, is renewed, modified, or replaced. Failure to provide valid documentation may result in suspension, delisting, or termination of this Agreement at the sole discretion of Minglar India Private Limited.
+
+3.1.4 Verification
+Minglar India Private Limited shall have the right to verify such documents and request additional documentation if required for regulatory, compliance, safety, or audit purposes.
+
+3.2 Accurate Listing and Host Anonymity
+3.2.1 Activity Details
+The Host shall provide complete, accurate, and up-to-date descriptions for each Activity, including inclusions, exclusions, duration, safety requirements, pricing, and applicable tax percentages at the time of onboarding. The Host shall ensure that all information remains current throughout the term of this Agreement.
+
+3.2.2 Host Content
+Hosts retain ownership of original content they upload (such as activity descriptions, images, and videos).
+However, by uploading content, the Host grants Minglar a:
+- Worldwide
+- Non-exclusive
+- Royalty-free
+- Transferable
+- Sub-licensable
+license to use, reproduce, modify, adapt, publish, translate, distribute and display such content for purposes of operating, marketing and promoting the platform.
+This license continues for as long as the content remains on the platform.
+
+3.2.3 Unique Activity Name
+The Host shall provide a unique name for each Activity during onboarding. The Host’s actual company name, personal name, or brand shall not be visible to Users on the activity card or in any public-facing listing.
+
+3.2.4 Prohibition on Branding and Contact
+The Host shall not display, embed, or otherwise reveal its contact information, company name, logo, website, email, or other identifiable details in any photos, videos, descriptions, chat messages, or other content shared with Users via the Minglar platform.
+
+3.2.5 Breach and Suspension
+Any attempt to circumvent these provisions or display unauthorized branding or contact details shall be considered a material breach of this Agreement. Minglar India Private Limited reserves the right to suspend or delist the Activity immediately and take other remedial actions as necessary.
+
+3.3 Taxes
+3.3.1 Tax Responsibility
+The total Activity price listed shall be inclusive of all applicable taxes. Minglar India Private Limited shall collect such taxes from Users and transfer them to the Host. The Host shall be solely responsible for depositing and complying with tax obligations before local authorities.
+
+4. SAFETY AND OPERATIONAL STANDARDS
+
+4.1 General Duty of Care
+The Host shall conduct all Activities in a safe, hygienic, and controlled manner ensuring the well-being of Users at all times.
+
+4.2 Risk Management
+The Host shall conduct risk assessments, maintain standard operating procedures, provide safety briefings, and ensure trained and competent personnel supervise Activities.
+
+4.3 Transportation
+If the Host provides pick-up, drop-off, or in-Activity transportation, such transportation shall be safe, clean, reasonably comfortable, and legally compliant. The Host shall remain responsible for User safety during transport.
+
+4.4 SOS Emergency Protocol
+During execution of Activities, Minglar’s SOS feature shall be active. If activated by a User, the Host Operator shall receive immediate notification and live location details. The Host Operator shall immediately contact and reach the User. The emergency shall be cleared only after ensuring the User is safe. The Host Operator shall be the first point of contact for all emergencies.
+
+4.5 Equipment Standards
+The Host shall ensure that all equipment, tools, and materials used for conducting any Activity are:
+1. Maintained in accordance with the manufacturer’s recommendations and operational guidelines.
+2. Tested regularly to confirm they are safe and functional before each Activity.
+3. Kept clean, hygienic, and in good working order at all times.
+4. Adequate for the number of Users participating, ensuring no overuse or overcrowding that may compromise safety.
+The Host shall be solely responsible for any incidents, accidents, or injuries caused due to faulty, poorly maintained, unhygienic, or unsafe equipment. Failure to comply may result in suspension, delisting, or immediate termination of this Agreement under Section 16.
+
+5. QUALITY AND PUNCTUALITY
+
+5.1 Quality Standards
+The Host shall maintain consistently high service standards and continuously strive to improve user experience toward achieving five-star ratings.
+
+5.2 Timeliness
+The Host shall ensure timely check-in, commencement, and completion of Activities. Delays impacting Users’ onward travel or other bookings shall constitute service failure.
+
+6. INSURANCE
+
+The Host shall obtain, maintain, and keep valid insurance coverage appropriate for the risk associated with the respective Activities. Coverage shall be sufficient to protect Users, the Host, and Minglar India Private Limited against claims arising from accidents, injuries, fatalities, or property damage.
+
+6.1 Risk-Based Coverage
+The Host shall maintain Public Liability Insurance appropriate to the risk and scale of the respective Activities.
+
+6.2 Coverage Amount
+For high-risk or multi-participant Activities, coverage is recommended up to INR 5 Crores or an amount appropriate to cover potential claims arising from injury, death, or property damage.
+
+6.3 Additional Insured
+Policies shall name Minglar India Private Limited and Minglar Group Pte Ltd, Singapore as Additional Insured.
+
+6.4 Proof
+Valid insurance certificates must be submitted prior to onboarding and maintained throughout the Agreement term.
+
+7. USER WAIVERS
+The Host shall ensure that Users acknowledge and accept all standard waivers, terms, and risk disclosures prior to participation in any Activity, as provided by the Minglar platform.
+
+8. INDEMNITY
+The Host shall indemnify, defend, and hold harmless Minglar India Private Limited, its affiliates, employees, directors, and representatives from any claims, losses, damages, liabilities, fines, or expenses arising directly or indirectly from the Host’s failure to comply with laws, negligence, or breach of this Agreement.
+
+9. LIMITATION OF LIABILITY
+The total aggregate liability of Minglar India Private Limited arising out of or in connection with any claim relating to a specific Activity shall not exceed the total commission earned by Minglar India Private Limited from that particular Activity (or substantially similar activity category) conducted by the Host during the three (3) months immediately preceding the date of the claim.
+If the Host lists multiple different Activities, the liability cap applies only to the commission earned from the specific Activity giving rise to the claim and does not include commission earned from other unrelated Activities.
+Under no circumstances shall Minglar India Private Limited be liable for indirect, incidental, consequential, punitive, or special damages, including loss of profits, goodwill, reputation, or business opportunity.
+
+10. PAYMENT AND COMMISSION
+
+10.1 Commission
+10.1.1 Standard Commission
+A [COMMISSION_TEXT] commission shall be charged by Minglar India Private Limited on the Activity revenue (after deduction of applicable taxes).
+
+10.1.2 Fixed During Term
+The term of this agreement is [DURATION_TEXT]. This commission shall remain unchanged during the term of this Agreement.
+
+10.1.3 Renewal Adjustment
+At the time of renewal, Minglar India Private Limited reserves the right to adjust commission rates due to inflation or platform upgrades.
+
+10.2 Host Payout
+10.2.1 Timing
+Minglar India Private Limited shall remit payments to the Host 24 hours after check-in completion or no-show.
+
+10.2.2 Monthly Commission Invoice
+Minglar India Private Limited shall issue a monthly invoice to the Host detailing the commission earned. GST shall be charged extra.
+
+10.2.3 Banking and Gateway Charges
+All banking, payment gateway, and transaction fees arising from normal bookings shall be borne by the Host.
+
+11. BOOKING CANCELLATION
+
+11.1 Host-Related Cancellation
+If an Activity is cancelled due to host health, extreme weather, natural disasters, government restrictions, venue issues, equipment failure, team/partner unavailability, or other uncontrollable circumstances, the Host shall pay the applicable cancellation fee charged by the payment gateway. No payment will be remitted to the Host, and 100% of the booking amount including taxes shall be refunded to Users.
+
+11.2 User-Initiated Cancellation
+If Users cancel within the permitted period, the platform fee shall be deducted and the remaining amount refunded to Users. The Host will not receive payment for such cancellations.
+
+12. PARTICIPATION OF MINGLAR ACCOUNT MANAGER FOR AUDIT
+In case of low performance, low bookings, or safety/quality issues reported by Users that remain unresolved for more than one week, Minglar India Private Limited may send an Account Manager to audit the Activity at the Host’s location.
+The date and slot for such an audit shall be coordinated by the Account Manager and the Host.
+The participation of the Account Manager is free of charge. If the audit requires overnight stay or the Activity duration exceeds one day, the Host shall provide accommodation.
+Transportation costs for the Account Manager shall be shared 50% by the Host.
+Minglar India Private Limited reserves the right to send an Account Manager once per year or sooner in case of low performance, safety concerns, or user complaints with less than 2-star ratings.
+
+13. DATA PROTECTION, PRIVACY & INFORMATION SECURITY
+
+13.1 Compliance with Applicable Laws
+The Parties acknowledge that Minglar Group Pte. Ltd. (Singapore) and/or Minglar India Private Limited (India) collects and processes personal data in compliance with applicable laws, including:
+- The Personal Data Protection Act 2012 (“PDPA”); and
+- The Digital Personal Data Protection Act 2023 (“DPDP Act”).
+Each Party agrees to comply with all applicable privacy and data protection laws in the jurisdiction where the Activity is conducted.
+
+13.2 Roles of the Parties
+a) Minglar shall act as the Data Fiduciary / Data Controller for personal data collected via the Minglar platform.
+b) The Host shall act as a Data Processor / Authorized Data Recipient when processing User personal data solely for the purpose of conducting booked Activities.
+The Host shall not independently determine the purpose or means of processing User personal data without prior written authorization from Minglar.
+
+PART A – USER PERSONAL DATA
+
+13.3 Categories of User Data Collected
+The Host acknowledges that Minglar may collect and process the following categories of User personal data through the platform:
+a) Full name
+b) Date of birth
+c) Mobile number and email address
+d) Gender
+e) Height and weight (where Activity eligibility or safety restrictions apply)
+f) School and college information
+g) Profile photograph
+h) Home location and/or real-time GPS location
+i) Check-in and check-out data
+j) SOS or emergency alerts
+k) Payment method details and transaction information
+l) Spending preferences or monthly budget indicators
+m) Biometric verification data (including facial verification, where applicable)
+n) Medical conditions or health disclosures (Phase 2 implementation)
+o) Attendance logs and activity participation records
+
+13.4 Sensitive Personal Data
+Certain categories of data may constitute sensitive personal data, including:
+- Biometric data
+- Medical or health information
+- Real-time location data
+- Financial/payment information
+- Profile photographs capable of biometric identification
+Such data shall:
+a) Be processed only where necessary for safety, verification, compliance, or Activity execution;
+b) Be accessed strictly on a need-to-know basis;
+c) Be protected using enhanced security measures;
+d) Not be downloaded, stored externally, or retained by the Host beyond the Activity duration unless legally required.
+The Host shall not independently collect additional medical, biometric, or financial data outside the Minglar platform without prior written approval.
+
+13.5 Confidentiality and Use Restrictions
+The Host shall treat all User and platform data as strictly confidential, including attendance logs, SOS alerts, emergency records, and location data collected during Activities.
+User data shall:
+a) Be used solely for Activity execution and safety;
+b) Not be shared with third parties without prior written consent from Minglar India Private Limited;
+c) Not be used for independent marketing, profiling, or database creation;
+d) Not be retained after completion of the Activity unless legally required.
+The Host shall not contact Users outside the Minglar platform unless expressly authorized.
+
+13.6 Security Measures
+The Host shall implement reasonable technical and organizational measures to protect personal data from unauthorized access, alteration, misuse, or disclosure, including:
+- Secure password-protected systems;
+- Restricted employee access;
+- Confidentiality undertakings from employees and operators;
+- Secure handling of operator devices used for check-in/check-out;
+- Immediate reporting of lost or compromised devices.
+
+13.7 Data Breach Notification
+Any actual or suspected breach involving personal data — including medical, biometric, financial, or location data — shall be reported to Minglar India Private Limited immediately and in any event within twenty-four (24) hours of discovery.
+The Host shall fully cooperate in investigation, mitigation, and regulatory reporting obligations.
+
+13.8 Retention and Deletion
+The Host shall not retain personal data beyond the period necessary for conducting the Activity unless required by law.
+Upon termination of this Agreement, the Host shall delete all User data in its possession and confirm deletion upon request.
+
+13.9 User Responsibility for Medical Disclosures
+Users remain responsible for the accuracy and completeness of any medical or health information voluntarily disclosed.
+The Host may rely on such disclosures in good faith for safety and eligibility determinations.
+Minglar shall not be liable for losses arising from incomplete or inaccurate medical information provided by Users.
+
+PART B – HOST PERSONAL DATA
+
+13.10 Collection of Host Personal Data
+The Host acknowledges that Minglar may collect and process personal data relating to the Host and its directors, partners, employees, and authorized representatives for:
+- KYC verification and onboarding;
+- Regulatory compliance;
+- Risk assessment and fraud prevention;
+- Payment processing and settlement;
+- Audit and safety review;
+- Enforcement of this Agreement.
+
+13.11 Sharing and Cross-Border Transfers
+Host personal data may be shared:
+- Within Minglar Group entities;
+- With banks, payment processors, verification agencies, insurers, auditors, and professional advisors;
+- With regulatory or governmental authorities where legally required.
+The Host acknowledges that personal data may be transferred between Singapore, India, and other jurisdictions where Minglar operates, subject to compliance with applicable cross-border transfer laws.
+
+PART C – ACTIVITY LOCATION & OPERATIONAL DATA
+
+13.12 Collection of Activity Location and Operational Data
+The Host agrees that Minglar may collect and process operational data relating to Activities, including:
+- Venue address;
+- Check-in and check-out locations;
+- GPS coordinates;
+- Pick-up and drop-off locations;
+- Route and logistical details;
+- Activity schedules.
+Such data may include precise geo-location information.
+
+13.13 Use and Display of Location Data
+The Host expressly consents to Minglar:
+- Displaying Activity venue, pick-up, and drop-off details on the platform;
+- Using location data for navigation, safety monitoring, and emergency coordination;
+- Using such data for fraud prevention and verification.
+The Host warrants that all location data provided is accurate and lawful.
+Minglar shall not be liable for losses arising from inaccurate or misleading information provided by the Host.
+
+PART D – ANALYTICS & PLATFORM OPTIMIZATION
+
+13.14 Anonymized and Aggregated Data
+Minglar may use anonymized, aggregated, or de-identified data derived from User or Host activity for:
+- Platform improvement;
+- Artificial intelligence systems;
+- Recommendation engines;
+- Safety analytics;
+- Market research;
+- Business strategy and investor reporting.
+Such data shall not identify any individual User or Host.
+All analytics models, algorithms, insights, and derived data shall remain the exclusive intellectual property of Minglar.
+
+PART E – LIABILITY & SURVIVAL
+
+13.15 Indemnity
+The Host shall indemnify and hold harmless Minglar Group Pte. Ltd. and Minglar India Private Limited against any losses, penalties, regulatory actions, claims, damages, or costs arising from:
+- Unauthorized use of personal data;
+- Data breaches attributable to the Host;
+- Non-compliance with applicable data protection laws;
+- Inaccurate operational or location data provided by the Host.
+
+13.16 Survival
+This Section 13 shall survive termination or expiry of this Agreement.
+
+14. CONFIDENTIALITY
+The Host shall maintain strict confidentiality regarding all platform operations, processes, user data, and commercial information. These obligations survive five (5) years post-termination. Exceptions only apply if required by law.
+
+15. NON-EXCLUSIVITY
+This Agreement does not restrict the Host from offering Activities on other platforms. Minglar India Private Limited does not claim exclusivity. The Host shall not interfere with other platform operations or solicit Users to bypass Minglar.
+
+16. TERMINATION
+16.1 Immediate Termination
+Minglar India Private Limited may terminate immediately in case of breach, misrepresentation, failure to maintain safety or quality standards, or violation of this Agreement.
+16.2 Termination with Notice
+Either Party may terminate this Agreement by providing 30 days’ written notice.
+16.3 Post-Termination Obligations
+Upon termination, the Host must execute all bookings already made by Users. Minglar India Private Limited will block further bookings for the Host’s Activities.
+16.4 Commission Adjustment at Renewal
+Any change in commission shall only occur at renewal of this Agreement. No adjustments shall be made during the active term.
+16.5 Non-Exclusivity
+Termination or continuation of this Agreement does not prevent the Host from offering Activities elsewhere.
+
+17. GOVERNING LAW
+This Agreement shall be governed by the laws of India. Courts at the registered office jurisdiction of Minglar India Private Limited shall have exclusive jurisdiction.
+
+18. ENTIRE AGREEMENT
+This Agreement constitutes the complete understanding between the Parties and supersedes all prior communications.
+
+19. HOST ACKNOWLEDGMENT & ELECTRONIC CONSENT
+19.1 Electronic Acceptance
+By clicking the “I Agree” button, the Host acknowledges they have read, understood, and accepted the terms of this Agreement and the Minglar Privacy Policy.
+19.2 Binding Agreement
+Electronic acceptance constitutes a legally binding contract, equivalent to a wet signature.
+19.3 Host Obligations
+- Provide accurate and lawful data
+- Protect User data and follow emergency protocols
+- Notify Minglar of breaches or unauthorized access
+- Comply with applicable laws
+19.4 Electronic Records
+All electronic records and communications are valid and enforceable.
+19.5 Updates
+Continued use after updates constitutes acceptance of amended terms.
+
+Signed Electronically by:
+Minglar India Private Limited
+Authorized Signatory
+
+Host:
+[HOST_LEGAL_NAME]
+Date: [ACCEPT_DATE]
+`;
--- a/src/common/utils/constants/common.constant.ts
+++ b/src/common/utils/constants/common.constant.ts
@@ -21,4 +21,9 @@ export const USER_STATUS = {
    ACTIVE: "Active",
    DE_ACTIVATED: "De-activated",
    REJECTED: "Rejected"
+}
+
+export const RESTRICTION_NAME = {
+    ABOVE: "Above",
+    BELOW: "Below",
 }
--- a/src/common/utils/constants/host.constant.ts
+++ b/src/common/utils/constants/host.constant.ts
@@ -1,73 +1,111 @@
 export const HOST_STATUS_INTERNAL = {
-    HOST_SUBMITTED: "Host Submitted",
-    HOST_TO_UPDATE: "Host To Update",
-    REJECTED: "Rejected",
-    APPROVED: "Approved",
-    DRAFT: "Draft",
-}
+  HOST_SUBMITTED: 'Host Submitted',
+  HOST_TO_UPDATE: 'Host To Update',
+  REJECTED: 'Rejected',
+  APPROVED: 'Approved',
+  DRAFT: 'Draft',
+};

 export const HOST_STATUS_DISPLAY = {
-    DRAFT: "Draft",
-    UNDER_REVIEW: "Under Review",
-    ENHANCING: "Enhancing",
-    REJECTED: "Rejected",
-    APPROVED: "Approved",
-}
+  DRAFT: 'Draft',
+  UNDER_REVIEW: 'Under Review',
+  ENHANCING: 'Enhancing',
+  REJECTED: 'Rejected',
+  APPROVED: 'Approved',
+};

 export const STEPPER = {
-    NOT_SUBMITTED: 1,
-    UNDER_REVIEW: 2,
-    COMPANY_DETAILS_APPROVED: 3,
-    BANK_DETAILS_UPDATED: 4,
-    AGREEMENT_ACCEPTED: 5,
-    REJECTED: 6
-}
+  NOT_SUBMITTED: 1,
+  UNDER_REVIEW: 2,
+  COMPANY_DETAILS_APPROVED: 3,
+  BANK_DETAILS_UPDATED: 4,
+  AGREEMENT_ACCEPTED: 5,
+  REJECTED: 6,
+};

 export const ACTIVITY_INTERNAL_STATUS = {
-    DRAFT_PQ: 'Draft - PQ',
-    APPROVED: 'Approved',
-    REJECTED: 'Rejected',
-    DRAFT: 'Draft',
-    UNDER_REVIEW: 'Under-Review',
-    PQ_FAILED: 'PQ Failed',
-    PQ_TO_UPDATE: 'PQ To Update',
-    PQ_SUBMITTED: 'PQ Submitted',
-    PQ_APPROVED: 'PQ Approved'
-}
+  DRAFT_PQ: 'Draft - PQ',
+  APPROVED: 'Approved',
+  REJECTED: 'Rejected',
+  DRAFT: 'Draft',
+  UNDER_REVIEW: 'Under-Review',
+  PQ_FAILED: 'PQ Failed',
+  PQ_TO_UPDATE: 'PQ To Update',
+  PQ_SUBMITTED: 'PQ Submitted',
+  PQ_APPROVED: 'PQ Approved',
+
+  ACTIVITY_DRAFT: 'Draft - Activity',
+  ACTIVITY_SUBMITTED: 'Activity Submitted',
+  ACTIVITY_TO_REVIEW: 'Activity To Review',
+  ACTIVITY_REJECTED: 'Activity Rejected',
+  ACTIVITY_APPROVED: 'Activity Approved',
+  ACTIVITY_LISTED: 'Activity Listed',
+  ACTIVITY_UNLISTED: 'Activity UnListed ',
+  ACTIVITY_NOT_LISTED: 'Activity Not Listed',
+};

 export const ACTIVITY_DISPLAY_STATUS = {
-    DRAFT_PQ: 'Draft - PQ',
-    APPROVED: 'Approved',
-    REJECTED: 'Rejected',
-    DRAFT: 'Draft',
-    UNDER_REVIEW: 'Under-Review',
-    PQ_FAILED: 'PQ Failed',
-    ENHANCING: 'Enchancing',
-    PQ_IN_REVIEW: 'PQ In Review',
-    PQ_APPROVED: 'PQ Approved'
-}
+  DRAFT_PQ: 'Draft',
+  APPROVED: 'Approved',
+  REJECTED: 'Rejected',
+  DRAFT: 'Draft',
+  UNDER_REVIEW: 'Under-Review',
+  PQ_FAILED: 'PQ Failed',
+  ENHANCING: 'Enhancing',
+  PQ_IN_REVIEW: 'PQ In Review',
+  PQ_APPROVED: 'PQ Approved',
+
+  ACTIVITY_DRAFT: 'Draft - Activity',
+  ACTIVITY_IN_REVIEW: 'In Review',
+  ACTIVITY_TO_REVIEW: 'Re-submitted',
+  NOT_LISTED: 'Not Listed',
+  ACTIVITY_LISTED: 'Listed',
+  ACTIVITY_UNLISTED: 'Un Listed',
+};

 export const ACTIVITY_AM_INTERNAL_STATUS = {
-    DRAFT_PQ: 'Draft - PQ',
-    APPROVED: 'Approved',
-    REJECTED: 'Rejected',
-    DRAFT: 'Draft',
-    UNDER_REVIEW: 'Under-Review',
-    PQ_FAILED: 'PQ Failed',
-    PQ_REJECTED: 'PQ Rejected',
-    PQ_TO_REVIEW: 'PQ To Review',
-    PQ_APPROVED: 'PQ Approved'
-}
+  DRAFT_PQ: 'Draft - PQ',
+  APPROVED: 'Approved',
+  REJECTED: 'Rejected',
+  DRAFT: 'Draft',
+  UNDER_REVIEW: 'Under-Review',
+  PQ_FAILED: 'PQ Failed',
+  PQ_REJECTED: 'PQ Rejected',
+  PQ_TO_REVIEW: 'PQ To Review',
+  PQ_APPROVED: 'PQ Approved',
+
+  ACTIVITY_DRAFT: 'Draft - Activity',
+  ACTIVITY_TO_REVIEW: 'Activity To Review',
+  ACTIVITY_REJECTED: 'Activity Rejected',
+  ACTIVITY_APPROVED: 'Activity Approved',
+  ACTIVITY_LISTED: 'Activity Listed',
+  ACTIVITY_SUBMITED: 'Activity Submitted',
+};

 export const ACTIVITY_AM_DISPLAY_STATUS = {
-    DRAFT_PQ: 'Draft - PQ',
-    APPROVED: 'Approved',
-    REJECTED: 'Rejected',
-    DRAFT: 'Draft',
-    UNDER_REVIEW: 'Under-Review',
-    PQ_FAILED: 'PQ Failed',
-    ENHANCING: 'Enchancing',
-    NEW: 'New',
-    PQ_APPROVED: 'PQ Approved',
-    REVISED: 'Revised'
-}
+  DRAFT_PQ: 'Draft',
+  APPROVED: 'Approved',
+  REJECTED: 'Rejected',
+  DRAFT: 'Draft',
+  UNDER_REVIEW: 'Under-Review',
+  PQ_FAILED: 'PQ Failed',
+  ENHANCING: 'Enhancing',
+  NEW: 'New',
+  PQ_APPROVED: 'PQ Approved',
+  REVISED: 'Revised',
+
+  ACTIVITY_DRAFT: 'Draft - Activity',
+  ACTIVITY_NEW: 'New',
+  ACTIVITY_TO_REVIEW: 'Activity To Review',
+  ACTIVITY_ENHANCING: 'Enhancing',
+  NOT_LISTED: 'Not Listed',
+  ACTIVITY_LISTED: 'Listed',
+  ACTIVITY_REVISED: 'Activity Revised'
+};
+
+export const SCHEDULING_TYPE = {
+  ONCE: 'ONCE',
+  WEEKLY: 'WEEKLY',
+  MONTHLY: 'MONTHLY',
+  CUSTOM: 'CUSTOM',
+};
--- a/src/common/utils/constants/minglar.constant.ts
+++ b/src/common/utils/constants/minglar.constant.ts
@@ -15,6 +15,7 @@ export const MINGLAR_STATUS_DISPLAY = {
  ENHANCING: 'Enhancing',
  APPROVED: 'Approved',
  REJECTED: 'Rejected',
+  RE_SUBMITTED: 'Re-submitted',
  DRAFT: 'Draft'
 };

@@ -34,7 +35,10 @@ export const ACTIVITY_TRACK_STATUS = {
  REJECTED_BY_AM: 'Rejected By AM',
  ACCEPTED_BY_AM: 'Accepted By AM',
  ENHANCING: 'Enhancing',
-  PQ_SUBMITTED: 'PQ Submitted'
+  PQ_SUBMITTED: 'PQ Submitted',
+  UNDER_REVIEW:'Under Review',
+  SUBMITTED:'Activity Submitted',
+  DRAFT:'Activity Draft'
 }

 // export const HOST_SUGGESTION_TITLES = {
--- a/src/common/utils/validation/host/createSchedulingOfAct.validation.ts
+++ b/src/common/utils/validation/host/createSchedulingOfAct.validation.ts
@@ -0,0 +1,76 @@
+import { z } from 'zod';
+import { SCHEDULING_TYPE } from '../../constants/host.constant';
+
+const WeekdayEnum = z.enum([
+    'MONDAY',
+    'TUESDAY',
+    'WEDNESDAY',
+    'THURSDAY',
+    'FRIDAY',
+    'SATURDAY',
+    'SUNDAY',
+]);
+
+export const scheduleActivity = z.object({
+    activityXid: z.number(),
+    listNow: z.boolean(),
+
+    scheduleType: z.enum([
+        SCHEDULING_TYPE.ONCE,
+        SCHEDULING_TYPE.WEEKLY,
+        SCHEDULING_TYPE.MONTHLY,
+        SCHEDULING_TYPE.CUSTOM,
+    ]),
+
+    dateRange: z.object({
+        startDate: z.string(),
+        endDate: z.string().nullable().optional(),
+    }),
+
+    rules: z.object({
+        weekdays: z.array(WeekdayEnum).optional(),
+        monthDates: z.array(z.number()).optional(),
+        customDates: z.array(z.string()).optional(),
+    }),
+
+    venues: z.array(
+        z.object({
+            venueXid: z.number(),
+            slots: z.array(
+                z.object({
+                    startTime: z.string(),
+                    endTime: z.string(),
+                    weekDay: WeekdayEnum.nullable().optional(),
+                    dayOfMonth: z.number().nullable().optional(),
+                    occurrenceDate: z.string().nullable().optional(),
+                    maxCapacity: z.number(),
+                })
+            ).optional().default([]),
+        })
+    ),
+
+    earlyCheckInMins: z.number().optional(),
+    bookingCutOffMins: z.number().optional(),
+    isLateCheckingAllowed: z.boolean().optional(),
+    isInstantBooking: z.boolean().optional(),
+})
+    .superRefine((data, ctx) => {
+        if (data.scheduleType === 'WEEKLY' && !data.rules.weekdays?.length) {
+            ctx.addIssue({ path: ['rules', 'weekdays'], message: 'Weekdays required for WEEKLY schedule', code: 'custom' });
+        }
+
+        if (data.scheduleType === 'MONTHLY' && !data.rules.monthDates?.length) {
+            ctx.addIssue({ path: ['rules', 'monthDates'], message: 'Month dates required for MONTHLY schedule', code: 'custom' });
+        }
+
+        if (
+            (data.scheduleType === 'CUSTOM' || data.scheduleType === 'ONCE') &&
+            !data.rules.customDates?.length
+        ) {
+            ctx.addIssue({ path: ['rules', 'customDates'], message: 'Custom dates required', code: 'custom' });
+        }
+    });
+
+export type ScheduleActivityDTO = z.infer<typeof scheduleActivity>;
+
+
--- a/src/common/utils/validation/user/addPersonalInfo.validation.ts
+++ b/src/common/utils/validation/user/addPersonalInfo.validation.ts
@@ -0,0 +1,26 @@
+// validations/hostBankDetails.validation.ts
+import { z } from "zod";
+
+export const userPersonalInfoSchema = z.object({
+    firstName: z
+        .string()
+        .nonempty("First name is required"),
+
+    lastName: z
+        .string()
+        .optional(),
+
+    genderName: z
+        .string()
+        .nonempty("Gender is required"),
+
+    dateOfBirth: z
+        .string()
+        .nonempty("Date of birth is required")
+        .refine(val => !isNaN(Date.parse(val)), {
+            message: "Date of birth must be a valid ISO date (YYYY-MM-DD)",
+        }),
+
+});
+
+export type UserPersonalInfoSchema = z.infer<typeof userPersonalInfoSchema>;
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -83,7 +83,8 @@ const envVarsSchema = yup
 		BYPASS_OTP: yup.boolean().default(false).required('Bypass OTP is required'),
 		// Email links
 		AM_INVITATION_LINK: yup.string().required('Link to send in AM invitation mail is required'),
-		HOST_LINK: yup.string().required('Link to host panel is required')
+		HOST_LINK: yup.string().required('Link to host panel is required'),
+		HOST_LINK_PQ: yup.string().required('Link to host panel pqp is required')
 	})
 	.noUnknown(true);

@@ -163,6 +164,7 @@ function getConfig() {
 			MinglarAdminName: envVars.MINGLAR_ADMIN_NAME,
 			AM_INVITATION_LINK: envVars.AM_INVITATION_LINK,
 			HOST_LINK: envVars.HOST_LINK,
+			HOST_LINK_PQ: envVars.HOST_LINK_PQ,
 			// oneSignal: {
 			// 	appID: envVars.ONESIGNAL_APPID,
 			// 	restApiKey: envVars.ONESIGNAL_REST_APIKEY,
--- a/src/modules/host/dto/createActivity.schema.ts
+++ b/src/modules/host/dto/createActivity.schema.ts
@@ -0,0 +1,176 @@
+import { z } from 'zod';
+
+/* ================= MEDIA ================= */
+export const MediaDto = z.object({
+  mediaType: z.string().optional(),
+  mediaFileName: z.string(),
+  isCoverImage: z.boolean().optional().default(false),
+});
+
+/* ================= PRICE ================= */
+export const PriceDto = z.object({
+  noOfSession: z.number().int().optional().default(1),
+  isPackage: z.boolean().optional().default(false),
+  sessionValidity: z.number().int().optional().default(0),
+  sessionValidityFrequency: z.string().optional().default('Days'),
+  basePrice: z.number().int().optional().default(0),
+  sellPrice: z.number().int(),
+});
+
+/* ================= VENUE ================= */
+export const VenueDto = z.object({
+  venueName: z.string(),
+  venueLabel: z.string(),
+  venueCapacity: z.number().int().optional().default(0),
+  availableSeats: z.number().int().optional().default(0),
+  isMinPeopleReqMandatory: z.boolean().optional().default(false),
+  minPeopleRequired: z.number().int().nullable().optional(),
+  minReqfullfilledBeforeMins: z.number().int().nullable().optional(),
+  venueDescription: z.string().optional(),
+  media: z.array(MediaDto).optional().default([]),
+  prices: z.array(PriceDto).optional().default([]),
+});
+
+/* ================= PICKUP / DROP ================= */
+export const PickupDetailDto = z.object({
+  isPickUp: z.boolean().optional().default(false),
+  locationLat: z.number().nullable().optional(),
+  locationLong: z.number().nullable().optional(),
+  locationAddress: z.string().nullable().optional(),
+  transportTotalPrice: z.number().int().min(0),
+});
+
+export const PickupTransportDto = z.object({
+  transportModeXid: z.number().int(),
+});
+
+/* ================= EQUIPMENT ================= */
+export const EquipmentDto = z.object({
+  equipmentName: z.string(),
+  isEquipmentChargeable: z.boolean().optional(),
+  equipmentBasePrice: z.number().int().optional().default(0),
+  equipmentTotalPrice: z.number().int().optional().default(0),
+});
+
+/* ================= NAVIGATION MODE ================= */
+export const NavigationModeDto = z.object({
+  navigationModeName: z.string().optional(),
+  isChargeable: z.boolean().optional(),
+  totalPrice: z.number().int().optional().default(0),
+});
+
+/* ================= ELIGIBILITY ================= */
+export const EligibilityDto = z.object({
+  isAgeRestriction: z.boolean().optional().default(false),
+  ageRestrictionName: z.string().nullable().optional(),
+  ageEntered: z.number().int().nullable().optional(),
+  ageIn: z.string().nullable().optional(),
+  minAge: z.number().int().nullable().optional(),
+  maxAge: z.number().int().nullable().optional(),
+
+  isWeightRestriction: z.boolean().optional().default(false),
+  weightRestrictionName: z.string().nullable().optional(),
+  weightEntered: z.number().int().nullable().optional(),
+  weightIn: z.string().nullable().optional(),
+  minWeight: z.number().int().nullable().optional(),
+  maxWeight: z.number().int().nullable().optional(),
+
+  isHeightRestriction: z.boolean().optional().default(false),
+  heightRestrictionName: z.string().nullable().optional(),
+  heightEntered: z.number().int().nullable().optional(),
+  heightIn: z.string().nullable().optional(),
+  minHeight: z.number().int().nullable().optional(),
+  maxHeight: z.number().int().nullable().optional(),
+});
+
+/* ================= OTHER DETAILS ================= */
+export const OtherDetailsDto = z.object({
+  exclusiveNotes: z.string().optional(),
+  safetyInstruction: z.string().optional(),
+  dosNotes: z.string().optional(),
+  dontsNotes: z.string().optional(),
+  tipsNotes: z.string().optional(),
+  termsAndCondition: z.string().optional(),
+  cancellations: z.string().optional(),
+});
+
+/* ================= CREATE ACTIVITY ================= */
+export const CreateActivityDto = z.object({
+  activityXid: z.number().int(),
+
+  activityTypeXid: z.number().int().optional(),
+  frequenciesXid: z.number().int().nullable().optional(),
+  activityTitle: z.string().optional(),
+  activityDescription: z.string().optional(),
+
+  checkInLat: z.number().nullable().optional(),
+  checkInLong: z.number().nullable().optional(),
+  checkInAddress: z.string().nullable().optional(),
+  isCheckOutSame: z.boolean().optional().default(true),
+  checkOutLat: z.number().nullable().optional(),
+  checkOutLong: z.number().nullable().optional(),
+  checkOutAddress: z.string().nullable().optional(),
+  checkInStateName: z.string().nullable().optional(),
+  checkInCityName: z.string().nullable().optional(),
+  checkInCountryName: z.string().nullable().optional(),
+  checkOutStateName: z.string().nullable().optional(),
+  checkOutCityName: z.string().nullable().optional(),
+  checkOutCountryName: z.string().nullable().optional(),
+
+  energyLevelXid: z.number().int().nullable().optional(),
+  durationDays: z.number().int().optional(),
+  durationHours: z.number().int().optional(),
+  durationMins: z.number().int().optional(),
+
+  foodAvailable: z.boolean().nullable().optional(),
+  foodIsChargeable: z.boolean().optional().default(false),
+  alcoholAvailable: z.boolean().nullable().optional(),
+
+  trainerAvailable: z.boolean().nullable().optional(),
+  trainerIsChargeable: z.boolean().optional().default(false),
+
+  pickUpDropAvailable: z.boolean().nullable().optional(),
+  pickUpDropIsChargeable: z.boolean().optional().default(false),
+
+  inActivityAvailable: z.boolean().nullable().optional(),
+  inActivityIsChargeable: z.boolean().optional().default(false),
+
+  equipmentAvailable: z.boolean().nullable().optional(),
+  equipmentIsChargeable: z.boolean().optional().default(false),
+
+  cancellationAvailable: z.boolean().nullable().optional(),
+  cancellationAllowedBeforeMins: z.number().int().nullable().optional(),
+
+  currencyXid: z.number().int().nullable().optional(),
+  sustainabilityScore: z.number().int().nullable().optional(),
+  safetyScore: z.number().int().nullable().optional(),
+  isInstantBooking: z.boolean().optional().default(false),
+
+  taxXids: z.array(z.number().int()).optional().default([]),
+
+  media: z.array(MediaDto).optional().default([]),
+  venues: z.array(VenueDto).optional().default([]),
+
+  foodTypeIds: z.array(z.number().int()).optional().default([]),
+  cuisineIds: z.array(z.number().int()).optional().default([]),
+  pickupTransports: z.array(PickupTransportDto).optional().default([]),
+  pickupDetails: z.array(PickupDetailDto).optional().default([]),
+
+  navigationModes: z
+    .array(NavigationModeDto)
+    .optional()
+    .default([]),
+
+  equipments: z.array(EquipmentDto).optional().default([]),
+  amenitiesIds: z.array(z.number().int()).optional().default([]),
+
+  foodTotalAmount: z.number().int().optional().default(0),
+
+  eligibility: EligibilityDto.optional(),
+  otherDetails: OtherDetailsDto.optional(),
+
+  allowedEntryTypes: z.array(z.number().int()).optional().default([]),
+  trainerTotalAmount: z.number().int().optional().default(0),
+});
+
+export type CreateActivityInput = z.infer<typeof CreateActivityDto>;
--- a/src/modules/host/dto/createSchedulingOfAct.dto.ts
+++ b/src/modules/host/dto/createSchedulingOfAct.dto.ts
@@ -0,0 +1,39 @@
+export interface ScheduleSlotDTO {
+    startTime: string;
+    endTime: string;
+    weekDay?: 'MONDAY' | 'TUESDAY' | 'WEDNESDAY' | 'THURSDAY' | 'FRIDAY' | 'SATURDAY' | 'SUNDAY' | null;
+    dayOfMonth?: number | null;    // 1–31
+    occurrenceDate?: string | null;
+    maxCapacity: number;
+}
+
+export interface ScheduleVenueDTO {
+    venueXid: number;
+    slots: ScheduleSlotDTO[];
+}
+
+// export interface ScheduleActivityDTO {
+//     activityXid: number;
+//     scheduleType: 'ONCE' | 'WEEKLY' | 'MONTHLY' | 'CUSTOM';
+
+//     dateRange: {
+//         startDate: string;
+//         endDate?: string | null;
+//     };
+
+//     rules: {
+//         weekdays?: (
+//             'MONDAY' | 'TUESDAY' | 'WEDNESDAY' |
+//             'THURSDAY' | 'FRIDAY' | 'SATURDAY' | 'SUNDAY'
+//         )[];
+//         monthDates?: number[];
+//         customDates?: string[];
+//     };
+
+//     venues: ScheduleVenueDTO[];
+
+//     earlyCheckInMins?: number;
+//     bookingCutOffMins?: number;
+//     isLateCheckingAllowed?: boolean;
+//     isInstantBooking?: boolean;
+// }
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/CreateNewActivity.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/CreateNewActivity.ts
@@ -0,0 +1,117 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import {
+  CreateActivityDto,
+  CreateActivityInput,
+} from '../../../dto/createActivity.schema';
+import { HostService } from '../../../services/host.service';
+
+const hostService = new HostService(prismaClient);
+
+export const handler = safeHandler(
+  async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
+
+    /* 1️⃣ AUTH */
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(401, 'Missing auth token');
+    }
+
+    const userInfo = await verifyHostToken(token);
+
+    /* 2️⃣ PARSE JSON BODY */
+    if (!event.body) {
+      throw new ApiError(400, 'Request body is required');
+    }
+
+    let body: any;
+    try {
+      body = JSON.parse(event.body);
+    } catch {
+      throw new ApiError(400, 'Invalid JSON body');
+    }
+
+    const {
+      activity,
+      media = [],
+      isDraft = false,
+    } = body;
+
+    if (!activity) {
+      throw new ApiError(400, 'activity payload is required');
+    }
+
+    /* 3️⃣ NORMALIZE ACTIVITY ID */
+    if (activity.activityXid) {
+      activity.activityXid = Number(activity.activityXid);
+    }
+
+    /* 4️⃣ ATTACH ACTIVITY MEDIA (S3 URLs) */
+    if (!Array.isArray(media)) {
+      throw new ApiError(400, 'media must be an array');
+    }
+
+    activity.media = media.map((m: any) => ({
+      mediaType: m.mediaType ?? 'image',
+      mediaFileName: m.mediaFileName,
+      isCoverImage: m.isCoverImage ?? false,
+    }));
+
+    /* 4.1️⃣ ATTACH SAFETY INSTRUCTIONS (string only) */
+    if (activity.safetyInstruction !== undefined && activity.safetyInstruction !== null) {
+      if (typeof activity.safetyInstruction !== 'string') {
+        throw new ApiError(400, 'safetyInstruction must be a string');
+      }
+    }
+
+    /* 4.2️⃣ ATTACH CANCELLATIONS (string only) */
+    if (activity.cancellations !== undefined && activity.cancellations !== null) {
+      if (typeof activity.cancellations !== 'string') {
+        throw new ApiError(400, 'cancellations must be a string');
+      }
+    }
+
+    /* 5️⃣ VALIDATION */
+    let parsedDto: CreateActivityInput;
+
+    if (!isDraft) {
+      const parsed = CreateActivityDto.safeParse(activity);
+      if (!parsed.success) {
+        throw new ApiError(
+          400,
+          parsed.error.issues.map((i) => i.message).join(', ')
+        );
+      }
+      parsedDto = parsed.data;
+    } else {
+      parsedDto = activity as CreateActivityInput;
+    }
+
+    /* 6️⃣ SAVE TO DB */
+    const result = await hostService.createOrUpdateActivity(
+      userInfo.id,
+      parsedDto,
+      isDraft
+    );
+
+    /* 7️⃣ RESPONSE */
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: isDraft
+          ? 'Activity saved as draft successfully'
+          : 'Activity submitted successfully',
+        data: result,
+      }),
+    };
+  }
+);
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/getAllActivityType.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/getAllActivityType.ts
@@ -25,7 +25,7 @@ export const handler = safeHandler(async (
    }

    // Verify token and get user info
-    const userInfo = await verifyHostToken(token);
+    await verifyHostToken(token);


    // Read optional search query (supports ?search= or ?q=)
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/getAllDetailsOfActivityAndVenue.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/getAllDetailsOfActivityAndVenue.ts
@@ -0,0 +1,47 @@
+import { verifyMinglarAdminHostToken } from '../../../../../common/middlewares/jwt/authForMinglarAdminHost';
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { HostService } from '../../../services/host.service';
+
+const hostService = new HostService(prismaClient);
+
+/**
+ * Add suggestion handler for host applications
+ * Allows Minglar Admin, Co_Admin, and Account Manager to add suggestions
+ * Types: Setup Profile, Review Account, Add Payment Details, Agreement
+ */
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Verify authentication token
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+        throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Verify token and get user info
+    await verifyMinglarAdminHostToken(token);
+
+    const activityXid = event.pathParameters?.activityXid
+    if (!activityXid) {
+        throw new ApiError(400, 'activityXid is required in path parameters');
+    }
+
+    const data = await hostService.getAllDetailsOfActivityAndVenue(Number(activityXid));
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Data retrieved successfully',
+            data,
+        }),
+    };
+});
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/saveActivity_ForPQQ.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/saveActivity_ForPQQ.ts
@@ -1,50 +1,50 @@
-import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
-import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
-import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import ApiError from '../../../../../common/utils/helper/ApiError';
-import { HostService } from '../../../services/host.service';
+// import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+// import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+// import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+// import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+// import ApiError from '../../../../../common/utils/helper/ApiError';
+// import { HostService } from '../../../services/host.service';

-const hostService = new HostService(prismaClient);
+// const hostService = new HostService(prismaClient);

-export const handler = safeHandler(async (
-  event: APIGatewayProxyEvent,
-  context?: Context
-): Promise<APIGatewayProxyResult> => {
-  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
-  if (!token) throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+// export const handler = safeHandler(async (
+//   event: APIGatewayProxyEvent,
+//   context?: Context
+// ): Promise<APIGatewayProxyResult> => {
+//   const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+//   if (!token) throw new ApiError(401, 'This is a protected route. Please provide a valid token.');

-  const userInfo = await verifyHostToken(token);
+//   const userInfo = await verifyHostToken(token);

-  let body: any = {};
-  try {
-    body = event.body ? JSON.parse(event.body) : {};
-  } catch (err) {
-    throw new ApiError(400, 'Invalid JSON in request body');
-  }
+//   let body: any = {};
+//   try {
+//     body = event.body ? JSON.parse(event.body) : {};
+//   } catch (err) {
+//     throw new ApiError(400, 'Invalid JSON in request body');
+//   }

-  const { activityTypeXid, frequenciesXid } = body;
+//   const { activityTypeXid, frequenciesXid } = body;

-  if (!activityTypeXid) {
-    throw new ApiError(400, 'activityTypeXid is required');
-  }
+//   if (!activityTypeXid) {
+//     throw new ApiError(400, 'activityTypeXid is required');
+//   }

-  await hostService.createActivity(
-    userInfo.id,
-    Number(activityTypeXid),
-    frequenciesXid ? Number(frequenciesXid) : undefined,
-  );
+//   await hostService.createActivity(
+//     userInfo.id,
+//     Number(activityTypeXid),
+//     frequenciesXid ? Number(frequenciesXid) : undefined,
+//   );

-  return {
-    statusCode: 201,
-    headers: {
-      'Content-Type': 'application/json',
-      'Access-Control-Allow-Origin': '*',
-    },
-    body: JSON.stringify({
-      success: true,
-      message: 'Activity created successfully',
-      data: null,
-    }),
-  };
-});
+//   return {
+//     statusCode: 201,
+//     headers: {
+//       'Content-Type': 'application/json',
+//       'Access-Control-Allow-Origin': '*',
+//     },
+//     body: JSON.stringify({
+//       success: true,
+//       message: 'Activity created successfully',
+//       data: null,
+//     }),
+//   };
+// });
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer.ts
@@ -156,9 +156,9 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
        const pqqAnswerXid = Number(fields.pqqAnswerXid);
        const comments = fields.comments || null;

-        if (!activityXid || isNaN(activityXid)) throw new ApiError(400, "Valid activityXid is required");
-        if (!pqqQuestionXid || isNaN(pqqQuestionXid)) throw new ApiError(400, "Valid pqqQuestionXid is required");
-        if (!pqqAnswerXid || isNaN(pqqAnswerXid)) throw new ApiError(400, "Valid pqqAnswerXid is required");
+        if (!activityXid || isNaN(activityXid)) throw new ApiError(400, "Please provide a valid activity");
+        if (!pqqQuestionXid || isNaN(pqqQuestionXid)) throw new ApiError(400, "Please select a valid question");
+        if (!pqqAnswerXid || isNaN(pqqAnswerXid)) throw new ApiError(400, "Please select a valid answer");

        // 6) UPSERT header
        const existingHeader = await hostService.findHeaderByCompositeKey(
--- a/src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQ_Answer.ts
+++ b/src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQ_Answer.ts
@@ -147,9 +147,9 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
    const pqqAnswerXid = Number(fields.pqqAnswerXid);
    const comments = fields.comments || null;

-    if (!activityXid || isNaN(activityXid)) throw new ApiError(400, "Valid activityXid is required");
-    if (!pqqQuestionXid || isNaN(pqqQuestionXid)) throw new ApiError(400, "Valid pqqQuestionXid is required");
-    if (!pqqAnswerXid || isNaN(pqqAnswerXid)) throw new ApiError(400, "Valid pqqAnswerXid is required");
+    if (!activityXid || isNaN(activityXid)) throw new ApiError(400, "Please provide a valid activity");
+    if (!pqqQuestionXid || isNaN(pqqQuestionXid)) throw new ApiError(400, "Please select a valid question");
+    if (!pqqAnswerXid || isNaN(pqqAnswerXid)) throw new ApiError(400, "Please select a valid answer");

    // 6) UPSERT header
    const existingHeader = await pqqService.findHeaderByCompositeKey(
--- a/src/modules/host/handlers/Activity_Hub/Scheduling/cancelSlot.ts
+++ b/src/modules/host/handlers/Activity_Hub/Scheduling/cancelSlot.ts
@@ -0,0 +1,100 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { SchedulingService } from '../../../services/activityScheduling.service';
+import { HostService } from '../../../services/host.service';
+
+const schedulingService = new SchedulingService(prismaClient);
+const hostService = new HostService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using the shared authForHost function
+    const userInfo = await verifyHostToken(token);
+    const hostId = userInfo.id;
+
+    if (Number.isNaN(hostId)) {
+        throw new ApiError(400, 'Host id must be a number');
+    }
+
+    const host = await hostService.getHostIdByUserXid(hostId);
+    if (!host) {
+        throw new ApiError(404, 'Host not found');
+    }
+
+    let body: {
+        activityXid: number;
+        venueXid: number;
+        cancellations: {
+            scheduleHeaderXid: number;
+            occurenceDate: string;
+            startTime: string;
+            endTime: string;
+            cancellationReason: string
+        }[]
+    };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch {
+        throw new ApiError(400, 'Invalid JSON payload');
+    }
+
+    if (!body.activityXid || !body.venueXid || !Array.isArray(body.cancellations) || body.cancellations.length === 0) {
+        throw new ApiError(400, 'Missing required fields');
+    }
+
+    const activity = await schedulingService.getActivityByXid(body.activityXid);
+    if (!activity) {
+        throw new ApiError(404, "Activity not found");
+    }
+
+    const venueExists = await schedulingService.getVenueFromVenueXid(
+        body.venueXid,
+        body.activityXid
+    );
+
+    if (!venueExists) {
+        throw new ApiError(
+            404,
+            `Venue not found for this activity`
+        )
+    }
+
+
+    await schedulingService.cancelMultipleSlotsForActivity(
+        body.cancellations.map((item: any) => ({
+            scheduleHeaderXid: Number(item.scheduleHeaderXid),
+            occurenceDate: item.occurenceDate,
+            startTime: item.startTime,
+            endTime: item.endTime,
+            cancellationReason: item.cancellationReason
+        }))
+    );
+
+
+    const result = await schedulingService.getVenueDurationByAct(Number(body.activityXid), Number(hostId));
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Slot blocked successfully',
+            data: result
+        }),
+    };
+});
--- a/src/modules/host/handlers/Activity_Hub/Scheduling/createSchedulingOfAct.ts
+++ b/src/modules/host/handlers/Activity_Hub/Scheduling/createSchedulingOfAct.ts
@@ -0,0 +1,89 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { SchedulingService } from '../../../services/activityScheduling.service';
+import { HostService } from '../../../services/host.service';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { scheduleActivity } from '../../../../../common/utils/validation/host/createSchedulingOfAct.validation';
+import { z } from 'zod';
+
+const schedulingService = new SchedulingService(prismaClient);
+const hostService = new HostService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using the shared authForHost function
+    const userInfo = await verifyHostToken(token);
+    const hostId = userInfo.id;
+
+    if (Number.isNaN(hostId)) {
+        throw new ApiError(400, 'Host id must be a number');
+    }
+
+    const host = await hostService.getHostIdByUserXid(hostId);
+    if (!host) {
+        throw new ApiError(404, 'Host not found');
+    }
+
+    let body: unknown;
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch {
+        throw new ApiError(400, 'Invalid JSON payload');
+    }
+
+    // ✅ Validate payload using Zod
+
+    const parsed = scheduleActivity.safeParse(body);
+
+    if (!parsed.success) {
+        const msg = parsed.error.issues
+            .map(e => e.message)
+            .join(', ');
+        throw new ApiError(400, `Validation failed: ${msg}`);
+    }
+
+    const activity = await schedulingService.getActivityByXid(parsed.data.activityXid);
+    if (!activity) {
+        throw new ApiError(404, "Activity not found");
+    }
+
+    if (parsed.data.venues && parsed.data.venues.length > 0) {
+        for (const venue of parsed.data.venues) {
+            const venueExists = await schedulingService.getVenueFromVenueXid(
+                venue.venueXid,
+                parsed.data.activityXid
+            );
+
+            if (!venueExists) {
+                throw new ApiError(
+                    404,
+                    `Venue with xid ${venue.venueXid} not found for this activity`
+                );
+            }
+        }
+    }
+
+
+    await schedulingService.addSchedulingForActivity(parsed.data);
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Scheduling details updated successfully',
+        }),
+    };
+});
--- a/src/modules/host/handlers/Activity_Hub/Scheduling/getSchedulingOfAct.ts
+++ b/src/modules/host/handlers/Activity_Hub/Scheduling/getSchedulingOfAct.ts
@@ -0,0 +1,64 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyMinglarAdminHostToken } from '../../../../../common/middlewares/jwt/authForMinglarAdminHost';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { SchedulingService } from '../../../services/activityScheduling.service';
+import { ACTIVITY_INTERNAL_STATUS } from '../../../../../common/utils/constants/host.constant';
+
+const schedulingService = new SchedulingService(prismaClient);
+
+/**
+ * GET /activities
+ * Query Parameters:
+ *   - status: Listed | Unlisted | Not_Listed (optional - if not provided, returns all)
+ *   - hostId: ID of host (required from token)
+ * 
+ * Returns activities based on status filter
+ */
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Get and verify token
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  const userInfo = await verifyMinglarAdminHostToken(token);
+  const userId = Number(userInfo.id);
+
+  // Get status filter from query parameters
+  const status = event.queryStringParameters?.status as string | undefined;
+
+  const hostId = await schedulingService.getHostIdByUserId(userId);
+  
+  // Validate status if provided
+  const validStatuses = [ACTIVITY_INTERNAL_STATUS.ACTIVITY_APPROVED, ACTIVITY_INTERNAL_STATUS.ACTIVITY_UNLISTED, ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED];
+  if (status && !validStatuses.includes(status)) {
+    throw new ApiError(400, `Invalid status. Must be one of: ${validStatuses.join(', ')}`);
+  }
+
+  // Get activities from service
+  const activities = await schedulingService.getActivitiesByStatus(hostId, status);
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Activities retrieved successfully',
+      data: {
+        total: activities.length,
+        activities: activities,
+        filter: {
+          status: status || 'All',
+        },
+      },
+    }),
+  };
+});
--- a/src/modules/host/handlers/Activity_Hub/Scheduling/getVenueDurationByAct.ts
+++ b/src/modules/host/handlers/Activity_Hub/Scheduling/getVenueDurationByAct.ts
@@ -0,0 +1,52 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { SchedulingService } from '../../../services/activityScheduling.service';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+
+const schedulingService = new SchedulingService(prismaClient);
+
+/**
+ * GET /activities
+ * Query Parameters:
+ *   - status: Listed | Unlisted | Not_Listed (optional - if not provided, returns all)
+ *   - hostId: ID of host (required from token)
+ * 
+ * Returns activities based on status filter
+ */
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Get and verify token
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    const userInfo = await verifyHostToken(token);
+    const userId = Number(userInfo.id);
+    
+    const activityXid = event.pathParameters?.activityXid
+    if (!activityXid) {
+        throw new ApiError(400, 'activityXid is required in path parameters');
+    }
+
+    const hostId = await schedulingService.getHostIdByUserId(userId);
+
+    const result = await schedulingService.getVenueDurationByAct(Number(activityXid), Number(hostId));
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Details retrieved successfully',
+            data: result,
+        }),
+    };
+});
--- a/src/modules/host/handlers/Activity_Hub/Scheduling/openCanceledSlot.ts
+++ b/src/modules/host/handlers/Activity_Hub/Scheduling/openCanceledSlot.ts
@@ -0,0 +1,103 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { SchedulingService } from '../../../services/activityScheduling.service';
+import { HostService } from '../../../services/host.service';
+
+const schedulingService = new SchedulingService(prismaClient);
+const hostService = new HostService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(
+        400,
+        'This is a protected route. Please provide a valid token.',
+      );
+    }
+
+    // Authenticate user using the shared authForHost function
+    const userInfo = await verifyHostToken(token);
+    const hostId = userInfo.id;
+
+    if (Number.isNaN(hostId)) {
+      throw new ApiError(400, 'Host id must be a number');
+    }
+
+    const host = await hostService.getHostIdByUserXid(hostId);
+    if (!host) {
+      throw new ApiError(404, 'Host not found');
+    }
+
+    let body: {
+      activityXid: number;
+      venueXid: number;
+      cancellations: { cancellationXid: number; }[];
+    };
+
+    try {
+      body = event.body ? JSON.parse(event.body) : {};
+    } catch {
+      throw new ApiError(400, 'Invalid JSON payload');
+    }
+
+    if (
+      !body.activityXid ||
+      !body.venueXid ||
+      !Array.isArray(body.cancellations) ||
+      body.cancellations.length === 0
+    ) {
+      throw new ApiError(400, 'Missing required fields');
+    }
+
+    const activity = await schedulingService.getActivityByXid(body.activityXid);
+    if (!activity) {
+      throw new ApiError(404, 'Activity not found');
+    }
+
+    const venueExists = await schedulingService.getVenueFromVenueXid(
+      body.venueXid,
+      body.activityXid,
+    );
+
+    if (!venueExists) {
+      throw new ApiError(404, `Venue not found for this activity`);
+    }
+
+    await schedulingService.openCanceledSlot(
+      body.cancellations.map((item: any) => ({
+        cancellationXid: Number(item.cancellationXid),
+      })),
+    );
+
+    const result = await schedulingService.getVenueDurationByAct(
+      Number(body.activityXid),
+      Number(hostId),
+    );
+
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: 'Slot opened successfully',
+        data: result,
+      }),
+    };
+  },
+);
--- a/src/modules/host/handlers/Host_Admin/onboarding/acceptAggrement.ts
+++ b/src/modules/host/handlers/Host_Admin/onboarding/acceptAggrement.ts
@@ -1,6 +1,6 @@
-import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
 import ApiError from '../../../../../common/utils/helper/ApiError';
 import { HostService } from '../../../services/host.service';
@@ -25,9 +25,8 @@ export const handler = safeHandler(async (
    // Verify token and get user info
    const userInfo = await verifyHostToken(token);

-
-    // Add suggestion using service
-    await hostService.acceptMinglarAgreement(userInfo.id);
+    // Accept agreement and get dynamic fields and PDF URL
+    const result = await hostService.acceptMinglarAgreement(userInfo.id);

    return {
        statusCode: 200,
@@ -38,7 +37,10 @@ export const handler = safeHandler(async (
        body: JSON.stringify({
            success: true,
            message: 'Application accepted successfully',
-            data: null,
+            data: {
+                filePath: result.filePath,
+                dynamicFields: result.dynamicFields,
+            },
        }),
    };
 });
--- a/src/modules/host/handlers/Host_Admin/onboarding/getAllActvitySuggestion.ts
+++ b/src/modules/host/handlers/Host_Admin/onboarding/getAllActvitySuggestion.ts
@@ -0,0 +1,54 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { MinglarService } from '../../../../minglaradmin/services/minglar.service';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { verifyMinglarAdminHostToken } from '../../../../../common/middlewares/jwt/authForMinglarAdminHost';
+
+const minglarService = new MinglarService(prismaClient);
+
+/**
+ * Get suggestions handler
+ * Retrieves suggestions based on user's role and host assignments
+ */
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // ✅ Verify authentication token
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // ✅ Verify token and extract user info
+  const userInfo = await verifyMinglarAdminHostToken(token);
+
+  // ✅ Extract activityXid from query parameters
+  const activityXidParam = event.queryStringParameters?.activityXid;
+  if (!activityXidParam) {
+    throw new ApiError(400, 'Missing required query parameter: activityXid');
+  }
+
+  const activityXid = Number(activityXidParam);
+  if (isNaN(activityXid) || activityXid <= 0) {
+    throw new ApiError(400, 'Invalid activityXid provided. Must be a positive number.');
+  }
+
+  // ✅ Fetch suggestions from the service
+  const suggestions = await minglarService.getHostSuggestionsForActivity(activityXid);
+
+  // ✅ Return response
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Suggestions retrieved successfully',
+      data: suggestions,
+    }),
+  };
+});
--- a/src/modules/host/handlers/Host_Admin/onboarding/getLatestAgreement.ts
+++ b/src/modules/host/handlers/Host_Admin/onboarding/getLatestAgreement.ts
@@ -0,0 +1,54 @@
+import { verifyMinglarAdminHostToken } from '../../../../../common/middlewares/jwt/authForMinglarAdminHost';
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { HostService } from '../../../services/host.service';
+
+const hostService = new HostService(prismaClient);
+
+/**
+ * Get latest active agreement for a specific host by hostXid.
+ * Accessible for Minglar Admin / Host Admin using admin-host token.
+ */
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context,
+): Promise<APIGatewayProxyResult> => {
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Validate admin/host admin token
+  await verifyMinglarAdminHostToken(token);
+
+  const hostXidParam =
+    event.queryStringParameters?.hostXid ?? event.queryStringParameters?.host_xid;
+
+  const hostXid = Number(hostXidParam);
+
+  if (!hostXidParam) {
+    throw new ApiError(400, 'hostXid is required');
+  }
+
+  if (Number.isNaN(hostXid)) {
+    throw new ApiError(400, 'Invalid hostXid format');
+  }
+
+  const agreement = await hostService.getLatestHostAgreement(hostXid);
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Latest host agreement retrieved successfully',
+      data: agreement,
+    }),
+  };
+});
+
--- a/src/modules/host/handlers/Host_Admin/onboarding/signUp.ts
+++ b/src/modules/host/handlers/Host_Admin/onboarding/signUp.ts
@@ -23,7 +23,7 @@ export async function generateHostRefNumber(tx: any) {

  const nextId = lastrecord ? lastrecord.id + 1 : 1;

-  return `HS-${String(nextId).padStart(6, '0')}`;;
+  return `076-H-${String(nextId).padStart(6, '0')}`;;
 }

 export const handler = safeHandler(async (
--- a/src/modules/host/handlers/getStepper.ts
+++ b/src/modules/host/handlers/getStepper.ts
@@ -39,6 +39,7 @@ export const handler = safeHandler(async (
      data: {
        stepper: host?.host?.stepper || null,
        emailAddress: host.user?.emailAddress || null,
+        hostId: host.user?.userRefNumber || null,
      },
    }),
  };
--- a/src/modules/host/handlers/mediaDeleteFromS3.ts
+++ b/src/modules/host/handlers/mediaDeleteFromS3.ts
@@ -0,0 +1,107 @@
+import { APIGatewayProxyHandler } from 'aws-lambda';
+import { S3Client, DeleteObjectCommand } from '@aws-sdk/client-s3';
+import config from '../../../config/config';
+import ApiError from '../../../common/utils/helper/ApiError';
+import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
+
+const s3 = new S3Client({ region: config.aws.region });
+
+function extractS3Key(input: string): string {
+  if (input.startsWith('s3://')) {
+    return input.replace(`s3://${config.aws.bucketName}/`, '');
+  }
+
+  if (input.startsWith('https://')) {
+    const url = new URL(input);
+    return url.pathname.replace(/^\/+/, '');
+  }
+
+  return input;
+}
+
+export const handler: APIGatewayProxyHandler = async (event) => {
+  try {
+    /* ---------------- AUTH ---------------- */
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) throw new ApiError(401, 'Missing token.');
+    await verifyHostToken(token);
+
+    /* ---------------- BODY ---------------- */
+    const body = JSON.parse(event.body || '{}');
+    const { key, mediaSource, mediaId } = body;
+
+    if (mediaSource && mediaId) {
+
+      if (!['ACTIVITY', 'VENUE'].includes(mediaSource)) {
+        throw new ApiError(400, 'Invalid mediaSource');
+      }
+
+      /* ---------------- DB DELETE ---------------- */
+      if (mediaSource === 'ACTIVITY') {
+        const media = await prismaClient.activitiesMedia.findUnique({
+          where: { id: Number(mediaId) },
+        });
+
+        if (!media) throw new ApiError(404, 'Activity media not found');
+
+        await prismaClient.activitiesMedia.delete({
+          where: { id: media.id },
+        });
+      }
+
+      if (mediaSource === 'VENUE') {
+        const media = await prismaClient.activityVenueArtifacts.findUnique({
+          where: { id: Number(mediaId) },
+        });
+
+        if (!media) throw new ApiError(404, 'Venue media not found');
+
+        await prismaClient.activityVenueArtifacts.delete({
+          where: { id: media.id },
+        });
+      }
+
+    }
+
+    const s3Key = extractS3Key(key);
+
+    /* ---------------- PATH SAFETY ---------------- */
+    const allowedPrefixes = ['ActivityOnboarding/'];
+    if (!allowedPrefixes.some((p) => s3Key.startsWith(p))) {
+      throw new ApiError(403, 'Unauthorized delete path');
+    }
+
+    /* ---------------- S3 DELETE ---------------- */
+    await s3.send(
+      new DeleteObjectCommand({
+        Bucket: config.aws.bucketName!,
+        Key: s3Key,
+      }),
+    );
+
+    return response(200, {
+      success: true,
+      message: 'Media deleted from DB and S3 successfully',
+    });
+  } catch (err: any) {
+    console.error('ERROR:', err);
+
+    if (err instanceof ApiError) {
+      return response(err.statusCode, err.message);
+    }
+
+    return response(500, 'Internal server error');
+  }
+};
+
+function response(statusCode: number, body: any) {
+  return {
+    statusCode,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify(body),
+  };
+}
--- a/src/modules/host/handlers/mediaUploadForVenueToS3.ts
+++ b/src/modules/host/handlers/mediaUploadForVenueToS3.ts
@@ -0,0 +1,104 @@
+import { APIGatewayProxyHandler } from 'aws-lambda';
+import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import { v4 as uuid } from 'uuid';
+import ApiError from '../../../common/utils/helper/ApiError';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
+import { HostService } from '../services/host.service';
+import config from '../../../config/config';
+import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
+
+const s3 = new S3Client({ region: config.aws.region });
+const hostService = new HostService(prismaClient);
+
+export const handler: APIGatewayProxyHandler = async (event) => {
+    try {
+
+        const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+        if (!token) throw new ApiError(401, 'Missing token.');
+        await verifyHostToken(token);
+
+        const body = JSON.parse(event.body || '{}');
+        const { files, venueTempId } = body;
+
+        if (!venueTempId) {
+            throw new ApiError(400, 'venueTempId is required');
+        }
+
+        if (!Array.isArray(files) || files.length === 0) {
+            throw new ApiError(400, 'files array is required');
+        }
+
+        const activityXid = event.pathParameters?.activityXid;
+        if (!activityXid) {
+            throw new ApiError(400, 'activityXid is required in path parameters');
+        }
+
+        const activityDetails = await hostService.getActivityDetailsById(Number(activityXid));
+        if (!activityDetails) {
+            throw new ApiError(404, 'Activity not found');
+        }
+
+        const results: Array<any> = [];
+
+        for (const file of files) {
+            const { fileName, mimeType } = file;
+
+            if (!fileName || !mimeType) {
+                throw new ApiError(400, 'Each file must have fileName and mimeType');
+            }
+
+            const safeFileName = fileName
+                .trim()
+                .replace(/\s+/g, '_')
+                .replace(/[^a-zA-Z0-9._-]/g, '')
+                .toLowerCase();
+
+            const key = `ActivityOnboarding/Activity_${activityXid}/Venues/${venueTempId}/${uuid()}_${safeFileName}`;
+
+            const command = new PutObjectCommand({
+                Bucket: config.aws.bucketName!,
+                Key: key,
+                ContentType: mimeType,
+            });
+
+            const uploadUrl = await getSignedUrl(s3, command, {
+                expiresIn: 300, // 5 minutes
+            });
+
+            results.push({
+                uploadUrl,
+                key,
+                fileUrl: `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/${key}`,
+            });
+        }
+
+        return response(200, {
+            venueTempId,
+            files: results,
+        });
+
+    } catch (err: any) {
+        console.error('ERROR:', err);
+
+        // If it's your ApiError, return its status & message
+        if (err instanceof ApiError) {
+            return response(err.statusCode, err.message);
+        }
+
+        // Fallback for unknown errors
+        return response(500, 'Internal server error');
+    }
+
+};
+
+function response(statusCode: number, body: any) {
+    return {
+        statusCode,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify(body),
+    };
+}
--- a/src/modules/host/handlers/mediaUploadToS3.ts
+++ b/src/modules/host/handlers/mediaUploadToS3.ts
@@ -0,0 +1,98 @@
+import { APIGatewayProxyHandler } from 'aws-lambda';
+import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import { v4 as uuid } from 'uuid';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
+import { HostService } from '../services/host.service';
+import ApiError from '../../../common/utils/helper/ApiError';
+import config from '../../../config/config';
+import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
+
+const s3 = new S3Client({ region: config.aws.region });
+const hostService = new HostService(prismaClient);
+
+export const handler: APIGatewayProxyHandler = async (event) => {
+  try {
+
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) throw new ApiError(401, 'Missing token.');
+    await verifyHostToken(token);
+
+
+    const body = JSON.parse(event.body || '{}');
+    const { files } = body;
+
+    if (!Array.isArray(files) || files.length === 0) {
+      throw new ApiError(400, 'files array is required');
+    }
+
+    const activityXid = event.pathParameters?.activityXid;
+    if (!activityXid) {
+      throw new ApiError(400, 'activityXid is required in path parameters');
+    }
+
+    const activityDetails = await hostService.getActivityDetailsById(Number(activityXid));
+    if (!activityDetails) {
+      throw new ApiError(404, 'Activity not found');
+    }
+
+    const results = [];
+
+    for (const file of files) {
+      const { fileName, mimeType } = file;
+
+      if (!fileName || !mimeType) {
+        throw new ApiError(400, 'Each file must have fileName and mimeType');
+      }
+
+      const safeFileName = fileName
+        .trim()
+        .replace(/\s+/g, '_')
+        .replace(/[^a-zA-Z0-9._-]/g, '')
+        .toLowerCase();
+
+      const key = `ActivityOnboarding/Activity_${activityXid}/Artifacts/${uuid()}_${safeFileName}`;
+
+      const command = new PutObjectCommand({
+        Bucket: config.aws.bucketName!,
+        Key: key,
+        ContentType: mimeType,
+      });
+
+      const uploadUrl = await getSignedUrl(s3, command, {
+        expiresIn: 300,
+      });
+
+      results.push({
+        uploadUrl,
+        key,
+        fileUrl: `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/${key}`,
+      });
+    }
+
+    return response(200, { files: results });
+
+  } catch (err: any) {
+    console.error('ERROR:', err);
+
+    // If it's your ApiError, return its status & message
+    if (err instanceof ApiError) {
+      return response(err.statusCode, err.message);
+    }
+
+    // Fallback for unknown errors
+    return response(500, 'Internal server error');
+  }
+
+};
+
+function response(statusCode: number, body: any) {
+  return {
+    statusCode,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify(body),
+  };
+}
--- a/src/modules/host/handlers/updateHostProfile.ts
+++ b/src/modules/host/handlers/updateHostProfile.ts
@@ -0,0 +1,344 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import AWS from 'aws-sdk';
+import dayjs from 'dayjs';
+import { z } from 'zod';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
+import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
+import { ROLE } from '../../../common/utils/constants/common.constant';
+import { safeHandler } from '../../../common/utils/handlers/safeHandler';
+import ApiError from "../../../common/utils/helper/ApiError";
+import { parseMultipartFormData } from '../../../common/utils/helper/parseMultipartFormData';
+import config from '../../../config/config';
+
+const s3 = new AWS.S3({
+  region: config.aws.region,
+});
+
+const updateHostProfileSchema = z
+  .strictObject({
+    // Personal
+    fullName: z.string().min(1).optional(),
+    firstName: z.string().min(1).optional(),
+    lastName: z.string().min(1).optional(),
+    isdCode: z.string().min(1).max(6).optional(),
+    mobileNumber: z.string().min(5).max(15).optional(),
+    dateOfBirth: z.string().min(1).optional(),
+
+    profileImage: z.string().url().optional(),
+
+    // Address
+    address1: z.string().min(1).optional(),
+    address2: z.string().min(1).optional(),
+    countryXid: z.number().int().positive().optional(),
+    stateXid: z.number().int().positive().optional(),
+    cityXid: z.number().int().positive().optional(),
+    pinCode: z.string().min(1).optional(),
+
+    // explicitly forbidden
+    emailAddress: z.any().optional(),
+  })
+  .strip();
+
+async function uploadProfileImageToS3(buffer: Buffer, mimeType: string, originalName: string, userId: number) {
+  const sanitizeFileName = (name: string) => {
+    return name
+      .toLowerCase()
+      .replace(/[^a-z0-9.]/g, '_')
+      .replace(/_+/g, '_')
+      .replace(/^_+|_+$/g, '');
+  };
+
+  const fileExtension = originalName.split('.').pop() || 'jpg';
+  const fileName = `profile_image.${fileExtension}`;
+  const sanitizedFileName = sanitizeFileName(fileName);
+  const s3Key = `Host/ProfileImages/${userId}/${sanitizedFileName}`;
+
+  await s3
+    .upload({
+      Bucket: config.aws.bucketName,
+      Key: s3Key,
+      Body: buffer,
+      ContentType: mimeType,
+      ACL: 'private',
+    })
+    .promise();
+
+  return `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/${s3Key}`;
+}
+
+function parseDob(dateOfBirth: string): Date {
+  const parsed = dayjs(dateOfBirth, ['YYYY-MM-DD', 'MM/DD/YYYY', 'DD/MM/YYYY'], true);
+  if (!parsed.isValid()) {
+    throw new ApiError(400, 'Invalid dateOfBirth. Use YYYY-MM-DD (recommended) or MM/DD/YYYY.');
+  }
+  return parsed.toDate();
+}
+
+function splitFullName(fullName: string): { firstName: string; lastName: string | null } {
+  const parts = fullName.trim().split(/\s+/).filter(Boolean);
+  const firstName = parts[0] || '';
+  const lastName = parts.length > 1 ? parts.slice(1).join(' ') : null;
+  return { firstName, lastName };
+}
+
+function getAuthToken(event: APIGatewayProxyEvent): string {
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+  return token;
+}
+
+function parseJsonBody(event: APIGatewayProxyEvent): any {
+  try {
+    return event.body ? JSON.parse(event.body) : {};
+  } catch {
+    throw new ApiError(400, 'Invalid JSON in request body');
+  }
+}
+
+function validateBody(body: any) {
+  const parsed = updateHostProfileSchema.safeParse(body);
+  if (!parsed.success) {
+    throw new ApiError(400, parsed.error.issues.map((i) => i.message).join(', '));
+  }
+  if (parsed.data.emailAddress !== undefined) {
+    throw new ApiError(400, 'Email address cannot be updated.');
+  }
+  return parsed.data;
+}
+
+function normalizeNameFields(data: any): { firstName?: string; lastName?: string | null } {
+  if (data.fullName && !data.firstName && !data.lastName) {
+    const split = splitFullName(data.fullName);
+    return { firstName: split.firstName, lastName: split.lastName };
+  }
+  return { firstName: data.firstName, lastName: data.lastName };
+}
+
+function buildAddressInput(data: any) {
+  return {
+    address1: data.address1,
+    address2: data.address2,
+    countryXid: data.countryXid,
+    stateXid: data.stateXid,
+    cityXid: data.cityXid,
+    pinCode: data.pinCode,
+  };
+}
+
+function hasAnyDefined(obj: Record<string, unknown>) {
+  return Object.values(obj).some((v) => v !== undefined);
+}
+
+async function ensureHostUser(tx: any, userId: number) {
+  const user = await tx.user.findUnique({
+    where: { id: userId, isActive: true },
+    select: { id: true, roleXid: true },
+  });
+
+  if (!user) throw new ApiError(404, 'User not found');
+  if (user.roleXid !== ROLE.HOST) throw new ApiError(403, 'Access denied.');
+}
+
+async function updateUserIfNeeded(
+  tx: any,
+  userId: number,
+  input: {
+    firstName?: string;
+    lastName?: string | null;
+    isdCode?: string;
+    mobileNumber?: string;
+    dateOfBirth?: string;
+    profileImage?: string;
+  },
+) {
+  const userUpdateData: any = {};
+  if (input.firstName !== undefined) userUpdateData.firstName = input.firstName || null;
+  if (input.lastName !== undefined) userUpdateData.lastName = input.lastName;
+  if (input.isdCode !== undefined) userUpdateData.isdCode = input.isdCode || null;
+  if (input.mobileNumber !== undefined) userUpdateData.mobileNumber = input.mobileNumber || null;
+  if (input.dateOfBirth !== undefined) {
+    userUpdateData.dateOfBirth = input.dateOfBirth ? parseDob(input.dateOfBirth) : null;
+  }
+  if (input.profileImage !== undefined) {
+    userUpdateData.profileImage = input.profileImage || null;
+  }
+
+  if (!hasAnyDefined(userUpdateData)) return;
+
+  await tx.user.update({
+    where: { id: userId },
+    data: {
+      ...userUpdateData,
+      isProfileUpdated: true,
+    },
+  });
+}
+
+async function upsertAddressIfNeeded(tx: any, userId: number, addressData: Record<string, any>) {
+  if (!hasAnyDefined(addressData)) return;
+
+  const existingAddress = await tx.userAddressDetails.findFirst({
+    where: { userXid: userId, isActive: true },
+    select: { id: true },
+  });
+
+  const addressUpdateData: any = {};
+  if (addressData.address1 !== undefined) addressUpdateData.address1 = addressData.address1;
+  if (addressData.address2 !== undefined) addressUpdateData.address2 = addressData.address2;
+  if (addressData.countryXid !== undefined) addressUpdateData.countryXid = addressData.countryXid;
+  if (addressData.stateXid !== undefined) addressUpdateData.stateXid = addressData.stateXid;
+  if (addressData.cityXid !== undefined) addressUpdateData.cityXid = addressData.cityXid;
+  if (addressData.pinCode !== undefined) addressUpdateData.pinCode = addressData.pinCode;
+
+  if (existingAddress) {
+    await tx.userAddressDetails.update({
+      where: { id: existingAddress.id },
+      data: addressUpdateData,
+    });
+    return;
+  }
+
+  const required = ['address1', 'countryXid', 'stateXid', 'cityXid', 'pinCode'] as const;
+  const missing = required.filter((k) => addressData[k] === undefined);
+  if (missing.length) {
+    throw new ApiError(400, `Missing required address fields: ${missing.join(', ')}`);
+  }
+
+  await tx.userAddressDetails.create({
+    data: {
+      userXid: userId,
+      ...addressUpdateData,
+    },
+  });
+}
+
+async function getProfileSnapshot(tx: any, userId: number) {
+  const updated = await tx.user.findUnique({
+    where: { id: userId },
+    select: {
+      id: true,
+      firstName: true,
+      lastName: true,
+      emailAddress: true,
+      isdCode: true,
+      mobileNumber: true,
+      dateOfBirth: true,
+      profileImage: true,
+      isProfileUpdated: true,
+      userAddressDetails: {
+        where: { isActive: true },
+        take: 1,
+        select: {
+          id: true,
+          address1: true,
+          address2: true,
+          countryXid: true,
+          stateXid: true,
+          cityXid: true,
+          pinCode: true,
+        },
+      },
+    },
+  });
+
+  return {
+    user: updated,
+    address: updated?.userAddressDetails?.[0] ?? null,
+  };
+}
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context,
+): Promise<APIGatewayProxyResult> => {
+  const token = getAuthToken(event);
+  const userInfo = await verifyHostToken(token);
+  const userId = Number(userInfo.id);
+  if (!userId || Number.isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user id');
+  }
+
+  const contentType = event.headers['Content-Type'] || event.headers['content-type'] || '';
+  const isMultipart = contentType.includes('multipart/form-data');
+
+  let body: any;
+
+  if (isMultipart) {
+    const isBase64Encoded = event.isBase64Encoded || false;
+    const { fields, files } = parseMultipartFormData(event.body || null, contentType, isBase64Encoded);
+
+    const multipartBody: any = {};
+
+    const copyIfPresent = (key: string) => {
+      if (fields[key] !== undefined) {
+        multipartBody[key] = fields[key];
+      }
+    };
+
+    ['fullName', 'firstName', 'lastName', 'isdCode', 'mobileNumber', 'dateOfBirth', 'address1', 'address2', 'pinCode'].forEach(
+      copyIfPresent,
+    );
+
+    const parseNumberField = (key: string) => {
+      if (fields[key] !== undefined) {
+        const value = Number(fields[key]);
+        if (!Number.isNaN(value)) {
+          multipartBody[key] = value;
+        }
+      }
+    };
+
+    ['countryXid', 'stateXid', 'cityXid'].forEach(parseNumberField);
+
+    const profileImageFile = files.find((f) => f.fieldName === 'profileImage');
+    if (profileImageFile) {
+      const uploadedUrl = await uploadProfileImageToS3(
+        profileImageFile.data,
+        profileImageFile.contentType,
+        profileImageFile.fileName,
+        userId,
+      );
+      multipartBody.profileImage = uploadedUrl;
+    } else if (fields.profileImage) {
+      multipartBody.profileImage = fields.profileImage;
+    }
+
+    body = multipartBody;
+  } else {
+    body = parseJsonBody(event);
+  }
+
+  const data = validateBody(body);
+  const name = normalizeNameFields(data);
+  const address = buildAddressInput(data);
+
+  const result = await prismaClient.$transaction(async (tx) => {
+    await ensureHostUser(tx, userId);
+    await updateUserIfNeeded(tx, userId, {
+      firstName: name.firstName,
+      lastName: name.lastName,
+      isdCode: data.isdCode,
+      mobileNumber: data.mobileNumber,
+      dateOfBirth: data.dateOfBirth,
+      profileImage: data.profileImage,
+    });
+    await upsertAddressIfNeeded(tx, userId, address);
+    return getProfileSnapshot(tx, userId);
+  });
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Profile updated successfully',
+      data : null// no data payload per request
+    }),
+  };
+});
+
--- a/src/modules/host/services/activityScheduling.service.ts
+++ b/src/modules/host/services/activityScheduling.service.ts
@@ -0,0 +1,743 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaClient } from '@prisma/client';
+import { getPresignedUrl } from '../../../common/middlewares/aws/getPreSignedUrl';
+import {
+  ACTIVITY_AM_DISPLAY_STATUS,
+  ACTIVITY_AM_INTERNAL_STATUS,
+  ACTIVITY_DISPLAY_STATUS,
+  ACTIVITY_INTERNAL_STATUS,
+  SCHEDULING_TYPE,
+} from '../../../common/utils/constants/host.constant';
+import ApiError from '../../../common/utils/helper/ApiError';
+import { ScheduleActivityDTO } from '../../../common/utils/validation/host/createSchedulingOfAct.validation';
+import config from '../../../config/config';
+
+const bucket = config.aws.bucketName;
+
+@Injectable()
+export class SchedulingService {
+  constructor(private prisma: PrismaClient) { }
+
+  async getHostIdByUserId(userId: number) {
+    const host = await this.prisma.hostHeader.findFirst({
+      where: {
+        userXid: userId,
+        isActive: true,
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    if (!host) {
+      throw new ApiError(404, 'Host not found for the given user.');
+    }
+
+    return host.id;
+  }
+
+  async addSchedulingForActivity(data: ScheduleActivityDTO) {
+    const {
+      activityXid,
+      listNow,
+      scheduleType,
+      dateRange,
+      rules,
+      venues,
+      earlyCheckInMins,
+      bookingCutOffMins,
+      isLateCheckingAllowed,
+      isInstantBooking,
+    } = data;
+
+    return this.prisma.$transaction(async (tx) => {
+      const venueXids = venues.map((v) => v.venueXid);
+
+      /* ----------------------------------
+               🧹 0️⃣ DELETE OLD SCHEDULING (PER ACTIVITY + VENUES)
+            ---------------------------------- */
+
+      const oldHeaders = await tx.scheduleHeader.findMany({
+        where: {
+          activityXid,
+          activityVenueXid: { in: venueXids },
+          isActive: true,
+        },
+        select: { id: true },
+      });
+
+      const headerIds = oldHeaders.map((h) => h.id);
+
+      if (headerIds.length) {
+        // Delete in correct FK order
+        await tx.cancellations.deleteMany({
+          where: { scheduleHeaderXid: { in: headerIds } },
+        });
+
+        await tx.scheduleDetails.deleteMany({
+          where: { scheduleHeaderXid: { in: headerIds } },
+        });
+
+        await tx.scheduleOccurences.deleteMany({
+          where: { scheduleHeaderXid: { in: headerIds } },
+        });
+
+        await tx.scheduleRecurrence.deleteMany({
+          where: { scheduleHeaderXid: { in: headerIds } },
+        });
+
+        await tx.scheduleHeader.deleteMany({
+          where: { id: { in: headerIds } },
+        });
+      }
+
+      /* ----------------------------------
+               ➕ 1️⃣ CREATE NEW SCHEDULING
+            ---------------------------------- */
+      const createdHeaders: number[] = [];
+
+      if (
+        isInstantBooking !== undefined ||
+        isLateCheckingAllowed !== undefined
+      ) {
+        await tx.activities.update({
+          where: { id: activityXid, isActive: true },
+          data: { isInstantBooking, isLateCheckingAllowed },
+        });
+      }
+
+      if (listNow) {
+        await tx.activities.update({
+          where: { id: activityXid, isActive: true },
+          data: {
+            activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+            activityDisplayStatus: ACTIVITY_DISPLAY_STATUS.ACTIVITY_LISTED,
+            amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+            amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.ACTIVITY_LISTED,
+          },
+        });
+      }
+
+      for (const venue of venues) {
+        if (!venue.slots || venue.slots.length === 0) {
+          continue;
+        }
+
+        const header = await tx.scheduleHeader.create({
+          data: {
+            activityXid,
+            activityVenueXid: venue.venueXid,
+            scheduleType,
+            startDate: new Date(dateRange.startDate),
+            endDate: dateRange.endDate ? new Date(dateRange.endDate) : null,
+            earlyCheckInMins,
+            bookingCutOffMins,
+            isActive: true,
+          },
+        });
+
+        createdHeaders.push(header.id);
+
+        // WEEKLY
+        if (scheduleType === SCHEDULING_TYPE.WEEKLY) {
+          const uniqueWeekdays = [
+            ...new Set(
+              venue.slots
+                .map((s) => s.weekDay)
+                .filter(
+                  (
+                    d,
+                  ): d is
+                    | 'MONDAY'
+                    | 'TUESDAY'
+                    | 'WEDNESDAY'
+                    | 'THURSDAY'
+                    | 'FRIDAY'
+                    | 'SATURDAY'
+                    | 'SUNDAY' => !!d,
+                ),
+            ),
+          ];
+
+          if (!uniqueWeekdays.length) {
+            throw new ApiError(
+              400,
+              'Weekly schedule requires weekDay in slots',
+            );
+          }
+
+          await tx.scheduleRecurrence.createMany({
+            data: uniqueWeekdays.map((day) => ({
+              scheduleHeaderXid: header.id,
+              weekDay: day,
+              isActive: true,
+            })),
+          });
+        }
+
+        // MONTHLY
+        if (scheduleType === SCHEDULING_TYPE.MONTHLY) {
+          const uniqueDays = [
+            ...new Set(
+              venue.slots
+                .map((s) => s.dayOfMonth)
+                .filter((d): d is number => d !== null && d !== undefined),
+            ),
+          ];
+
+          if (!uniqueDays.length) {
+            throw new ApiError(
+              400,
+              'Monthly schedule requires dayOfMonth in slots',
+            );
+          }
+
+          await tx.scheduleRecurrence.createMany({
+            data: uniqueDays.map((day) => ({
+              scheduleHeaderXid: header.id,
+              dayOfMonth: day,
+              isActive: true,
+            })),
+          });
+        }
+
+        // CUSTOM / ONCE
+        if (
+          scheduleType === SCHEDULING_TYPE.CUSTOM ||
+          scheduleType === SCHEDULING_TYPE.ONCE
+        ) {
+          const uniqueDates = [
+            ...new Set(
+              venue.slots.map((s) => s.occurrenceDate).filter(Boolean),
+            ),
+          ];
+
+          await tx.scheduleOccurences.createMany({
+            data: uniqueDates.map((d) => ({
+              scheduleHeaderXid: header.id,
+              occurenceDate: new Date(d!),
+              isActive: true,
+            })),
+          });
+        }
+
+        // Slots
+        for (const slot of venue.slots) {
+          await tx.scheduleDetails.create({
+            data: {
+              scheduleHeaderXid: header.id,
+              occurenceDate: slot.occurrenceDate
+                ? new Date(slot.occurrenceDate)
+                : null,
+              weekDay: slot.weekDay ?? null,
+              dayOfMonth: slot.dayOfMonth ?? null,
+              startTime: slot.startTime,
+              endTime: slot.endTime,
+              maxCapacity: slot.maxCapacity,
+              isActive: true,
+            },
+          });
+        }
+      }
+
+      return { success: true, scheduleHeaderIds: createdHeaders };
+    });
+  }
+
+  async getAvailableSlotsForDate(activityXid: number, selectedDate: string) {
+    const date = new Date(selectedDate);
+
+    if (isNaN(date.getTime())) {
+      throw new ApiError(400, 'Invalid date format');
+    }
+
+    const weekDay = date
+      .toLocaleDateString('en-US', { weekday: 'long' })
+      .toUpperCase();
+    const dayOfMonth = date.getDate();
+
+    /* --------------------------------
+           1️⃣ FETCH ACTIVE SCHEDULE HEADERS
+        -------------------------------- */
+    const scheduleHeaders = await this.prisma.scheduleHeader.findMany({
+      where: {
+        activityXid,
+        isActive: true,
+        startDate: { lte: date },
+        OR: [{ endDate: null }, { endDate: { gte: date } }],
+      },
+      include: {
+        activityVenue: {
+          select: {
+            id: true,
+            venueName: true,
+            venueLabel: true,
+            venueCapacity: true,
+          },
+        },
+        scheduleRecurrences: {
+          where: { isActive: true },
+        },
+        ScheduleDetails: {
+          where: {
+            isActive: true,
+            OR: [
+              { occurenceDate: date }, // ONLY_ONCE / CUSTOM
+              { weekDay: weekDay }, // WEEKLY
+              { dayOfMonth: dayOfMonth }, // MONTHLY
+            ],
+          },
+        },
+        Cancellations: {
+          where: {
+            occurenceDate: date,
+            isActive: true,
+          },
+        },
+      },
+    });
+
+    if (!scheduleHeaders.length) {
+      return [];
+    }
+
+    /* --------------------------------
+           2️⃣ BUILD RESPONSE
+        -------------------------------- */
+    const response = [];
+
+    for (const header of scheduleHeaders) {
+
+      // Build cancellation set using time matching
+      const cancelledSlots = new Set(
+        header.Cancellations.map(
+          (c) => `${c.startTime}-${c.endTime}`
+        )
+      );
+
+      const slots = header.ScheduleDetails
+        .filter(
+          (slot) =>
+            !cancelledSlots.has(`${slot.startTime}-${slot.endTime}`)
+        )
+        .map((slot) => ({
+          slotId: slot.id,
+          startTime: slot.startTime,
+          endTime: slot.endTime,
+          maxCapacity: slot.maxCapacity,
+        }));
+
+      if (!slots.length) continue;
+
+      response.push({
+        venueXid: header.activityVenue.id,
+        venueName: header.activityVenue.venueName,
+        venueLabel: header.activityVenue.venueLabel,
+        venueCapacity: header.activityVenue.venueCapacity,
+        slots,
+      });
+    }
+
+    return response;
+  }
+
+  /**
+   * Return full schedule header + venue + slots for a given activity and date
+   */
+  async getScheduleDetailsForDate(activityXid: number, selectedDate: string) {
+    const date = new Date(selectedDate);
+
+    if (isNaN(date.getTime())) {
+      throw new ApiError(400, 'Invalid date format');
+    }
+
+    const weekDay = date
+      .toLocaleDateString('en-US', { weekday: 'long' })
+      .toUpperCase();
+    const dayOfMonth = date.getDate();
+
+    const scheduleHeaders = await this.prisma.scheduleHeader.findMany({
+      where: {
+        activityXid,
+        isActive: true,
+        startDate: { lte: date },
+        OR: [{ endDate: null }, { endDate: { gte: date } }],
+        ScheduleDetails: {
+          some: {}
+        }
+      },
+      include: {
+        activityVenue: {
+          select: {
+            id: true,
+            venueName: true,
+            venueLabel: true,
+            venueCapacity: true,
+          },
+        },
+        scheduleRecurrences: {
+          where: { isActive: true },
+        },
+        ScheduleDetails: {
+          where: {
+            isActive: true,
+            OR: [
+              { occurenceDate: date },
+              { weekDay: weekDay },
+              { dayOfMonth: dayOfMonth },
+            ],
+          },
+        },
+        Cancellations: {
+          where: {
+            occurenceDate: date,
+            isActive: true,
+          },
+        },
+      },
+    });
+
+    if (!scheduleHeaders.length) return [];
+
+    const response = scheduleHeaders.map((header) => {
+
+      // Match cancelled slots using startTime + endTime
+      const cancelledSlots = new Set(
+        header.Cancellations.map(
+          (c) => `${c.startTime}-${c.endTime}`
+        )
+      );
+
+      const slots = header.ScheduleDetails
+        .filter(
+          (slot) =>
+            !cancelledSlots.has(`${slot.startTime}-${slot.endTime}`)
+        )
+        .map((slot) => ({
+          slotId: slot.id,
+          occurenceDate: slot.occurenceDate,
+          weekDay: slot.weekDay,
+          dayOfMonth: slot.dayOfMonth,
+          startTime: slot.startTime,
+          endTime: slot.endTime,
+          maxCapacity: slot.maxCapacity,
+        }));
+
+      return {
+        scheduleHeaderXid: header.id,
+        scheduleType: header.scheduleType,
+        startDate: header.startDate,
+        endDate: header.endDate,
+        earlyCheckInMins: header.earlyCheckInMins,
+        bookingCutOffMins: header.bookingCutOffMins,
+        activityVenue: {
+          venueXid: header.activityVenue.id,
+          venueName: header.activityVenue.venueName,
+          venueLabel: header.activityVenue.venueLabel,
+          venueCapacity: header.activityVenue.venueCapacity,
+        },
+        slots, // only active slots, no cancellation flag
+      };
+    });
+
+    return response;
+  }
+
+  async getVenueFromVenueXid(venueXid: number, activityXid: number) {
+    return await this.prisma.activityVenues.findUnique({
+      where: { id: venueXid, activityXid: activityXid, isActive: true },
+      select: {
+        id: true,
+        venueName: true,
+        venueLabel: true,
+        venueCapacity: true,
+      },
+    });
+  }
+
+  async getActivityByXid(activityXid: number) {
+    return await this.prisma.activities.findUnique({
+      where: { id: activityXid, isActive: true },
+      select: {
+        id: true,
+        activityTitle: true,
+      },
+    });
+  }
+
+  /**
+   * Get activities by status and host ID
+   * @param hostId - ID of the host
+   * @param status - Filter by status (Listed, Unlisted, Not_Listed) - optional
+   * @returns Array of activities matching the criteria
+   */
+  async getActivitiesByStatus(hostId: number, status?: string) {
+    // Build where clause
+    const whereClause: any = {
+      hostXid: hostId,
+      isActive: true,
+      deletedAt: null,
+      activityInternalStatus: {
+        in: [
+          ACTIVITY_INTERNAL_STATUS.ACTIVITY_APPROVED,
+          ACTIVITY_INTERNAL_STATUS.ACTIVITY_UNLISTED,
+          ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+        ],
+      },
+    };
+
+    // Add status filter if provided
+    if (status) {
+      whereClause.activityInternalStatus = status;
+    }
+
+    // Query activities
+    const activities = await this.prisma.activities.findMany({
+      where: whereClause,
+      select: {
+        id: true,
+        activityRefNumber: true,
+        activityTitle: true,
+        activityDescription: true,
+        activityDisplayStatus: true,
+        activityInternalStatus: true,
+        ActivitiesMedia: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            mediaFileName: true,
+            mediaType: true,
+          },
+        },
+        ScheduleHeader: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            scheduleType: true,
+            startDate: true,
+          },
+          orderBy: { createdAt: 'desc' },
+        },
+      },
+      orderBy: {
+        createdAt: 'desc',
+      },
+    });
+
+    for (const activity of activities) {
+      if (activity.ActivitiesMedia?.length) {
+        for (const media of activity.ActivitiesMedia) {
+          if (!media.mediaFileName) continue;
+
+          const key = media.mediaFileName.startsWith('http')
+            ? media.mediaFileName.split('.com/')[1]
+            : media.mediaFileName;
+
+          (media as any).presignedUrl = await getPresignedUrl(bucket, key);
+        }
+      }
+    }
+
+    // Transform response
+    return activities.map((activity) => ({
+      activityId: activity.id,
+      activityRefNumber: activity.activityRefNumber,
+      activityName: activity.activityTitle,
+      activityDescription: activity.activityDescription,
+      activityInternalStatus: activity.activityInternalStatus,
+      activityDisplayStatus: activity.activityDisplayStatus,
+      media: activity.ActivitiesMedia,
+      scheduleType: activity.ScheduleHeader?.length
+        ? activity.ScheduleHeader[0].scheduleType
+        : null,
+      scheduleStartDate: activity.ScheduleHeader?.length
+        ? activity.ScheduleHeader[0].startDate
+        : null,
+    }));
+  }
+
+  async getVenueDurationByAct(activityXid: number, hostId: number) {
+    const result = await this.prisma.activities.findUnique({
+      where: { id: activityXid, hostXid: hostId, isActive: true },
+      select: {
+        id: true,
+        activityDurationMins: true,
+        activityTitle: true,
+        activityRefNumber: true,
+        isLateCheckingAllowed: true,
+        isInstantBooking: true,
+        frequenciesXid: true,
+        frequency: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            frequencyName: true,
+          },
+        },
+        ActivityVenues: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            venueName: true,
+            venueLabel: true,
+            ScheduleHeader: {
+              where: { isActive: true },
+              select: {
+                id: true,
+                scheduleType: true,
+                startDate: true,
+                endDate: true,
+                earlyCheckInMins: true,
+                bookingCutOffMins: true,
+                ScheduleDetails: {
+                  where: { isActive: true },
+                  select: {
+                    id: true,
+                    occurenceDate: true,
+                    weekDay: true,
+                    dayOfMonth: true,
+                    startTime: true,
+                    endTime: true,
+                  },
+                },
+                Cancellations: {
+                  where: { isActive: true },
+                  select: {
+                    id: true,
+                    cancellationReason: true,
+                    occurenceDate: true,
+                    startTime: true,
+                    endTime: true,
+                  },
+                },
+                scheduleOccurences: {
+                  where: { isActive: true },
+                  select: {
+                    id: true,
+                    occurenceDate: true,
+                  },
+                },
+                scheduleRecurrences: {
+                  where: { isActive: true },
+                  select: {
+                    id: true,
+                    weekDay: true,
+                    dayOfMonth: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        ActivitiesMedia: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            mediaFileName: true,
+            mediaType: true,
+          },
+        },
+      },
+    });
+
+    if (!result) return null;
+
+    if (result.ActivitiesMedia?.length) {
+      for (const media of result.ActivitiesMedia) {
+        if (!media.mediaFileName) continue;
+
+        const key = media.mediaFileName.startsWith('http')
+          ? media.mediaFileName.split('.com/')[1]
+          : media.mediaFileName;
+
+        (media as any).presignedUrl = await getPresignedUrl(bucket, key);
+      }
+    }
+
+    for (const venue of result.ActivityVenues ?? []) {
+      for (const header of venue.ScheduleHeader ?? []) {
+
+        /* -------------------------------
+                   📅 FRONTEND FRIENDLY META
+                -------------------------------- */
+
+        // WEEKLY → send weekdays
+        if (header.scheduleType === 'WEEKLY') {
+          (header as any).scheduleDays = [
+            ...new Set(
+              header.scheduleRecurrences?.map((r) => r.weekDay).filter(Boolean),
+            ),
+          ];
+        }
+
+        // MONTHLY → send dates (1–31)
+        if (header.scheduleType === 'MONTHLY') {
+          (header as any).scheduleDates = [
+            ...new Set(
+              header.scheduleRecurrences
+                ?.map((r) => r.dayOfMonth)
+                .filter(Boolean),
+            ),
+          ];
+        }
+
+        // CUSTOM / ONCE → send exact dates
+        if (
+          header.scheduleType === 'CUSTOM' ||
+          header.scheduleType === 'ONCE'
+        ) {
+          (header as any).scheduleDates = [
+            ...new Set(
+              header.scheduleOccurences
+                ?.map((o) => o.occurenceDate?.toISOString().split('T')[0])
+                .filter(Boolean),
+            ),
+          ];
+        }
+      }
+    }
+
+    (result as any).availableScheduleTypes = [
+      'ONCE',
+      'WEEKLY',
+      'MONTHLY',
+      'CUSTOM',
+    ];
+
+    return result;
+  }
+
+  async cancelMultipleSlotsForActivity(
+    cancellations: {
+      scheduleHeaderXid: number;
+      occurenceDate: string;
+      startTime: string;
+      endTime: string;
+      cancellationReason?: string;
+    }[],
+  ) {
+    return await this.prisma.cancellations.createMany({
+      data: cancellations.map((item) => ({
+        scheduleHeaderXid: item.scheduleHeaderXid,
+        occurenceDate: item.occurenceDate,
+        startTime: item.startTime,
+        endTime: item.endTime,
+        cancellationReason: item.cancellationReason || 'No reason provided',
+      })),
+      skipDuplicates: true,
+    });
+  }
+
+  async openCanceledSlot(
+    cancellations: { cancellationXid: number; }[],
+  ) {
+    return await this.prisma.cancellations.updateMany({
+      where: {
+        id: { in: cancellations.map((c) => c.cancellationXid) },
+      },
+      data: {
+        isActive: false,
+      },
+    });
+  }
+}
--- a/src/modules/host/services/host.service.ts
+++ b/src/modules/host/services/host.service.ts
--- a/src/modules/host/services/token.service.ts
+++ b/src/modules/host/services/token.service.ts
@@ -53,10 +53,10 @@ export class TokenService {
      config.jwt.secret
    );

-    await this.prisma.token.deleteMany({
-      where: { userXid: user_xid }
-    })
-
+    // Optionally keep existing refresh tokens alive instead of deleting
+    // Removed deleteMany call so the same refresh token can be used multiple
+    // times. If you want to limit refresh tokens later you can implement
+    // rotation or blacklist logic elsewhere.
    await this.prisma.token.create({
      data: {
        token: refreshToken.token,
--- a/src/modules/minglaradmin/handlers/hosthub/hosts/acceptActivityApplicationByAM.ts
+++ b/src/modules/minglaradmin/handlers/hosthub/hosts/acceptActivityApplicationByAM.ts
@@ -0,0 +1,59 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { sendActivityAcceptanceMailtoHost } from '../../../../minglaradmin/services/approvalMailtoHost.service';
+import { MinglarService } from '../../../services/minglar.service';
+
+const minglarService = new MinglarService(prismaClient);
+
+interface Body {
+    activityId: number;
+}
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+
+    const userInfo = await verifyMinglarAdminToken(token);
+
+    // Parse request body
+    let body: Body;
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { activityId } = body;
+
+    if (!activityId) {
+        throw new ApiError(400, 'activityId is required');
+    }
+
+    await minglarService.acceptActivityApplicationByAM(
+        Number(activityId),
+        Number(userInfo.id)
+    );
+    const hostXid = await minglarService.getHostXidByActivityId(activityId)
+    const hostDetails = await minglarService.getUserDetails(hostXid)
+    await sendActivityAcceptanceMailtoHost(hostDetails.emailAddress, hostDetails.firstName)
+
+    return {
+        statusCode: 201,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Approved activity details application successfully',
+            data: null,
+        }),
+    };
+});
--- a/src/modules/minglaradmin/handlers/hosthub/hosts/addActivtiySuggestion.ts
+++ b/src/modules/minglaradmin/handlers/hosthub/hosts/addActivtiySuggestion.ts
@@ -0,0 +1,89 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { MinglarService } from '../../../services/minglar.service';
+// import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
+
+const minglarService = new MinglarService(prismaClient);
+
+interface AddSuggestionBody {
+  title: string;
+  comments: string;
+  activity_xid:number
+}
+
+/**
+ * Add suggestion handler for host applications
+ * Allows Minglar Admin, Co_Admin, and Account Manager to add suggestions
+ * Types: Setup Profile, Review Account, Add Payment Details, Agreement
+ */
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Verify authentication token
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyMinglarAdminToken(token);
+
+  // Get user details
+  const user = await prismaClient.user.findUnique({
+    where: { id: userInfo.id },
+    select: { id: true, roleXid: true }
+  });
+
+  if (!user) {
+    throw new ApiError(404, 'User not found');
+  }
+
+  // Parse request body
+  let body: AddSuggestionBody;
+
+  try {
+    body = event.body ? JSON.parse(event.body) : {};
+  } catch (error) {
+    throw new ApiError(400, 'Invalid JSON in request body');
+  }
+
+  const { title, comments , activity_xid} = body;
+
+  if (!title) {
+    throw new ApiError(400, 'Title is required');
+  }
+
+  if (!comments) {
+    throw new ApiError(400, 'Comments are required');
+  }
+
+  if(!activity_xid){
+    throw new ApiError(400 , "Activity Pqq HeaderXid Required");
+  }
+
+  // Validate title is one of the allowed types
+  // const allowedTitles = Object.values(HOST_SUGGESTION_TITLES);
+  // if (!allowedTitles.includes(title)) {
+  //   throw new ApiError(400, `Invalid title. Allowed values: ${allowedTitles.join(', ')}`);
+  // }
+
+  // Add suggestion using service
+  await minglarService.addActivtiySuggestion(title, comments, activity_xid,user.id);
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Suggestion added successfully',
+      data: null,
+    }),
+  };
+});
--- a/src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM.ts
+++ b/src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM.ts
@@ -0,0 +1,59 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { sendActivityRejectionMailtoHost } from '../../../../minglaradmin/services/rejectionMailtoHost.service';
+import { MinglarService } from '../../../services/minglar.service';
+
+const minglarService = new MinglarService(prismaClient);
+
+interface Body {
+    activityId: number;
+}
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) throw new ApiError(401, 'This is a protected route. Please provide a valid token.');
+
+    const userInfo = await verifyMinglarAdminToken(token);
+
+    // Parse request body
+    let body: Body;
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { activityId } = body;
+
+    if (!activityId) {
+        throw new ApiError(400, 'activityId is required');
+    }
+
+    await minglarService.rejectActivityApplicationByAM(
+        Number(activityId),
+        Number(userInfo.id)
+    );
+    const hostXid = await minglarService.getHostXidByActivityId(activityId)
+    const hostDetails = await minglarService.getUserDetails(hostXid)
+    await sendActivityRejectionMailtoHost(hostDetails.emailAddress, hostDetails.firstName)
+
+    return {
+        statusCode: 201,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Rejected activity details application successfully',
+            data: null,
+        }),
+    };
+});
--- a/src/modules/minglaradmin/handlers/hosthub/hosts/rejectHostApplicationAM.ts
+++ b/src/modules/minglaradmin/handlers/hosthub/hosts/rejectHostApplicationAM.ts
@@ -5,6 +5,7 @@ import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
 import ApiError from '../../../../../common/utils/helper/ApiError';
 import { MinglarService } from '../../../services/minglar.service';
 import { sendAMRejectionMailtoHost } from '../../../services/rejectionMailtoHost.service';
+import config from '../../../../../config/config';

 const minglarService = new MinglarService(prismaClient);

@@ -47,7 +48,7 @@ export const handler = safeHandler(async (
  // Add suggestion using service
  await minglarService.rejectHostApplicationAM(hostXid, userInfo.id);
  const hostDetails = await minglarService.getUserDetails(hostXid)
-  await sendAMRejectionMailtoHost(hostDetails.emailAddress, hostDetails.firstName)
+  await sendAMRejectionMailtoHost(hostDetails.emailAddress, hostDetails.firstName, config.HOST_LINK)

  return {
    statusCode: 200,
--- a/src/modules/minglaradmin/handlers/registration.ts
+++ b/src/modules/minglaradmin/handlers/registration.ts
@@ -27,7 +27,6 @@ export const handler = safeHandler(async (
  if (!email) {
    throw new ApiError(400, 'Email is required');
  }
-  console.log(email, " -: Email")

  const emailToLowerCase = email.toLowerCase()

@@ -35,7 +34,6 @@ export const handler = safeHandler(async (
    where: { emailAddress: emailToLowerCase, isActive: true, userStatus: USER_STATUS.INVITED },
    select: { emailAddress: true, id: true, userPassword: true, roleXid: true },
  });
-  console.log(user, "sljdfjdf")

  if (!user) {
    throw new ApiError(403, 'You are not allowed to register directly. Please contact minglar admin.');
--- a/src/modules/minglaradmin/services/approvalMailtoHost.service.ts
+++ b/src/modules/minglaradmin/services/approvalMailtoHost.service.ts
@@ -90,6 +90,44 @@ export async function sendAMPQQAcceptanceMailtoHost(
    <p>Congratulations, Your activity onboarding application to minglar admin has been approved.</p>
    <p>You can start adding other details of your activity through the host panel.</p>
    <p> You can login to your account using the link below:<br/> 
+    <strong>Link:</strong> ${config.HOST_LINK_PQ} </p>
+    <p>Best regards,<br/>Minglar Team</p>
+  `;
+
+    try {
+        const result = await brevoService.sendEmail({
+            recipients: [{ email: emailAddress }],
+            subject,
+            htmlContent,
+        });
+
+        console.log("📧 Email sent successfully:", result);
+
+        return {
+            sent: true,
+            // messageId: result.messageId
+        };
+    } catch (err) {
+        console.error("Brevo email send failed:", err);
+        throw new ApiError(500, "Failed to send OTP to minglar admin via email.");
+    }
+}
+
+export async function sendActivityAcceptanceMailtoHost(
+    emailAddress: string,
+    name: string
+): Promise<{
+    sent: boolean;
+    //  messageId: string
+}> {
+
+    const subject = "Approval for your activity details application";
+
+    const htmlContent = `
+    <p>Dear ${name},</p>
+    <p>Congratulations, Your activity details application to minglar admin has been approved.</p>
+    <p>You can start getting orders for your activity.</p>
+    <p>You can login to your account using the link below:<br/> 
    <strong>Link:</strong> ${config.HOST_LINK} </p>
    <p>Best regards,<br/>Minglar Team</p>
  `;
--- a/src/modules/minglaradmin/services/minglar.service.ts
+++ b/src/modules/minglaradmin/services/minglar.service.ts
@@ -23,10 +23,9 @@ import {
 import { PaginationOptions } from '@/common/utils/pagination/pagination.types';
 import config from '@/config/config';
 import { Injectable } from '@nestjs/common';
-import { User } from '@prisma/client';
+import { PrismaClient, User } from '@prisma/client';
 import * as bcrypt from 'bcryptjs';
 import { PrismaService } from '../../../common/database/prisma.service';
-import { PrismaClient } from '@prisma/client';
 import ApiError from '../../../common/utils/helper/ApiError';
 import { CreateMinglarDto, UpdateMinglarDto } from '../dto/minglar.dto';
 import { sendAMEmailForHostAssign } from './AMEmail.service';
@@ -35,7 +34,7 @@ const bucket = config.aws.bucketName;

@Injectable()
 export class MinglarService {
-  constructor(private prisma: PrismaService | PrismaClient) { }
+  constructor(private prisma: PrismaService | PrismaClient) {}

  async createPassword(user_xid: number, password: string): Promise<boolean> {
    // Find user by id
@@ -138,15 +137,15 @@ export class MinglarService {

  async getHostXidByActivityId(activityId: number) {
    const activityDetails = await this.prisma.activities.findFirst({
-      where: { id: activityId }
-    })
+      where: { id: activityId },
+    });
    return activityDetails.hostXid;
  }

  async getUserDetails(id: number) {
    const hostDetail = await this.prisma.hostHeader.findFirst({
-      where: { id: id }
-    })
+      where: { id: id },
+    });
    const userDetails = await this.prisma.user.findUnique({
      where: { id: hostDetail.userXid },
    });
@@ -154,8 +153,10 @@ export class MinglarService {
  }

  async verifyHostOtp(email: string, otp: string): Promise<boolean> {
-    const user = await this.prisma.user.findUnique({
-      where: { emailAddress: email },
+    const trimmedOtp = (otp || '').toString().trim();
+
+    const user = await this.prisma.user.findFirst({
+      where: { emailAddress: email, isActive: true },
      select: {
        id: true,
        emailAddress: true,
@@ -181,7 +182,7 @@ export class MinglarService {
      throw new ApiError(400, 'OTP has expired.');
    }

-    const isMatch = await bcrypt.compare(otp, userOtp.otpCode);
+    const isMatch = await bcrypt.compare(trimmedOtp, userOtp.otpCode);

    if (!isMatch) {
      throw new ApiError(400, 'Invalid OTP.');
@@ -217,7 +218,7 @@ export class MinglarService {
        userStatus: true,
        profileImage: true,
        userPassword: true,
-      }
+      },
    });

    if (!existingUser) {
@@ -241,8 +242,8 @@ export class MinglarService {
    }

    if (existingUser?.profileImage) {
-      const key = existingUser.profileImage.startsWith("http")
-        ? existingUser.profileImage.split(".com/")[1]
+      const key = existingUser.profileImage.startsWith('http')
+        ? existingUser.profileImage.split('.com/')[1]
        : existingUser.profileImage;

      existingUser.profileImage = await getPresignedUrl(bucket, key);
@@ -269,7 +270,11 @@ export class MinglarService {
    });
  }

-  async getAllHostActivityForMinglar(search?: string, hostXid?: number, paginationOptions?: { page: number; limit: number; skip: number }) {
+  async getAllHostActivityForMinglar(
+    search?: string,
+    hostXid?: number,
+    paginationOptions?: { page: number; limit: number; skip: number },
+  ) {
    const whereClause: any = {
      isActive: true,
      activityInternalStatus: { notIn: [ACTIVITY_INTERNAL_STATUS.DRAFT_PQ] },
@@ -285,8 +290,8 @@ export class MinglarService {
        { activityTitle: { contains: term, mode: 'insensitive' } },
        {
          activityType: {
-            activityTypeName: { contains: term, mode: 'insensitive' }
-          }
+            activityTypeName: { contains: term, mode: 'insensitive' },
+          },
        },
      ];
    }
@@ -309,10 +314,10 @@ export class MinglarService {
              companyName: true,
              user: {
                select: {
-                  userRefNumber: true
-                }
-              }
-            }
+                  userRefNumber: true,
+                },
+              },
+            },
          },
          ActivityAmDetails: {
            select: {
@@ -335,10 +340,10 @@ export class MinglarService {
              interests: {
                select: {
                  id: true,
-                  interestName: true
-                }
-              }
-            }
+                  interestName: true,
+                },
+              },
+            },
          },
        },
        skip: paginationOptions?.skip || 0,
@@ -354,8 +359,8 @@ export class MinglarService {
      const am = activity.ActivityAmDetails?.[0]?.accountManager;

      if (am?.profileImage) {
-        const key = am.profileImage.startsWith("http")
-          ? am.profileImage.split(".com/")[1]
+        const key = am.profileImage.startsWith('http')
+          ? am.profileImage.split('.com/')[1]
          : am.profileImage;

        const presignedUrl = await getPresignedUrl(bucket, key);
@@ -367,15 +372,16 @@ export class MinglarService {
      }
    }

-    const { paginationService } = require('@/common/utils/pagination/pagination.service');
+    const {
+      paginationService,
+    } = require('@/common/utils/pagination/pagination.service');
    return paginationService.createPaginatedResponse(
      hostActivities,
      totalCount,
-      paginationOptions || { page: 1, limit: 10, skip: 0 }
+      paginationOptions || { page: 1, limit: 10, skip: 0 },
    );
  }

-
  async createUserRevenue(
    userXid: number,
    isFixedSalary: boolean,
@@ -439,7 +445,7 @@ export class MinglarService {
          emailAddress: emailAddress,
          roleXid: roleXid,
          userStatus: USER_STATUS.INVITED,
-          userRefNumber: referenceNumber
+          userRefNumber: referenceNumber,
        },
      });

@@ -488,7 +494,11 @@ export class MinglarService {
      cityXid?: number;
      pinCode?: string;
    },
-    documents: Array<{ fileName: string; filePath: string, documentTypeName?: string }>,
+    documents: Array<{
+      fileName: string;
+      filePath: string;
+      documentTypeName?: string;
+    }>,
  ) {
    try {
      return await this.prisma.$transaction(async (tx) => {
@@ -736,7 +746,7 @@ export class MinglarService {
    userStatus?: string,
    paginationOptions?: PaginationOptions,
    roleFilter?: string,
-    applicationStatus?: string
+    applicationStatus?: string,
  ) {
    const filters: any = {
      isActive: true,
@@ -748,27 +758,67 @@ export class MinglarService {
    };

    /** SEARCH FILTER **/
+    // if (search?.trim()) {
+    //   const term = search.trim();
+
+    //   if (/^\d+$/.test(term)) {
+    //     filters.id = Number(term);
+    //   } else {
+    //     filters.user = {
+    //       ...filters.user,
+    //       OR: [
+    //         { emailAddress: { contains: term, mode: 'insensitive' } },
+    //         { firstName: { contains: term, mode: 'insensitive' } },
+    //         { lastName: { contains: term, mode: 'insensitive' } },
+    //       ],
+    //     };
+    //   }
+    // }
    if (search?.trim()) {
      const term = search.trim();
-
-      if (/^\d+$/.test(term)) {
-        filters.id = Number(term);
-      } else {
-        filters.user = {
-          ...filters.user,
+      filters.AND = [
+        {
          OR: [
-            { emailAddress: { contains: term, mode: 'insensitive' } },
-            { firstName: { contains: term, mode: 'insensitive' } },
-            { lastName: { contains: term, mode: 'insensitive' } },
+            {
+              companyName: {
+                contains: term,
+                mode: 'insensitive',
+              },
+            },
+            {
+              user: {
+                OR: [
+                  {
+                    firstName: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                  {
+                    lastName: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                  {
+                    userRefNumber: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                ],
+              },
+            },
          ],
-        };
-      }
+        },
+      ];
    }

    /** USER STATUS FILTER **/
    if (
      userStatus &&
-      userStatus.trim().toLowerCase() === MINGLAR_STATUS_DISPLAY.NEW.toLowerCase()
+      userStatus.trim().toLowerCase() ===
+        MINGLAR_STATUS_DISPLAY.NEW.toLowerCase()
    ) {
      filters.adminStatusInternal = MINGLAR_STATUS_INTERNAL.ADMIN_TO_REVIEW;
    }
@@ -790,9 +840,12 @@ export class MinglarService {
        internal: MINGLAR_STATUS_INTERNAL.AM_REJECTED,
        display: MINGLAR_STATUS_DISPLAY.ENHANCING,
      },
+      Approved: {
+        internal: MINGLAR_STATUS_INTERNAL.AM_APPROVED,
+        display: MINGLAR_STATUS_DISPLAY.APPROVED,
+      }
    };

-
    if (applicationStatus?.trim()) {
      const key = applicationStatus.trim();
      const statusObj = APPLICATION_STATUS_MAP[key];
@@ -803,7 +856,6 @@ export class MinglarService {
      }
    }

-
    /** ROLE-BASED FILTER **/
    if (userRoleXid === ROLE.CO_ADMIN || userRoleXid === ROLE.ACCOUNT_MANAGER) {
      filters.accountManagerXid = userId;
@@ -835,7 +887,7 @@ export class MinglarService {
            emailAddress: true,
            mobileNumber: true,
            userRefNumber: true,
-            profileImage: true
+            profileImage: true,
          },
        },
        accountManager: {
@@ -846,11 +898,11 @@ export class MinglarService {
            emailAddress: true,
            mobileNumber: true,
            roleXid: true,
-            profileImage: true
+            profileImage: true,
          },
        },
      },
-      orderBy: { createdAt: "desc" },
+      orderBy: { createdAt: 'desc' },
      skip: paginationOptions?.skip || 0,
      take: paginationOptions?.limit || 10,
    });
@@ -859,8 +911,8 @@ export class MinglarService {
      const am = user.accountManager;

      if (am?.profileImage) {
-        const key = am.profileImage.startsWith("http")
-          ? am.profileImage.split(".com/")[1]
+        const key = am.profileImage.startsWith('http')
+          ? am.profileImage.split('.com/')[1]
          : am.profileImage;

        am.profileImage = await getPresignedUrl(bucket, key);
@@ -886,7 +938,6 @@ export class MinglarService {
    return { data: transformedData, totalCount };
  }

-
  async getAllOnboardingHostApplications(
    paginationOptions?: PaginationOptions,
    search?: string,
@@ -980,7 +1031,6 @@ export class MinglarService {
      take: paginationOptions?.limit ?? undefined,
    });

-
    /** ---------------------------------
     *  Add presigned URL for AM profile
     *  --------------------------------- */
@@ -988,8 +1038,8 @@ export class MinglarService {
      const am = host.accountManager;

      if (am?.profileImage) {
-        const key = am.profileImage.startsWith("http")
-          ? am.profileImage.split(".com/")[1]
+        const key = am.profileImage.startsWith('http')
+          ? am.profileImage.split('.com/')[1]
          : am.profileImage;

        am.profileImage = await getPresignedUrl(bucket, key);
@@ -1112,7 +1162,6 @@ export class MinglarService {
      take: paginationOptions?.limit ?? 10,
    });

-
    /** ---------------------------------
     *  Add presigned URL for AM profile
     *  --------------------------------- */
@@ -1138,13 +1187,15 @@ export class MinglarService {
    // Build search filter if search term is provided
    const searchFilter = search
      ? {
-        OR: [
-          { email: { contains: search, mode: 'insensitive' as const } },
-          { firstName: { contains: search, mode: 'insensitive' as const } },
-          { lastName: { contains: search, mode: 'insensitive' as const } },
-          { userRefNumber: { contains: search, mode: 'insensitive' as const } },
-        ],
-      }
+          OR: [
+            { email: { contains: search, mode: 'insensitive' as const } },
+            { firstName: { contains: search, mode: 'insensitive' as const } },
+            { lastName: { contains: search, mode: 'insensitive' as const } },
+            {
+              userRefNumber: { contains: search, mode: 'insensitive' as const },
+            },
+          ],
+        }
      : {};

    // 1. Fetch all required users (Admin, Co-Admin, AM)
@@ -1400,6 +1451,37 @@ export class MinglarService {
    return true;
  }

+  async addActivtiySuggestion(
+    title: string,
+    comments: string,
+    activity_xid: number,
+    reviewedByXid: number,
+  ) {
+    // Check if host exists
+    const ActivityHeader = await this.prisma.activities.findUnique({
+      where: { id: activity_xid, isActive: true },
+      select: { id: true },
+    });
+
+    if (!ActivityHeader) {
+      throw new ApiError(404, 'Host not found');
+    }
+
+    await this.prisma.activitySuggestions.create({
+      data: {
+        title: title,
+        comments: comments,
+        isReviewed: false,
+        reviewedOn: new Date(),
+        isActive: true,
+        activityXid: activity_xid,
+        reviewedByXid: reviewedByXid,
+      },
+    });
+
+    return true;
+  }
+
  async getHostSuggestions(userId: number) {
    const hostDetail = await this.prisma.hostHeader.findFirst({
      where: { userXid: userId, isActive: true },
@@ -1423,6 +1505,24 @@ export class MinglarService {
    return suggestions;
  }

+  async getHostSuggestionsForActivity(actvityXid: number) {
+    const suggestions = await this.prisma.activitySuggestions.findMany({
+      where: { activityXid: actvityXid, isReviewed: false, isActive: true },
+      select: {
+        id: true,
+        title: true,
+        comments: true,
+        isReviewed: true,
+        reviewedOn: true,
+      },
+      orderBy: {
+        id: 'asc',
+      },
+    });
+
+    return suggestions;
+  }
+
  async getSuggestionsForAM(hostXid: number) {
    const suggestions = await this.prisma.hostSuggestion.findMany({
      where: { hostXid: hostXid, isreviewed: false, isActive: true },
@@ -1480,7 +1580,8 @@ export class MinglarService {
    amountPerBooking: number,
    durationFrequency: string,
    payoutDurationNum: number,
-    payoutDurationFrequency: string,) {
+    payoutDurationFrequency: string,
+  ) {
    return await this.prisma.$transaction(async (tx) => {
      await this.prisma.hostHeader.update({
        where: {
@@ -1531,6 +1632,7 @@ export class MinglarService {
          hostStatusDisplay: HOST_STATUS_DISPLAY.UNDER_REVIEW,
        },
        data: {
+          stepper: STEPPER.NOT_SUBMITTED,
          hostStatusInternal: HOST_STATUS_INTERNAL.REJECTED,
          hostStatusDisplay: HOST_STATUS_DISPLAY.REJECTED,
          adminStatusInternal: MINGLAR_STATUS_INTERNAL.ADMIN_REJECTED,
@@ -1547,12 +1649,12 @@ export class MinglarService {
        },
      });

-      await tx.user.update({
-        where: { id: hostDetails.userXid },
-        data: {
-          userStatus: USER_STATUS.REJECTED,
-        },
-      });
+      // await tx.user.update({
+      //   where: { id: hostDetails.userXid },
+      //   data: {
+      //     userStatus: USER_STATUS.REJECTED,
+      //   },
+      // });
    });
  }

@@ -1623,48 +1725,46 @@ export class MinglarService {
            country: {
              select: {
                id: true,
-                countryName: true
-              }
+                countryName: true,
+              },
            },
            cities: {
              select: {
                id: true,
                cityName: true,
-              }
+              },
            },
            states: {
              select: {
                id: true,
-                stateName: true
-              }
-            }
-          }
+                stateName: true,
+              },
+            },
+          },
        },
        userDocuments: {
          select: {
            id: true,
            fileName: true,
-          }
+          },
        },
        userRevenues: {
          select: {
            id: true,
            is_fixed_salary: true,
-            per_value: true
-          }
+            per_value: true,
+          },
        },
      },
    });

-
    if (user.userDocuments?.length) {
      for (const media of user.userDocuments) {
-
        if (!media.fileName) continue;

        // Extract S3 key if URL or keep raw key
-        const key = media.fileName.startsWith("http")
-          ? media.fileName.split(".com/")[1]
+        const key = media.fileName.startsWith('http')
+          ? media.fileName.split('.com/')[1]
          : media.fileName;

        media.fileName = await getPresignedUrl(bucket, key);
@@ -1684,7 +1784,7 @@ export class MinglarService {
  async getBasicUserDetails(user_xid) {
    return await this.prisma.user.findFirst({
      where: {
-        id: user_xid
+        id: user_xid,
      },
      select: {
        id: true,
@@ -1695,8 +1795,8 @@ export class MinglarService {
        isProfileUpdated: true,
        roleXid: true,
        role: true,
-      }
-    })
+      },
+    });
  }

  async rejectPQQbyAM(activityId: number, user_xid: number) {
@@ -1704,12 +1804,41 @@ export class MinglarService {
      await tx.activities.update({
        where: {
          id: activityId,
-          isActive: true
+          isActive: true,
        },
        data: {
          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.PQ_TO_UPDATE,
          activityDisplayStatus: ACTIVITY_DISPLAY_STATUS.ENHANCING,
          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.PQ_REJECTED,
+          amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.ENHANCING,
+        },
+      });
+
+      await tx.activityTrack.create({
+        data: {
+          activityXid: activityId,
+          trackType: ACTIVITY_TRACK_TYPE.PQ,
+          trackStatus: ACTIVITY_TRACK_STATUS.REJECTED_BY_AM,
+          updatedByXid: user_xid,
+          updatedByRole: ROLE_NAME.ACCOUNT_MANAGER,
+          updatedOn: new Date(),
+        },
+      });
+    });
+  }
+  
+  
+  async rejectActivityApplicationByAM(activityId: number, user_xid: number) {
+    return await this.prisma.$transaction(async (tx) => {
+      await tx.activities.update({
+        where: {
+          id: activityId,
+          isActive: true
+        },
+        data: {
+          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_REJECTED,
+          activityDisplayStatus: ACTIVITY_DISPLAY_STATUS.ENHANCING,
+          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_REJECTED,
          amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.ENHANCING
        }
      })
@@ -1717,7 +1846,7 @@ export class MinglarService {
      await tx.activityTrack.create({
        data: {
          activityXid: activityId,
-          trackType: ACTIVITY_TRACK_TYPE.PQ,
+          trackType: ACTIVITY_TRACK_TYPE.ACTIVITY,
          trackStatus: ACTIVITY_TRACK_STATUS.REJECTED_BY_AM,
          updatedByXid: user_xid,
          updatedByRole: ROLE_NAME.ACCOUNT_MANAGER,
@@ -1732,20 +1861,49 @@ export class MinglarService {
      await tx.activities.update({
        where: {
          id: activityId,
-          isActive: true
+          isActive: true,
        },
        data: {
          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.PQ_APPROVED,
          activityDisplayStatus: ACTIVITY_DISPLAY_STATUS.PQ_APPROVED,
          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.PQ_APPROVED,
-          amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.PQ_APPROVED
+          amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.PQ_APPROVED,
+        },
+      });
+
+      await tx.activityTrack.create({
+        data: {
+          activityXid: activityId,
+          trackType: ACTIVITY_TRACK_TYPE.PQ,
+          trackStatus: ACTIVITY_TRACK_STATUS.ACCEPTED_BY_AM,
+          updatedByXid: user_xid,
+          updatedByRole: ROLE_NAME.ACCOUNT_MANAGER,
+          updatedOn: new Date(),
+        },
+      });
+    });
+  }
+
+
+  async acceptActivityApplicationByAM(activityId: number, user_xid: number) {
+    return await this.prisma.$transaction(async (tx) => {
+      await tx.activities.update({
+        where: {
+          id: activityId,
+          isActive: true
+        },
+        data: {
+          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_APPROVED,
+          activityDisplayStatus: ACTIVITY_DISPLAY_STATUS.NOT_LISTED,
+          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_APPROVED,
+          amDisplayStatus: ACTIVITY_AM_DISPLAY_STATUS.NOT_LISTED
        }
      })

      await tx.activityTrack.create({
        data: {
          activityXid: activityId,
-          trackType: ACTIVITY_TRACK_TYPE.PQ,
+          trackType: ACTIVITY_TRACK_TYPE.ACTIVITY,
          trackStatus: ACTIVITY_TRACK_STATUS.ACCEPTED_BY_AM,
          updatedByXid: user_xid,
          updatedByRole: ROLE_NAME.ACCOUNT_MANAGER,
@@ -1773,26 +1931,26 @@ export class MinglarService {
                filePath: true,
                documentName: true,
                documentTypeXid: true,
-                documentType: true
-              }
+                documentType: true,
+              },
            },
            cities: {
              select: {
                id: true,
                cityName: true,
-              }
+              },
            },
            countries: {
              select: {
                id: true,
-                countryName: true
-              }
+                countryName: true,
+              },
            },
            states: {
              select: {
                id: true,
-                stateName: true
-              }
+                stateName: true,
+              },
            },
            companyTypes: {
              select: {
@@ -1800,7 +1958,7 @@ export class MinglarService {
                companyTypeName: true,
              },
            },
-          }
+          },
        },
        HostBankDetails: true,
        HostDocuments: {
@@ -1818,7 +1976,7 @@ export class MinglarService {
            profileImage: true,
            userStatus: true,
            userRefNumber: true,
-          }
+          },
        },
        HostSuggestion: true,
        HostTrack: true,
@@ -1829,9 +1987,7 @@ export class MinglarService {
      },
    });

-
    if (host.HostDocuments?.length) {
-
      for (const doc of host.HostDocuments) {
        if (doc.filePath) {
          const filePath = doc.filePath;
@@ -1855,8 +2011,8 @@ export class MinglarService {
    }

    if (host.user.profileImage) {
-      const key = host.user.profileImage.startsWith("http")
-        ? host.user.profileImage.split(".com/")[1]
+      const key = host.user.profileImage.startsWith('http')
+        ? host.user.profileImage.split('.com/')[1]
        : host.user.profileImage;

      host.user.profileImage = await getPresignedUrl(bucket, key);
@@ -1867,8 +2023,8 @@ export class MinglarService {

      // Parent company logo
      if (parent.logoPath) {
-        const key = parent.logoPath.startsWith("http")
-          ? parent.logoPath.split(".com/")[1]
+        const key = parent.logoPath.startsWith('http')
+          ? parent.logoPath.split('.com/')[1]
          : parent.logoPath;

        parent.logoPath = await getPresignedUrl(bucket, key);
@@ -1878,8 +2034,8 @@ export class MinglarService {
      if (parent.HostParenetDocuments?.length) {
        for (const doc of parent.HostParenetDocuments) {
          if (doc.filePath) {
-            const key = doc.filePath.startsWith("http")
-              ? doc.filePath.split(".com/")[1]
+            const key = doc.filePath.startsWith('http')
+              ? doc.filePath.split('.com/')[1]
              : doc.filePath;

            (doc as any).presignedUrl = await getPresignedUrl(bucket, key);
@@ -1901,6 +2057,35 @@ export class MinglarService {
        id: true,
        comments: true,
        pqqAnswerXid: true,
+        activity: {
+          select: {
+            id: true,
+            activityTitle: true,
+            activityRefNumber: true,
+            activityDisplayStatus: true,
+            activityInternalStatus: true,
+            amInternalStatus: true,
+            amDisplayStatus: true,
+            activityType: {
+              select: {
+                id: true,
+                activityTypeName: true
+              }
+            },
+            host: {
+              select: {
+                id: true,
+                companyName: true,
+                logoPath: true,
+                user: {
+                  select: {
+                    userRefNumber: true,
+                  }
+                }
+              }
+            }
+          }
+        },
        pqqQuestions: {
          select: {
            id: true,
@@ -1916,10 +2101,10 @@ export class MinglarService {
                  select: {
                    id: true,
                    categoryName: true,
-                    displayOrder: true
-                  }
-                }
-              }
+                    displayOrder: true,
+                  },
+                },
+              },
            },

            // 🔥 ALL ANSWER OPTIONS FOR THIS QUESTION
@@ -1929,31 +2114,31 @@ export class MinglarService {
                id: true,
                answerName: true,
                answerPoints: true,
-                displayOrder: true
+                displayOrder: true,
              },
-              orderBy: { displayOrder: "asc" }
-            }
-          }
+              orderBy: { displayOrder: 'asc' },
+            },
+          },
        },
        ActivityPQQSuggestions: {
-          where: { isActive: true },
+          where: { isActive: true, isReviewed: false },
          select: {
            id: true,
            title: true,
            comments: true,
-            activityPqqHeaderXid: true
-          }
+            activityPqqHeaderXid: true,
+          },
        },
        ActivityPQQSupportings: {
          where: { isActive: true },
          select: {
            id: true,
            mediaType: true,
-            mediaFileName: true
-          }
+            mediaFileName: true,
+          },
        },
      },
-      orderBy: { id: "asc" }
+      orderBy: { id: 'asc' },
    });

    // ---------- GROUPING START ----------
@@ -1970,8 +2155,17 @@ export class MinglarService {
          id: cat.id,
          categoryName: cat.categoryName,
          displayOrder: cat.displayOrder,
-          activityPqqHeaderId: item.id,
-          pqqsubCategories: []
+          hostId: item.activity.host.id,
+          hostCompanyName: item.activity.host.companyName,
+          activityTypeName: item.activity.activityType.activityTypeName,
+          hostLogoPath: item.activity.host.logoPath,
+          activityRefNumber: item.activity.activityRefNumber,
+          activityDisplayStatus: item.activity.activityDisplayStatus,
+          activityInternalStatus: item.activity.activityInternalStatus,
+          amInternalStatus: item.activity.amInternalStatus,
+          amDisplayStatus: item.activity.amDisplayStatus,
+          userRefNumber: item.activity.host.user.userRefNumber,
+          pqqsubCategories: [],
        };
      } else if (!grouped[cat.id].activityPqqHeaderId) {
        // Ensure header id is present at category level
@@ -1986,7 +2180,7 @@ export class MinglarService {
          id: sub.id,
          subCategoryName: sub.subCategoryName,
          displayOrder: sub.displayOrder,
-          questions: []
+          questions: [],
        };
        category.pqqsubCategories.push(subCat);
      }
@@ -1994,6 +2188,7 @@ export class MinglarService {
      // 3️⃣ Questions level
      subCat.questions.push({
        id: q.id,
+        activityPqqHeaderId: item.id,
        questionName: q.questionName,
        maxPoints: q.maxPoints,
        pqqAnswerXid: item.pqqAnswerXid,
@@ -2001,16 +2196,19 @@ export class MinglarService {
        displayOrder: q.displayOrder,
        allAnswerOptions: q.PQQAnswers || [],
        suggestions: item.ActivityPQQSuggestions,
-        supportings: item.ActivityPQQSupportings
+        supportings: item.ActivityPQQSupportings,
      });
    }

    // ---------- SORTING ----------
-    const sortedCategories: any = Object.values(grouped)
-      .sort((a: any, b: any) => a.displayOrder - b.displayOrder);
+    const sortedCategories: any = Object.values(grouped).sort(
+      (a: any, b: any) => a.displayOrder - b.displayOrder,
+    );

    for (const cat of sortedCategories) {
-      cat.pqqsubCategories.sort((a: any, b: any) => a.displayOrder - b.displayOrder);
+      cat.pqqsubCategories.sort(
+        (a: any, b: any) => a.displayOrder - b.displayOrder,
+      );

      for (const sub of cat.pqqsubCategories) {
        sub.questions.sort((a: any, b: any) => a.displayOrder - b.displayOrder);
@@ -2025,8 +2223,8 @@ export class MinglarService {
            for (const doc of q.supportings) {
              if (doc.mediaFileName) {
                const filePath = doc.mediaFileName;
-                const key = filePath.startsWith("http")
-                  ? filePath.split(".com/")[1]
+                const key = filePath.startsWith('http')
+                  ? filePath.split('.com/')[1]
                  : filePath;

                doc.presignedUrl = await getPresignedUrl(bucket, key);
@@ -2039,6 +2237,5 @@ export class MinglarService {

    // ---------- RETURN GROUPED STRUCTURE ----------
    return sortedCategories;
-
  }
 }
--- a/src/modules/minglaradmin/services/rejectionMailtoHost.service.ts
+++ b/src/modules/minglaradmin/services/rejectionMailtoHost.service.ts
@@ -14,6 +14,7 @@ export async function sendEmailToHostForRejectedApplication(
    const htmlContent = `
    <p>Dear Host,</p>
    <p>Sorry to say that, But your application to minglar admin has been rejected.</p>
+    <p>Please update your application and resubmit it.</p>
    <p>If you have any questions please contact to minglar admin.</p>
    <p>Best regards,<br/>Minglar Team</p>
  `;
@@ -39,7 +40,8 @@ export async function sendEmailToHostForRejectedApplication(

 export async function sendAMRejectionMailtoHost(
    emailAddress: string,
-    name: string
+    name: string,
+    link: string
 ): Promise<{
    sent: boolean;
    //  messageId: string
@@ -52,7 +54,11 @@ export async function sendAMRejectionMailtoHost(
    <p> Your account manager has reviewed your application and provided some suggestions. <br/>
    Please make the necessary improvements and re-submit your application to proceed with the onboarding process on Minglar.</p>
    <p> You may access your application using the link below:<br/> 
-    <strong>Link:</strong> ${config.HOST_LINK} </p>
+    <strong>Link:</strong>
+    <a href="${link}" target="_blank">
+      ${link}
+    </a>
+    </p>
    <p> If you have any questions, please feel free to contact the Minglar Support Team. </p>
    <p> Best regards,<br/>
    <strong>Minglar Team</strong> </p>
@@ -122,3 +128,49 @@ export async function sendAMPQQRejectionMailtoHost(
        throw new ApiError(500, "Failed to send OTP to minglar admin via email.");
    }
 }
+
+
+export async function sendActivityRejectionMailtoHost(
+    emailAddress: string,
+    name: string
+): Promise<{
+    sent: boolean;
+    //  messageId: string
+}> {
+
+    const subject = "Improvement of your activity onboarding application";
+
+    const htmlContent = `
+    <p>Dear ${name},</p>
+
+    <p>Your account manager has reviewed your activity application and provided some suggestions.<br/>
+    Please make the necessary improvements and re-submit your activity application along with the pre-qualification answers to proceed with the onboarding process on Minglar.</p>
+
+    <p>You may access your activity onboarding application using the link below:<br/>
+    <strong>Link:</strong> ${config.HOST_LINK}</p>
+
+    <p>If you have any questions, please feel free to contact the Minglar Support Team.</p>
+
+    <p>Best regards,<br/>
+    <strong>Minglar Team</strong></p>
+
+  `;
+
+    try {
+        const result = await brevoService.sendEmail({
+            recipients: [{ email: emailAddress }],
+            subject,
+            htmlContent,
+        });
+
+        console.log("📧 Email sent successfully:", result);
+
+        return {
+            sent: true,
+            // messageId: result.messageId
+        };
+    } catch (err) {
+        console.error("Brevo email send failed:", err);
+        throw new ApiError(500, "Failed to send OTP to minglar admin via email.");
+    }
+}
--- a/src/modules/prepopulate/handlers/getCityByState.ts
+++ b/src/modules/prepopulate/handlers/getCityByState.ts
@@ -27,15 +27,21 @@ export const handler = safeHandler(async (
    // 2) Authenticate user
    await verifyMinglarAdminHostToken(token);

-    // 3) Get bankXid from query params
+    // 3) Get stateXid and optional search term from query params
    const stateXid = Number(event.queryStringParameters?.stateXid);
+    const search = event.queryStringParameters?.search?.trim();

    if (!stateXid || isNaN(stateXid)) {
        throw new ApiError(400, "Valid stateXid is required in query params.");
    }

-    // 4) Fetch branches for the bank
-    const branches = await prePopulateService.getCityByStateId(stateXid);
+    // If search is provided, enforce minimum 3 characters
+    if (search && search.length < 3) {
+        throw new ApiError(400, "Search term must be at least 3 characters long.");
+    }
+
+    // 4) Fetch cities for the state (optionally filtered by search)
+    const branches = await prePopulateService.getCityByStateId(stateXid, search);

    return {
        statusCode: 200,
--- a/src/modules/prepopulate/services/prepopulate.service.ts
+++ b/src/modules/prepopulate/services/prepopulate.service.ts
@@ -1,5 +1,11 @@
+import { getPresignedUrl } from '../../../common/middlewares/aws/getPreSignedUrl';
+import config from '../../../config/config';
 import { Injectable } from '@nestjs/common';
 import { PrismaClient } from '@prisma/client';
+
+
+const bucket = config.aws.bucketName;
+
@Injectable()
 export class PrePopulateService {
  constructor(private prisma: PrismaClient) { }
@@ -33,12 +39,20 @@ export class PrePopulateService {
  }


-  async getCityByStateId(stateXid: number) {
+  async getCityByStateId(stateXid: number, search?: string) {
    return await this.prisma.cities.findMany({
      where: {
        stateXid,
        isActive: true,
-        deletedAt: null
+        deletedAt: null,
+        ...(search && search.length >= 3
+          ? {
+            cityName: {
+              contains: search,
+              mode: 'insensitive',
+            },
+          }
+          : {}),
      },
      select: {
        id: true,
@@ -147,7 +161,6 @@ export class PrePopulateService {
      foodType,
      cuisineDetails,
      vehicleType,
-      navigationMode,
      taxDetails,
      energyLevel,
      aminitiesDetails,
@@ -165,9 +178,6 @@ export class PrePopulateService {
        this.prisma.transportModes.findMany({
          where: { isActive: true },
        }),
-        this.prisma.navigationModes.findMany({
-          where: { isActive: true },
-        }),
        this.prisma.taxes.findMany({
          where: { isActive: true },
        }),
@@ -176,10 +186,12 @@ export class PrePopulateService {
        }),
        this.prisma.amenities.findMany({
          where: { isActive: true },
+          select: { id: true, amenitiesName: true, amenitiesIcon: true },
+          orderBy: { amenitiesName: 'asc' }
        }),
        this.prisma.allowedEntryTypes.findMany({
          where: { isActive: true },
-          orderBy: { allowedEntryTypeName: 'asc' }
+          orderBy: { id: 'asc' }
        }),
        this.prisma.ageRestrictions.findMany({
          where: { isActive: true },
@@ -187,11 +199,26 @@ export class PrePopulateService {
        }),
      ]);

+    if (aminitiesDetails?.length) {
+      for (const amenity of aminitiesDetails) {
+        if (amenity.amenitiesIcon) {
+
+          const filePath = amenity.amenitiesIcon;
+
+          // Extract key if full URL stored
+          const key = filePath.startsWith('http')
+            ? filePath.split('.com/')[1]
+            : filePath;
+
+          (amenity as any).presignedUrl = await getPresignedUrl(bucket, key);
+        }
+      }
+    }
+
    return {
      foodType,
      cuisineDetails,
      vehicleType,
-      navigationMode,
      taxDetails,
      energyLevel,
      aminitiesDetails,
--- a/src/modules/user/dto/addSchoolCompanyDetail.dto.ts
+++ b/src/modules/user/dto/addSchoolCompanyDetail.dto.ts
@@ -0,0 +1,13 @@
+export class AddSchoolCompanyDetailDTO {
+  schoolCompanyName: string;
+  isSchool: boolean;
+  cityXid: number;
+  userId: number;
+
+  constructor(schoolCompanyName: string, isSchool: boolean, cityXid: number, userId: number) {
+    this.schoolCompanyName = schoolCompanyName;
+    this.isSchool = isSchool;
+    this.cityXid = cityXid;
+    this.userId = userId;
+  }
+}
--- a/src/modules/user/dto/user.dto.ts
+++ b/src/modules/user/dto/user.dto.ts
@@ -0,0 +1,9 @@
+export class SetPasscodeDTO {
+  userPasscode: string;
+  confirmPasscode: string;
+
+  constructor(userPasscode: string, confirmPasscode: string) {
+    this.userPasscode = userPasscode;
+    this.confirmPasscode = confirmPasscode;
+  }
+}
--- a/src/modules/user/handlers/activities/addToBucketInterested.ts
+++ b/src/modules/user/handlers/activities/addToBucketInterested.ts
@@ -0,0 +1,74 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+        throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: { activityXid: number; isBucket: boolean; bucketTypeName: string; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { activityXid, isBucket, bucketTypeName } = body;
+
+    // Validate required fields
+    if (
+        typeof activityXid !== 'number' ||
+        typeof isBucket !== 'boolean' ||
+        !bucketTypeName
+    ) {
+        throw new ApiError(400, 'Required fields missing or invalid');
+    }
+
+
+    // Set the passcode
+    const counts = await userService.addToBucketInterested(userId, isBucket, bucketTypeName, activityXid);
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: `Activity added to ${isBucket ? 'bucket' : 'interested'} successfully`,
+            data: {
+                bucketCount: counts.bucketCount,
+                interestedCount: counts.interestedCount,
+                coverImage: counts.coverImage,
+                coverImagePresignedUrl: counts.coverImagePresignedUrl,
+            }
+        }),
+    };
+});
--- a/src/modules/user/handlers/activities/checkAvailabilityDetails.ts
+++ b/src/modules/user/handlers/activities/checkAvailabilityDetails.ts
@@ -0,0 +1,122 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { SchedulingService } from '../../../host/services/activityScheduling.service';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+const schedulingService = new SchedulingService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const activityXid = Number(event.pathParameters?.activity_xid);
+
+  if (!activityXid || isNaN(activityXid)) {
+    throw new ApiError(400, 'Valid activityXid is required');
+  }
+
+  // selected date may be passed as query param `selectedDate`
+  const selectedDate =
+    event.queryStringParameters?.selectedDate ||
+    event.queryStringParameters?.date ||
+    (event.body ? JSON.parse(event.body).selectedDate : undefined);
+
+  if (!selectedDate) {
+    throw new ApiError(400, 'selectedDate query parameter is required');
+  }
+
+  // Fetch activity details (basic) and schedule details for the selected date
+  const activityDetails = await userService.getActivityDetailsById(userId, activityXid);
+  const scheduleDetails = await schedulingService.getScheduleDetailsForDate(activityXid, selectedDate);
+  // Shape response to match UI: only include fields shown in image
+  const activity = activityDetails.activity;
+
+  // Rooms: combine ActivityVenues with their respective slots for the selected date
+  const Venues = (activity.ActivityVenues || [])
+    .map((v: any) => {
+      const header = scheduleDetails.find(
+        (h: any) => h.activityVenue?.venueXid === v.id
+      );
+
+      if (!header || !header.slots?.length) {
+        return null; // ❌ venue has no slots for selected date
+      }
+
+      const roomSlots = header.slots.map((s: any) => {
+        let status = "Available";
+
+        if (s.maxCapacity === 0) status = "Housefull";
+        else if (s.maxCapacity <= 2) status = "2 Slots Left";
+        else if (s.maxCapacity <= 5) status = "Fast Filling";
+
+        return {
+          slotId: s.slotId,
+          startTime: s.startTime,
+          endTime: s.endTime,
+          status,
+          maxCapacity: s.maxCapacity,
+        };
+      });
+
+      return {
+        venueXid: v.id,
+        venueName: v.venueName,
+        venueLabel: v.venueLabel,
+        venueCapacity: v.venueCapacity,
+        availableSeats: v.availableSeats ?? null,
+        price: v.ActivityPrices?.[0]?.sellPrice ?? null,
+        endDate: header?.endDate ?? null,
+        slots: roomSlots,
+        slotsCount: roomSlots.length,
+        venueMedia: (v.ActivityVenueArtifacts || []).map((media: any) => ({
+          id: media.id,
+          mediaType: media.mediaType,
+          mediaFileName: media.mediaFileName,
+          presignedUrl: media.presignedUrl,
+        })),
+      };
+    })
+    .filter(Boolean); // ✅ removes null venues
+
+  // derive check-in/out from all room slots (earliest start, latest end)
+  const allSlots = Venues.flatMap(r => r.slots || []);
+  const startTimes = allSlots.map(s => s.startTime).filter(Boolean);
+  const endTimes = allSlots.map(s => s.endTime).filter(Boolean);
+  const checkInTime = startTimes.length ? startTimes.sort()[0] : null;
+  const checkOutTime = endTimes.length ? endTimes.sort().reverse()[0] : null;
+
+  const responsePayload = {
+    selectedDate,
+    Venues,
+    checkInTime,
+    checkOutTime,
+  };
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({ success: true, data: responsePayload }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/filteredLandingPageAllDetails.ts
+++ b/src/modules/user/handlers/activities/filteredLandingPageAllDetails.ts
@@ -0,0 +1,74 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { FilteredLandingPageService } from '../../services/filteredLandingPage.service';
+
+const filteredLandingPageService = new FilteredLandingPageService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const page = Number(event.queryStringParameters?.page ?? 1);
+  const limit = Number(event.queryStringParameters?.limit ?? 20);
+  const countryName = event.queryStringParameters?.countryName ?? '';
+  const stateName = event.queryStringParameters?.stateName ?? '';
+  const cityName = event.queryStringParameters?.cityName ?? '';
+  const userLat = event.queryStringParameters?.userLat ?? '';
+  const userLong = event.queryStringParameters?.userLong ?? '';
+
+  let activityTypeXids: number[] | undefined;
+  if (event.queryStringParameters?.activityTypeXids) {
+    try {
+      activityTypeXids = JSON.parse(event.queryStringParameters.activityTypeXids);
+    } catch (error) {
+      // Handle invalid JSON if needed
+    }
+  }
+
+  if (page < 1 || limit < 1) {
+    throw new ApiError(400, 'Invalid pagination values');
+  }
+
+  // Fetch filtered landing page details
+  const result = await filteredLandingPageService.getFilteredLandingPageAllDetails(
+    userId,
+    page,
+    limit,
+    countryName,
+    stateName,
+    cityName,
+    userLat,
+    userLong,
+    activityTypeXids
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Filtered landing page data retrieved successfully',
+      data: result,
+    }),
+  };
+});
--- a/src/modules/user/handlers/activities/getAllBucketActivities.ts
+++ b/src/modules/user/handlers/activities/getAllBucketActivities.ts
@@ -0,0 +1,46 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  // Fetch user with their HostHeader stepper info
+  const result = await userService.getAllBucketActivities(
+    userId
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/getByIdActivityDetails.ts
+++ b/src/modules/user/handlers/activities/getByIdActivityDetails.ts
@@ -0,0 +1,53 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const activityXid = Number(event.pathParameters?.activity_xid);
+
+  if (!activityXid || isNaN(activityXid)) {
+  throw new ApiError(400, 'Valid activityXid is required');
+}
+
+  // Fetch user with their HostHeader stepper info
+  const result = await userService.getActivityDetailsById(
+    userId,
+    activityXid
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/getNearbyActivities.ts
+++ b/src/modules/user/handlers/activities/getNearbyActivities.ts
@@ -0,0 +1,71 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const latParam = event.queryStringParameters?.lat ?? event.queryStringParameters?.latitude;
+  const longParam = event.queryStringParameters?.long ?? event.queryStringParameters?.lng ?? event.queryStringParameters?.longitude;
+  const radiusParam = event.queryStringParameters?.radiusKm ?? event.queryStringParameters?.radius;
+
+  const userLat = latParam ? Number(latParam) : undefined;
+  const userLong = longParam ? Number(longParam) : undefined;
+  const radiusKm = radiusParam ? Number(radiusParam) : 15; // default 15km
+
+  if (
+    (userLat !== undefined && Number.isNaN(userLat)) ||
+    (userLong !== undefined && Number.isNaN(userLong)) ||
+    Number.isNaN(radiusKm)
+  ) {
+    throw new ApiError(400, 'Invalid lat/long values');
+  }
+
+  const page = Number(event.queryStringParameters?.page ?? 1);
+  const limit = Number(event.queryStringParameters?.limit ?? 20);
+
+  if (page < 1 || limit < 1) {
+    throw new ApiError(400, 'Invalid pagination values');
+  }
+
+  const result = await userService.getNearbyActivities(
+    userId,
+    userLat,
+    userLong,
+    radiusKm,
+    page,
+    limit,
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Nearby activities retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/getRandomActiveActivity.ts
+++ b/src/modules/user/handlers/activities/getRandomActiveActivity.ts
@@ -0,0 +1,59 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || Number.isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  // Fetch 50 random active activities
+  const result = await userService.getRandomActiveActivity();
+
+  if (!result || result.length === 0) {
+    return {
+      statusCode: 404,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: false,
+        message: 'No active activities found',
+        data: [],
+      }),
+    };
+  }
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Random active activities retrieved successfully',
+      data: result,
+      count: result.length,
+    }),
+  };
+});
--- a/src/modules/user/handlers/activities/getSpecificSearchApi.ts
+++ b/src/modules/user/handlers/activities/getSpecificSearchApi.ts
@@ -0,0 +1,49 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  // Extract query parameters for search
+  const activityType = event.queryStringParameters?.activityType?.trim();
+
+  // Fetch activities based on search criteria
+  const result = await userService.searchActivities(
+    activityType
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/landingPageAllDetails.ts
+++ b/src/modules/user/handlers/activities/landingPageAllDetails.ts
@@ -0,0 +1,65 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const page = Number(event.queryStringParameters?.page ?? 1);
+  const limit = Number(event.queryStringParameters?.limit ?? 20);
+  const countryName = event.queryStringParameters?.countryName ?? '';
+  const stateName = event.queryStringParameters?.stateName ?? '';
+  const cityName = event.queryStringParameters?.cityName ?? '';
+  const userLat = event.queryStringParameters?.userLat ?? '';
+  const userLong = event.queryStringParameters?.userLong ?? '';
+
+  if (page < 1 || limit < 1) {
+    throw new ApiError(400, 'Invalid pagination values');
+  }
+
+  // Fetch user with their HostHeader stepper info
+  const result = await userService.getLandingPageAllDetails(
+    userId,
+    page,
+    limit,
+    countryName,
+    stateName,
+    cityName,
+    userLat,
+    userLong
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/removeFromBucketInterested.ts
+++ b/src/modules/user/handlers/activities/removeFromBucketInterested.ts
@@ -0,0 +1,71 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+        throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: { activityXid: number; isBucket: boolean; bucketTypeName: string; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { activityXid, isBucket, bucketTypeName } = body;
+
+    // Validate required fields
+    if (
+        typeof activityXid !== 'number' ||
+        typeof isBucket !== 'boolean' ||
+        !bucketTypeName
+    ) {
+        throw new ApiError(400, 'Required fields missing or invalid');
+    }
+
+    // Remove from bucket/interested
+    const counts = await userService.removeFromBucketInterested(userId, isBucket, bucketTypeName, activityXid);
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: `Activity removed from ${isBucket ? 'bucket' : 'interested'} successfully`,
+            data: {
+                bucketCount: counts.bucketCount,
+                interestedCount: counts.interestedCount,
+            }
+        }),
+    };
+});
--- a/src/modules/user/handlers/activities/surpriseMePage.ts
+++ b/src/modules/user/handlers/activities/surpriseMePage.ts
@@ -0,0 +1,61 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const page = Number(event.queryStringParameters?.page ?? 1);
+  const limit = Number(event.queryStringParameters?.limit ?? 20);
+  const countryName = event.queryStringParameters?.countryName ?? '';
+  const stateName = event.queryStringParameters?.stateName ?? '';
+  const cityName = event.queryStringParameters?.cityName ?? '';
+
+  if (page < 1 || limit < 1) {
+    throw new ApiError(400, 'Invalid pagination values');
+  }
+
+  // Fetch user with their HostHeader stepper info
+  const result = await userService.getSurpriseMeDetails(
+    userId,
+    page,
+    limit,
+    countryName,
+    stateName,
+    cityName,
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/activities/viewMoreActivities.ts
+++ b/src/modules/user/handlers/activities/viewMoreActivities.ts
@@ -0,0 +1,53 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route.');
+  }
+
+  const userInfo = await verifyUserToken(token);
+  // const userId = Number(userInfo.id);
+
+  const interestId = Number(event.queryStringParameters?.interestId);
+  const page = Number(event.queryStringParameters?.page ?? 1);
+  const limit = Number(event.queryStringParameters?.limit ?? 20);
+
+  if (!interestId) {
+    throw new ApiError(400, 'Interest ID is required');
+  }
+
+  if (page < 1 || limit < 1) {
+    throw new ApiError(400, 'Invalid pagination values');
+  }
+
+  const result = await userService.viewMoreActivitiesByInterest(
+    interestId,
+    page,
+    limit
+  );
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Interest activities fetched successfully',
+      data: result,
+    }),
+  };
+});
--- a/src/modules/user/handlers/activities/viewMoreUpperSection.ts
+++ b/src/modules/user/handlers/activities/viewMoreUpperSection.ts
@@ -0,0 +1,56 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route.');
+    }
+
+    const userInfo = await verifyUserToken(token);
+    const userId = Number(userInfo.id);
+
+    const type = event.queryStringParameters?.type;
+    const page = Number(event.queryStringParameters?.page ?? 1);
+    const limit = Number(event.queryStringParameters?.limit ?? 20);
+    const countryName = event.queryStringParameters?.countryName;
+    const stateName = event.queryStringParameters?.stateName;
+    const cityName = event.queryStringParameters?.cityName;
+
+    if (!type) {
+        throw new ApiError(400, 'Type is required');
+    }
+
+    const result = await userService.viewMoreActivities(
+        userId,
+        type,
+        page,
+        limit,
+        countryName,
+        stateName,
+        cityName
+    );
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: `${type} activities fetched successfully`,
+            data: result,
+        }),
+    };
+});
--- a/src/modules/user/handlers/authentication/SetLocationofUser.ts
+++ b/src/modules/user/handlers/authentication/SetLocationofUser.ts
@@ -0,0 +1,92 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(
+        400,
+        'This is a protected route. Please provide a valid token.',
+      );
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+      throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+      throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: {
+      countryName?: string;
+      stateName?: string;
+      cityName?: string;
+      pinCode?: string;
+      latitude?: number;
+      longitude?: number;
+      locationName?: string;
+      locationAddress?: string;
+    };
+
+    try {
+      body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+      throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { countryName, stateName, cityName, pinCode, latitude, longitude, locationName, locationAddress } = body;
+
+    // Validate required fields
+    if (!countryName || !stateName || !cityName) {
+      throw new ApiError(400, 'Country name, state name, and city name are required');
+    }
+
+    // Set the location details
+    await userService.setUserLocationDetails(
+      userId,
+      countryName,
+      stateName,
+      cityName,
+      pinCode,
+      latitude,
+      longitude,
+      locationName,
+      locationAddress,
+    );
+
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: 'Location details set successfully',
+      }),
+    };
+  },
+);
--- a/src/modules/user/handlers/authentication/SetuserInterest.ts
+++ b/src/modules/user/handlers/authentication/SetuserInterest.ts
@@ -0,0 +1,64 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+        throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: { interest_Xid?: number[]; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { interest_Xid } = body;
+
+    // Validate required fields
+    if (!interest_Xid || !Array.isArray(interest_Xid)) {
+        throw new ApiError(400, 'interest_Xid must be a non-empty array of numbers');
+    }
+
+
+    // Set the interests
+    await userService.setUserInterests(userId, interest_Xid);
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Interests set successfully',
+        }),
+    };
+});
--- a/src/modules/user/handlers/authentication/generateRefereshToAccess.ts
+++ b/src/modules/user/handlers/authentication/generateRefereshToAccess.ts
@@ -0,0 +1,95 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { JwtPayload } from 'jsonwebtoken';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { TokenService } from '../../../host/services/token.service';
+
+const tokenService = new TokenService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Parse request body
+    let body: { refreshToken?: string };
+
+    try {
+      body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+      throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { refreshToken } = body;
+
+    if (!refreshToken) {
+      throw new ApiError(400, 'Refresh token is required');
+    }
+
+    // Verify refresh token
+    const decodedToken = await tokenService.verifyRefreshToken(refreshToken);
+
+    if (!decodedToken || typeof decodedToken === 'string') {
+      throw new ApiError(401, 'Invalid or expired refresh token');
+    }
+
+    const payload = decodedToken as JwtPayload;
+
+    if (payload.type !== 'refresh') {
+      throw new ApiError(401, 'Token is not a refresh token');
+    }
+
+    const userId = payload.sub;
+
+    if (!userId) {
+      throw new ApiError(401, 'Invalid token payload');
+    }
+
+    // Check if user exists
+    const user = await prismaClient.user.findUnique({
+      where: { id: parseInt(userId, 10) },
+      select: { id: true, isActive: true },
+    });
+
+    if (!user || !user.isActive) {
+      throw new ApiError(401, 'User not found or inactive');
+    }
+
+    // Check if refresh token exists in database and is not blacklisted
+    const tokenRecord = await prismaClient.token.findFirst({
+      where: {
+        token: refreshToken,
+        userXid: parseInt(userId, 10),
+        tokenType: 'refresh',
+        isBlackListed: false,
+      },
+    });
+
+    if (!tokenRecord) {
+      throw new ApiError(401, 'Refresh token is invalid or blacklisted');
+    }
+
+    // Generate new access token
+    const newAccessToken = await tokenService.generateAuthToken(Number(userId));
+
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: 'Access token generated successfully',
+        accessToken: newAccessToken.access.token,
+        accessTokenExpires: newAccessToken.access.expires,
+        data: null,
+      }),
+    };
+  },
+);
--- a/src/modules/user/handlers/authentication/registration.ts
+++ b/src/modules/user/handlers/authentication/registration.ts
@@ -0,0 +1,165 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import * as bcrypt from 'bcryptjs';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { ROLE, USER_STATUS } from '../../../../common/utils/constants/common.constant';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { encryptUserId } from '../../../../common/utils/helper/CodeGenerator';
+import { OtpGeneratorSixDigit } from '../../../../common/utils/helper/OtpGenerator';
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Parse request body
+    let body: { mobileNumber?: string };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { mobileNumber } = body;
+
+    if (!mobileNumber || !/^\d{10,15}$/.test(mobileNumber)) {
+        throw new ApiError(400, 'Mobile number is required');
+    }
+
+    // Use a single transaction for user creation/lookup and OTP storage
+    const transactionResult = await prismaClient.$transaction(async (tx) => {
+        const user = await tx.user.findFirst({
+            where: { mobileNumber: mobileNumber, isActive: true, userStatus: USER_STATUS.ACTIVE },
+            select: { id: true, userPasscode: true, mobileNumber: true },
+        });
+
+        let newUserLocal;
+        let isNewUser = false;
+
+
+        if (user && !user.userPasscode) {
+            // reuse existing invited user record
+            newUserLocal = user;
+        } else if (user) {
+            // Fully registered user already exists
+            newUserLocal = user;
+        }
+        else {
+            // create new user record within the transaction
+            newUserLocal = await tx.user.create({
+                data: {
+                    mobileNumber: mobileNumber,
+                    role: {
+                        connect: {
+                            id: ROLE.USER, // 👈 Role ID
+                        },
+                    },
+                    userStatus: USER_STATUS.ACTIVE
+                }, 
+            });
+
+            const referenceNumber = `USR-${String(newUserLocal.id).padStart(6, '0')}`;
+
+            await tx.user.update({
+                where: { id: newUserLocal.id },
+                data: { userRefNumber: referenceNumber }
+            });
+
+            await tx.activitySorting.createMany({
+                data: [
+                    {
+                        userXid: newUserLocal.id,
+                        activitySortXid: 1, // Default sorting (e.g., "Rating")
+                        sortOrder: 'desc', // Default order
+                        filterValue: 'rating', // Default filter
+                        displayOrder: 1, // First in the list
+                        isActive: true
+                    },
+                    {
+                        userXid: newUserLocal.id,
+                        activitySortXid: 2, // e.g., "Price"
+                        sortOrder: 'asc',
+                        filterValue: 'price',
+                        displayOrder: 2,
+                        isActive: true
+                    },
+                    {
+                        userXid: newUserLocal.id,
+                        activitySortXid: 3, // e.g., "Distance"
+                        sortOrder: 'desc',
+                        filterValue: 'sustainability',
+                        displayOrder: 3,
+                        isActive: true
+                    },
+                    {
+                        userXid: newUserLocal.id,
+                        activitySortXid: 4, // e.g., "Distance"
+                        sortOrder: 'asc',
+                        filterValue: 'nearbyradius',
+                        displayOrder: 4,
+                        isActive: true
+                    },
+                    {
+                        userXid: newUserLocal.id,
+                        activitySortXid: 5, // e.g., "Distance"
+                        sortOrder: 'asc',
+                        filterValue: 'quality',
+                        displayOrder: 5,
+                        isActive: true
+                    },
+
+                ],
+                skipDuplicates: true
+            });
+
+            isNewUser = true;
+        }
+
+        // Generate OTP (6-digit) and store within the same transaction
+        const otp = OtpGeneratorSixDigit.generateOtp();
+        const hashedOtp = await bcrypt.hash(otp, 10);
+        const expiry = new Date(Date.now() + 5 * 60 * 1000); // 5 minutes
+
+        // delete old active OTPs for this user/purpose
+        await tx.userOtp.deleteMany({
+            where: { userXid: Number(newUserLocal.id), otpType: 'Register', isActive: true },
+        });
+
+        await tx.userOtp.create({
+            data: {
+                userXid: Number(newUserLocal.id),
+                otpType: 'Register',
+                otpCode: hashedOtp,
+                expiresOn: expiry,
+                isVerified: false,
+                isActive: true,
+            },
+        });
+
+        const encryptedId = encryptUserId(String(newUserLocal.id));
+
+        return { newUser: newUserLocal, otp, encryptedId, isNewUser };
+    });
+
+    if (!transactionResult || !transactionResult.otp) {
+        throw new ApiError(500, 'Failed to generate OTP');
+    }
+
+    // Send OTP email outside the DB transaction
+    //   await sendOtpEmailForHost(transactionResult.newUser.emailAddress, transactionResult.otp);
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'OTP sent successfully.',
+            data: {
+                isNewUser: transactionResult.isNewUser,
+            },
+        }),
+    };
+});
--- a/src/modules/user/handlers/authentication/setPasscodeForMobile.ts
+++ b/src/modules/user/handlers/authentication/setPasscodeForMobile.ts
@@ -0,0 +1,64 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+        throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: { userPasscode?: string; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { userPasscode } = body;
+
+    // Validate required fields
+    if (!userPasscode) {
+        throw new ApiError(400, 'userPasscode is required');
+    }
+
+
+    // Set the passcode
+    await userService.setUserPasscode(userId, userPasscode);
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Passcode set successfully',
+        }),
+    };
+});
--- a/src/modules/user/handlers/authentication/submitPersonalInfo.ts
+++ b/src/modules/user/handlers/authentication/submitPersonalInfo.ts
@@ -0,0 +1,73 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { userPersonalInfoSchema } from '../../../../common/utils/validation/user/addPersonalInfo.validation';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using the shared authForHost function
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    const user = await userService.getUserById(userId);
+    if (!user) {
+        throw new ApiError(404, 'User not found');
+    }
+
+    // Parse request body
+    let body: { firstName?: string; lastName?: string; genderName: string; dateOfBirth?: string; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    // ✅ Validate payload using Zod
+    const validationResult = userPersonalInfoSchema.safeParse({
+        ...(body as object),
+    });
+
+    if (!validationResult.success) {
+        const errorMessages = validationResult.error.issues.map(e => e.message).join(', ');
+        throw new ApiError(400, `Validation failed: ${errorMessages}`);
+    }
+
+    const validatedData = validationResult.data;
+
+    await userService.addPersonalInfo(userId, {
+        ...validatedData
+    });
+
+    const interests = await userService.getAllInterestDetails();
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Personal Info added successfully',
+            data: interests
+        }),
+    };
+});
--- a/src/modules/user/handlers/authentication/verifyOtpForUser.ts
+++ b/src/modules/user/handlers/authentication/verifyOtpForUser.ts
@@ -0,0 +1,51 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { UserService } from '../../services/user.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { TokenService } from '../../../host/services/token.service';
+
+const userService = new UserService(prismaClient);
+const tokenService = new TokenService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Parse request body
+    let body: { mobileNumber?: string; otp?: string };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { mobileNumber, otp } = body;
+
+    if (!mobileNumber || !otp) {
+        throw new ApiError(400, 'Mobile number and OTP are required');
+    }
+
+    await userService.verifyHostOtp(mobileNumber, otp);
+    const user = await userService.getUserByMobileNumber(mobileNumber);
+    const generateTokenForUser = await tokenService.generateAuthToken(
+        user.id
+    );
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'OTP verified successfully',
+            accessToken: generateTokenForUser.access.token,
+            refreshToken: generateTokenForUser.refresh.token,
+            data: null,
+        }),
+    };
+});
+
--- a/src/modules/user/handlers/authentication/verifyPasscode.ts
+++ b/src/modules/user/handlers/authentication/verifyPasscode.ts
@@ -0,0 +1,62 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+    context?: Context
+): Promise<APIGatewayProxyResult> => {
+    // Extract token from headers
+    const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+        throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+    }
+
+    // Authenticate user using verifyUserToken
+    const userInfo = await verifyUserToken(token);
+    const userId = userInfo.id;
+
+    if (Number.isNaN(userId)) {
+        throw new ApiError(400, 'User id must be a number');
+    }
+
+    // Parse request body
+    let body: { passcode?: string; };
+
+    try {
+        body = event.body ? JSON.parse(event.body) : {};
+    } catch (error) {
+        throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { passcode } = body;
+
+    // Validate required fields
+    if (!passcode) {
+        throw new ApiError(400, 'passcode is required');
+    }
+
+    // Verify the passcode
+    const isValid = await userService.verifyUserPasscode(userId, passcode);
+
+    if (!isValid) {
+        throw new ApiError(400, 'Invalid passcode');
+    }
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            message: 'Passcode verified successfully',
+        }),
+    };
+});
--- a/src/modules/user/handlers/connections/addSchoolCompanyDetail.ts
+++ b/src/modules/user/handlers/connections/addSchoolCompanyDetail.ts
@@ -0,0 +1,108 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { AddSchoolCompanyDetailDTO } from '../../dto/addSchoolCompanyDetail.dto';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Extract and verify token
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(
+        400,
+        'This is a protected route. Please provide a valid token.',
+      );
+    }
+
+    // Verify token and get user info
+    const userInfo = await verifyUserToken(token);
+    const userId = Number(userInfo.id);
+
+    if (!userId || isNaN(userId)) {
+      throw new ApiError(400, 'Invalid user ID');
+    }
+
+    // Extract body parameters
+    let body;
+    try {
+      body = JSON.parse(event.body || '{}');
+    } catch (error) {
+      throw new ApiError(400, 'Invalid JSON in request body');
+    }
+
+    const { schoolCompanyName, isSchool, cityXid } = body;
+
+    // Validate required inputs
+    if (!schoolCompanyName || schoolCompanyName.trim().length === 0) {
+      throw new ApiError(400, 'schoolCompanyName is required');
+    }
+
+    if (schoolCompanyName.trim().length < 2) {
+      throw new ApiError(
+        400,
+        'schoolCompanyName must be at least 2 characters long',
+      );
+    }
+
+    if (isSchool === undefined || isSchool === null) {
+      throw new ApiError(
+        400,
+        'isSchool is required and must be a boolean value',
+      );
+    }
+
+    if (typeof isSchool !== 'boolean') {
+      throw new ApiError(
+        400,
+        'isSchool must be a boolean value (true or false)',
+      );
+    }
+
+    if (!cityXid || typeof cityXid !== 'number') {
+      throw new ApiError(400, 'cityXid is required and must be a number');
+    }
+
+    const recordCount = await userService.getConnectionCountOfUser(userId);
+
+    if(recordCount >= 10) {
+      throw new ApiError(400, 'You have reached the maximum number of connections (10). Please remove an existing connection before adding a new one.');
+    }
+
+    // Create DTO
+    const dto = new AddSchoolCompanyDetailDTO(
+      schoolCompanyName.trim().toLowerCase(),
+      isSchool,
+      cityXid,
+      userId
+    );
+
+    // Call service to add or find school/company
+    const result = await userService.addOrFindSchoolCompanyDetail(dto);
+
+    return {
+      statusCode: 201,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: 'Connection added successfully',
+        data: null,
+      }),
+    };
+  },
+);
--- a/src/modules/user/handlers/connections/getActivityFromConnectionsInterest.ts
+++ b/src/modules/user/handlers/connections/getActivityFromConnectionsInterest.ts
@@ -0,0 +1,69 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+    event: APIGatewayProxyEvent,
+): Promise<APIGatewayProxyResult> => {
+
+    const token =
+        event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+
+    if (!token) {
+        throw new ApiError(400, 'Token is required');
+    }
+
+    const userInfo = await verifyUserToken(token);
+    const userId = Number(userInfo.id);
+
+    if (!userId) {
+        throw new ApiError(400, 'Invalid user');
+    }
+
+    const page = Number(event.queryStringParameters?.page ?? 1);
+    const limit = Number(event.queryStringParameters?.limit ?? 20);
+    const countryName = event.queryStringParameters?.countryName ?? '';
+    const stateName = event.queryStringParameters?.stateName ?? '';
+    const cityName = event.queryStringParameters?.cityName ?? '';
+    const schoolCompanyXidsParam = event.queryStringParameters?.schoolCompanyXids;
+
+    if (!schoolCompanyXidsParam) {
+        throw new ApiError(400, 'schoolCompanyXids is required');
+    }
+
+    const schoolCompanyXids = schoolCompanyXidsParam
+        .split(',')
+        .map(id => Number(id))
+        .filter(id => !isNaN(id));
+
+    if (!schoolCompanyXids.length) {
+        throw new ApiError(400, 'Invalid schoolCompanyXids');
+    }
+
+    const result = await userService.getAllActivitiesFromConnectionsUserInterests(
+        userId,
+        schoolCompanyXids,
+        page,
+        limit,
+        countryName,
+        stateName,
+        cityName,
+    );
+
+    return {
+        statusCode: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+            success: true,
+            data: result,
+        }),
+    };
+});
--- a/src/modules/user/handlers/connections/getAllConnectionDetailsOfUser.ts
+++ b/src/modules/user/handlers/connections/getAllConnectionDetailsOfUser.ts
@@ -0,0 +1,44 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context
+): Promise<APIGatewayProxyResult> => {
+  // Extract token from headers
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
+  }
+
+  // Verify token and get user info
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  // Fetch user with their HostHeader stepper info
+  const result = await userService.getAllConnectionDetailsOfUser(userId);
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Data retrieved successfully',
+      data: result,
+    }),
+  };
+});
+
--- a/src/modules/user/handlers/connections/getSchoolCompanyName.ts
+++ b/src/modules/user/handlers/connections/getSchoolCompanyName.ts
@@ -0,0 +1,102 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Extract and verify token
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(
+        400,
+        'This is a protected route. Please provide a valid token.',
+      );
+    }
+
+    // Verify token and get user info
+    const userInfo = await verifyUserToken(token);
+    const userId = Number(userInfo.id);
+
+    if (!userId || isNaN(userId)) {
+      throw new ApiError(400, 'Invalid user ID');
+    }
+
+    // Extract query parameters
+    const searchQuery = event.queryStringParameters?.searchQuery?.trim();
+    const isSchool = event.queryStringParameters?.isSchool?.toLowerCase();
+
+    // Validate inputs
+    if (!searchQuery || searchQuery.length === 0) {
+      throw new ApiError(400, 'Search query is required');
+    }
+
+    if (searchQuery.length < 2) {
+      throw new ApiError(
+        400,
+        'Search query must be at least 2 characters long',
+      );
+    }
+
+    // Validate isSchool parameter
+    if (!isSchool || !['true', 'false'].includes(isSchool)) {
+      throw new ApiError(
+        400,
+        'isSchool parameter must be either "true" (for schools) or "false" (for companies)',
+      );
+    }
+
+    // Convert isSchool to boolean
+    const filterBySchool = isSchool === 'true';
+
+    // Call service to search
+    const results = await userService.searchSchoolsAndCompanies(
+      searchQuery,
+      filterBySchool,
+    );
+
+    // Check if any results found
+    if (results.length === 0) {
+      const type = filterBySchool ? 'school' : 'company';
+      return {
+        statusCode: 200,
+        headers: {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+          success: true,
+          message: `No ${type}s found matching your search`,
+          data: [],
+          count: 0,
+        }),
+      };
+    }
+
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: `${filterBySchool ? 'Schools' : 'Companies'} found successfully`,
+        data: results,
+        count: results.length,
+      }),
+    };
+  },
+);
--- a/src/modules/user/handlers/connections/removeConnectionDetails.ts
+++ b/src/modules/user/handlers/connections/removeConnectionDetails.ts
@@ -0,0 +1,68 @@
+import {
+    APIGatewayProxyEvent,
+    APIGatewayProxyResult,
+    Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { AddSchoolCompanyDetailDTO } from '../../dto/addSchoolCompanyDetail.dto';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(
+    async (
+        event: APIGatewayProxyEvent,
+        context?: Context,
+    ): Promise<APIGatewayProxyResult> => {
+        // Extract and verify token
+        const token =
+            event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+        if (!token) {
+            throw new ApiError(
+                400,
+                'This is a protected route. Please provide a valid token.',
+            );
+        }
+
+        // Verify token and get user info
+        const userInfo = await verifyUserToken(token);
+        const userId = Number(userInfo.id);
+
+        if (!userId || isNaN(userId)) {
+            throw new ApiError(400, 'Invalid user ID');
+        }
+
+        // Extract body parameters
+        let body;
+        try {
+            body = JSON.parse(event.body || '{}');
+        } catch (error) {
+            throw new ApiError(400, 'Invalid JSON in request body');
+        }
+
+        const { connectDetailsXid } = body;
+
+        if (!connectDetailsXid) {
+            throw new ApiError(400, 'connectDetailsXid is required');
+        }
+
+        // Call service to add or find school/company
+        const result = await userService.deleteConnectDetails(userId, Number(connectDetailsXid));
+
+        return {
+            statusCode: 200,
+            headers: {
+                'Content-Type': 'application/json',
+                'Access-Control-Allow-Origin': '*',
+            },
+            body: JSON.stringify({
+                success: true,
+                message: 'Connection details removed successfully',
+                data: null,
+            }),
+        };
+    },
+);
--- a/src/modules/user/handlers/connections/searchCities.ts
+++ b/src/modules/user/handlers/connections/searchCities.ts
@@ -0,0 +1,86 @@
+import {
+  APIGatewayProxyEvent,
+  APIGatewayProxyResult,
+  Context,
+} from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { UserService } from '../../services/user.service';
+
+const userService = new UserService(prismaClient);
+
+export const handler = safeHandler(
+  async (
+    event: APIGatewayProxyEvent,
+    context?: Context,
+  ): Promise<APIGatewayProxyResult> => {
+    // Extract and verify token
+    const token =
+      event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+    if (!token) {
+      throw new ApiError(
+        400,
+        'This is a protected route. Please provide a valid token.',
+      );
+    }
+
+    // Verify token and get user info
+    const userInfo = await verifyUserToken(token);
+    const userId = Number(userInfo.id);
+
+    if (!userId || Number.isNaN(userId)) {
+      throw new ApiError(400, 'Invalid user ID');
+    }
+
+    // Extract query parameters
+    const searchQuery = event.queryStringParameters?.searchQuery?.trim();
+
+    // Validate inputs
+    if (!searchQuery || searchQuery.length === 0) {
+      throw new ApiError(400, 'Search query is required');
+    }
+
+    if (searchQuery.length < 2) {
+      throw new ApiError(
+        400,
+        'Search query must be at least 2 characters long',
+      );
+    }
+
+    // Call service to search cities
+    const results = await userService.searchCities(searchQuery);
+
+    // Check if any results found
+    if (results.length === 0) {
+      return {
+        statusCode: 200,
+        headers: {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*',
+        },
+        body: JSON.stringify({
+          success: true,
+          message: 'No cities found matching your search',
+          data: [],
+          count: 0,
+        }),
+      };
+    }
+
+    return {
+      statusCode: 200,
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+      },
+      body: JSON.stringify({
+        success: true,
+        message: 'Cities found successfully',
+        data: results, // already capped at 50 in DB query
+        count: results.length,
+      }),
+    };
+  },
+);
--- a/src/modules/user/handlers/itinerary/getUserItineraryDetails.ts
+++ b/src/modules/user/handlers/itinerary/getUserItineraryDetails.ts
@@ -0,0 +1,43 @@
+import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../../common/database/prisma.lambda.service';
+import { verifyUserToken } from '../../../../common/middlewares/jwt/authForUser';
+import { safeHandler } from '../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../common/utils/helper/ApiError';
+import { ItineraryService } from '../../services/itinerary.service';
+
+const itineraryService = new ItineraryService(prismaClient);
+
+export const handler = safeHandler(async (
+  event: APIGatewayProxyEvent,
+  context?: Context,
+): Promise<APIGatewayProxyResult> => {
+  const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+  if (!token) {
+    throw new ApiError(
+      400,
+      'This is a protected route. Please provide a valid token.',
+    );
+  }
+
+  const userInfo = await verifyUserToken(token);
+  const userId = Number(userInfo.id);
+
+  if (!userId || isNaN(userId)) {
+    throw new ApiError(400, 'Invalid user ID');
+  }
+
+  const result = await itineraryService.getUserItineraryDetails(userId);
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Itinerary details retrieved successfully',
+      data: result,
+    }),
+  };
+});
--- a/src/modules/user/services/filteredLandingPage.service.ts
+++ b/src/modules/user/services/filteredLandingPage.service.ts
@@ -0,0 +1,938 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaClient } from '@prisma/client';
+import { getPresignedUrl } from '../../../common/middlewares/aws/getPreSignedUrl';
+import {
+  ACTIVITY_AM_INTERNAL_STATUS,
+  ACTIVITY_INTERNAL_STATUS,
+} from '../../../common/utils/constants/host.constant';
+import config from '../../../config/config';
+
+const bucket = config.aws.bucketName;
+
+const attachPresignedUrl = async (file: string | null | undefined) => {
+  if (!file) return null;
+
+  const key = file.startsWith('http')
+    ? new URL(file).pathname.replace(/^\/+/, '')
+    : file;
+
+  return getPresignedUrl(bucket, key);
+};
+
+const attachMediaWithPresignedUrl = async (mediaArr: any[] = []) => {
+  return Promise.all(
+    mediaArr.map(async (m) => ({
+      ...m,
+      presignedUrl: await attachPresignedUrl(m.mediaFileName),
+    })),
+  );
+};
+
+@Injectable()
+export class FilteredLandingPageService {
+  constructor(private readonly prisma: PrismaClient) { }
+
+  normalizeName = (name: string): string => {
+    return name
+      .toLowerCase()
+      .replace(/[^a-z0-9\s]/g, '')
+      .replace(/\s+/g, ' ')
+      .trim();
+  };
+
+  findOrCreateLocation = async (
+    countryName: string,
+    stateName: string,
+    cityName: string,
+    tx: any,
+  ) => {
+    const normalizedCountry = this.normalizeName(countryName);
+    const normalizedState = this.normalizeName(stateName);
+    const normalizedCity = this.normalizeName(cityName);
+
+    let country = await tx.countries.findFirst({
+      where: {
+        countryName: { contains: normalizedCountry, mode: 'insensitive' },
+      },
+    });
+
+    if (!country) {
+      country = await tx.countries.create({
+        data: {
+          countryName: countryName.trim(),
+          isActive: true,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      });
+    }
+
+    let state = await tx.states.findFirst({
+      where: {
+        countryXid: country.id,
+        stateName: { contains: normalizedState, mode: 'insensitive' },
+      },
+    });
+
+    if (!state) {
+      state = await tx.states.create({
+        data: {
+          countryXid: country.id,
+          stateName: stateName.trim(),
+          isActive: true,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      });
+    }
+
+    let city = await tx.cities.findFirst({
+      where: {
+        stateXid: state.id,
+        cityName: { contains: normalizedCity, mode: 'insensitive' },
+      },
+    });
+
+    if (!city) {
+      city = await tx.cities.create({
+        data: {
+          stateXid: state.id,
+          cityName: cityName.trim(),
+          isActive: true,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      });
+    }
+
+    return {
+      countryXid: country.id,
+      stateXid: state.id,
+      cityXid: city.id,
+    };
+  };
+
+  // attachMediaWithPresignedUrl = async (mediaArr = []) => {
+  //   return (
+  //     await Promise.all(
+  //       mediaArr.map(async (m) => {
+  //         return {
+  //           ...m,
+  //           presignedUrl: await this.attachPresignedUrl(m.mediaFileName),
+  //         };
+  //       }),
+  //     )
+  //   );
+  // };
+
+  calculateDistance = (
+    lat1: number | null,
+    lon1: number | null,
+    lat2: number | null,
+    lon2: number | null,
+  ) => {
+    if (!lat1 || !lon1 || !lat2 || !lon2) return null;
+
+    const R = 6371; // km
+    const dLat = ((lat2 - lat1) * Math.PI) / 180;
+    const dLon = ((lon2 - lon1) * Math.PI) / 180;
+
+    const a =
+      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+      Math.cos((lat1 * Math.PI) / 180) *
+      Math.cos((lat2 * Math.PI) / 180) *
+      Math.sin(dLon / 2) *
+      Math.sin(dLon / 2);
+
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    const distance = R * c;
+
+    // return distance rounded to 2 decimals
+    return Number(distance.toFixed(2));
+  };
+
+  async rankAndPaginateActivities(
+    tx: any,
+    whereClause: any,
+    page: number,
+    limit: number,
+    connectionInterestMap: Map<number, number>,
+  ) {
+    const skip = (page - 1) * limit;
+
+    // Get total count
+    const totalCount = await tx.activities.count({ where: whereClause });
+
+    // Fetch activities with ranking metadata
+    const activities = await tx.activities.findMany({
+      where: whereClause,
+      skip,
+      take: limit,
+      select: {
+        id: true,
+        activityTitle: true,
+        sustainabilityScore: true,
+        totalScore: true,
+        activityType: {
+          select: {
+            interestXid: true,
+            energyLevel: {
+              select: {
+                id: true,
+                energyLevelName: true,
+                energyColor: true,
+                energyIcon: true,
+              },
+            },
+          },
+        },
+        ActivitiesMedia: {
+          where: { isActive: true },
+          select: {
+            id: true,
+            mediaFileName: true,
+            mediaType: true,
+          },
+        },
+        // Fetch ranking metadata
+        ItineraryActivities: {
+          select: {
+            ActivityFeedbacks: {
+              select: { activityStars: true },
+            },
+          },
+        },
+        ActivityVenues: {
+          select: {
+            ActivityPrices: {
+              select: { sellPrice: true },
+            },
+          },
+        },
+      },
+    });
+
+    // Sort and format
+    const sortedActivities = activities
+      .map((act) => {
+        const feedbacks = act.ItineraryActivities.flatMap(
+          (ia) => ia.ActivityFeedbacks,
+        );
+        const totalStars = feedbacks.reduce(
+          (sum, f) => sum + f.activityStars,
+          0,
+        );
+        const avgRating =
+          feedbacks.length > 0 ? totalStars / feedbacks.length : 0;
+        const prices = act.ActivityVenues.flatMap((v) =>
+          v.ActivityPrices.map((p) => p.sellPrice),
+        ).filter((p) => p !== null) as number[];
+        const minPrice = prices.length > 0 ? Math.min(...prices) : Infinity;
+
+        return {
+          ...act,
+          avgRating,
+          minPrice,
+          sustainabilityScore: act.sustainabilityScore ?? 0,
+          totalScore: act.totalScore ?? 0,
+        };
+      })
+      .sort((a, b) => {
+        if (b.avgRating !== a.avgRating) return b.avgRating - a.avgRating;
+        if (a.minPrice !== b.minPrice) return a.minPrice - b.minPrice;
+        if (b.sustainabilityScore !== a.sustainabilityScore)
+          return b.sustainabilityScore - a.sustainabilityScore;
+        return b.totalScore - a.totalScore;
+      });
+
+    const formattedActivities = await Promise.all(
+      sortedActivities.map(async (activity) => ({
+        interestXid: activity.activityType.interestXid,
+        activityId: activity.id,
+        connectionInterestedCount:
+          connectionInterestMap.get(activity.id) ?? 0,
+        activityTitle: activity.activityTitle,
+        sustainabilityScore: activity.sustainabilityScore,
+        cheapestPrice: activity.minPrice === Infinity ? null : activity.minPrice,
+        distance: 0,
+        rating: activity.avgRating,
+        energyLevel: activity.activityType.energyLevel
+          ? {
+            ...activity.activityType.energyLevel,
+            presignedUrl: await attachPresignedUrl(
+              activity.activityType.energyLevel.energyIcon
+            ),
+          }
+          : null,
+        media: await attachMediaWithPresignedUrl(activity.ActivitiesMedia),
+      })),
+    );
+
+    return {
+      page,
+      limit,
+      totalCount,
+      hasMore: skip + limit < totalCount,
+      activities: formattedActivities,
+    };
+  }
+
+  async getFilteredLandingPageAllDetails(
+    userId: number,
+    page: number,
+    limit: number,
+    countryName: string,
+    stateName: string,
+    cityName: string,
+    userLat: string,
+    userLong: string,
+    activityTypeXids?: number[],
+  ) {
+    const data = await this.prisma.$transaction(async (tx) => {
+      const userAddressDetails = await tx.userAddressDetails.findFirst({
+        where: { userXid: userId, isActive: true },
+        select: {
+          id: true,
+          address1: true,
+          address2: true,
+          pinCode: true,
+          locationName: true,
+          stateXid: true,
+          cityXid: true,
+          countryXid: true,
+          locationLat: true,
+          locationLong: true,
+        },
+      });
+
+      const userLatitude = userAddressDetails?.locationLat ?? null;
+      const userLongitude = userAddressDetails?.locationLong ?? null;
+
+      let effectiveLocation: {
+        countryXid?: number | null;
+        stateXid?: number | null;
+        cityXid?: number | null;
+      } | null = null;
+
+      const hasRequestLocation = countryName && stateName && cityName;
+
+      if (hasRequestLocation) {
+        effectiveLocation = await this.findOrCreateLocation(
+          countryName!,
+          stateName!,
+          cityName!,
+          tx,
+        );
+      } else if (userAddressDetails) {
+        effectiveLocation = {
+          countryXid: userAddressDetails.countryXid,
+          stateXid: userAddressDetails.stateXid,
+          cityXid: userAddressDetails.cityXid,
+        };
+      }
+
+      const effectiveCountryXid = effectiveLocation?.countryXid ?? null;
+      const effectiveStateXid = effectiveLocation?.stateXid ?? null;
+
+      // Get all activity types for user interests, filtered by selected activity types if provided
+      const activityTypeWhere: any = {
+        isActive: true,
+      };
+
+      if (activityTypeXids && activityTypeXids.length > 0) {
+        activityTypeWhere.id = { in: activityTypeXids };
+      }
+
+      const activityTypesWithInterests = await tx.activityTypes.findMany({
+        where: activityTypeWhere,
+        select: {
+          id: true,
+          activityTypeName: true,
+          interestXid: true,
+          interests: {
+            select: {
+              id: true,
+              interestName: true,
+              interestColor: true,
+              interestImage: true,
+              displayOrder: true,
+            },
+          },
+        },
+      });
+
+      if (!activityTypesWithInterests.length) {
+        return {
+          userAddressDetails,
+          interests: [],
+          activityTypes: [],
+          otherStatesActivities: null,
+          overSeasActivities: null,
+        };
+      }
+
+      const userBucketInterested = await tx.userBucketInterested.findMany({
+        where: {
+          userXid: userId,
+          isActive: true,
+        },
+        select: {
+          activityXid: true,
+          isBucket: true,
+        },
+      });
+
+      const userBucketActivityIds = userBucketInterested
+        .filter(u => u.isBucket)
+        .map(u => u.activityXid);
+
+      const userInterestedActivityIds = userBucketInterested
+        .filter(u => !u.isBucket)
+        .map(u => u.activityXid);
+
+      const allUserExcludedActivityIds = userBucketInterested.map(
+        u => u.activityXid,
+      );
+
+      const userConnectionDetails = await tx.connectDetails.findMany({
+        where: { userXid: userId, isActive: true },
+        select: {
+          id: true,
+          schoolCompanyXid: true,
+        }
+      });
+
+      const otherConnectionUsers = await tx.connectDetails.findMany({
+        where: { userXid: { notIn: [userId] }, isActive: true, schoolCompanyXid: { in: userConnectionDetails.map((u) => u.schoolCompanyXid) } },
+        select: {
+          id: true,
+          userXid: true,
+        }
+      });
+
+      const connectionUserIds =
+        otherConnectionUsers.length > 0
+          ? otherConnectionUsers.map(u => u.userXid)
+          : [-1];
+
+      const connectionInterestByActivity = await tx.userBucketInterested.groupBy({
+        by: ['activityXid'],
+        where: {
+          userXid: { in: connectionUserIds },
+          isActive: true,
+        },
+        _count: {
+          activityXid: true,
+        },
+      });
+
+      const connectionInterestMap = new Map(
+        connectionInterestByActivity.map(item => [
+          item.activityXid,
+          item._count.activityXid,
+        ])
+      );
+
+      const skip = (page - 1) * limit;
+
+      // Group activity types by interest
+      const activityTypesByInterest = activityTypesWithInterests.reduce((acc, at) => {
+        if (!acc[at.interestXid]) {
+          acc[at.interestXid] = {
+            interest: at.interests,
+            activityTypes: [],
+          };
+        }
+        acc[at.interestXid].activityTypes.push({
+          activityTypeId: at.id,
+          activityTypeName: at.activityTypeName,
+        });
+        return acc;
+      }, {} as any);
+
+      // Fetch activities for each activity type with excluded activities filter
+      const activitiesByActivityType = await Promise.all(
+        activityTypesWithInterests.map(async (activityType) => {
+          const activities = await tx.activities.findMany({
+            where: {
+              isActive: true,
+              activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+              amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+              activityTypeXid: activityType.id,
+              id: {
+                notIn: allUserExcludedActivityIds.length
+                  ? allUserExcludedActivityIds
+                  : [-1],
+              },
+            },
+            skip,
+            take: limit,
+            orderBy: { id: 'desc' },
+            select: {
+              id: true,
+              activityTitle: true,
+              activityDurationMins: true,
+              sustainabilityScore: true,
+              checkInLat: true,
+              checkInLong: true,
+              activityType: {
+                select: {
+                  id: true,
+                  activityTypeName: true,
+                  interestXid: true,
+                  energyLevel: {
+                    select: {
+                      id: true,
+                      energyLevelName: true,
+                      energyColor: true,
+                      energyIcon: true,
+                    },
+                  },
+                },
+              },
+              ActivityVenues: {
+                select: {
+                  ActivityPrices: {
+                    select: {
+                      sellPrice: true,
+                    },
+                  },
+                },
+              },
+              ActivitiesMedia: {
+                where: { isActive: true },
+                select: {
+                  id: true,
+                  mediaFileName: true,
+                  mediaType: true,
+                },
+              },
+            },
+          });
+
+          const formattedActivities = await Promise.all(
+            activities.map(async (activity) => {
+              const cheapestPrice =
+                activity.ActivityVenues.flatMap((v) => v.ActivityPrices)
+                  .map((p) => p.sellPrice)
+                  .filter(Boolean)
+                  .sort((a, b) => a - b)[0] ?? null;
+
+              const distance = this.calculateDistance(
+                userLatitude,
+                userLongitude,
+                activity.checkInLat,
+                activity.checkInLong,
+              );
+
+              return {
+                activityId: activity.id,
+                connectionInterestedCount:
+                  connectionInterestMap.get(activity.id) ?? 0,
+                activityTitle: activity.activityTitle,
+                activityDurationMins: activity.activityDurationMins,
+                sustainabilityScore: activity.sustainabilityScore,
+                cheapestPrice,
+                distance,
+                rating: 0,
+                energyLevel: activity.activityType.energyLevel
+                  ? {
+                    ...activity.activityType.energyLevel,
+                    presignedUrl: await attachPresignedUrl(
+                      activity.activityType.energyLevel.energyIcon
+                    ),
+                  }
+                  : null,
+                media: await attachMediaWithPresignedUrl(activity.ActivitiesMedia),
+              };
+            }),
+          );
+
+          return {
+            activityTypeId: activityType.id,
+            activityTypeName: activityType.activityTypeName,
+            interestXid: activityType.interestXid,
+            activities: formattedActivities,
+            pagination: {
+              page,
+              limit,
+              hasMore: formattedActivities.length === limit,
+            },
+          };
+        }),
+      );
+
+      // Group by interests for the final structure
+      const interestsWithActivities = await Promise.all(
+        Object.values(activityTypesByInterest).map(async (interestGroup: any) => {
+          // collect all activities belonging to this interest
+          const activitiesForInterest = activitiesByActivityType
+            .filter(a => a.interestXid === interestGroup.interest.id)
+            .flatMap(a => a.activities);
+
+          return {
+            interestId: interestGroup.interest.id,
+            interestName: interestGroup.interest.interestName,
+            interestColor: interestGroup.interest.interestColor,
+            interestImage: interestGroup.interest.interestImage,
+            interestImagePresignedUrl: await attachPresignedUrl(
+              interestGroup.interest.interestImage
+            ),
+            displayOrder: interestGroup.interest.displayOrder,
+            page,
+            limit,
+            hasMore: activitiesForInterest.length === limit,
+            activities: activitiesForInterest
+          };
+        })
+      );
+
+      // Most Hyped Activities with filtering
+      const mostHypedGrouped = await tx.userBucketInterested.groupBy({
+        by: ['activityXid'],
+        where: {
+          isActive: true,
+          isBucket: false,
+          activityXid: {
+            notIn: allUserExcludedActivityIds.length ? allUserExcludedActivityIds : [-1],
+          },
+        },
+        _count: {
+          activityXid: true,
+        },
+        orderBy: {
+          _count: {
+            activityXid: 'desc',
+          },
+        },
+      });
+
+      // Filter most hyped activities by activity type if provided
+      let filteredMostHypedActivityIds = mostHypedGrouped.map((a) => a.activityXid);
+
+      if (activityTypeXids && activityTypeXids.length > 0) {
+        const activitiesWithTypes = await tx.activities.findMany({
+          where: {
+            id: { in: filteredMostHypedActivityIds },
+            activityTypeXid: { in: activityTypeXids },
+          },
+          select: { id: true },
+        });
+        filteredMostHypedActivityIds = activitiesWithTypes.map(a => a.id);
+      }
+
+      const finalMostHypedGrouped = mostHypedGrouped
+        .filter(group => filteredMostHypedActivityIds.includes(group.activityXid))
+        .slice(skip, skip + limit);
+
+      const totalHypedActivities = filteredMostHypedActivityIds.length;
+      const mostHypedActivityIds = finalMostHypedGrouped.map((a) => a.activityXid);
+
+      const mostHypedActivitiesRaw = await tx.activities.findMany({
+        where: {
+          id: {
+            in: mostHypedActivityIds,
+            notIn: allUserExcludedActivityIds.length
+              ? allUserExcludedActivityIds
+              : [-1],
+          },
+          isActive: true,
+          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+        },
+        select: {
+          id: true,
+          activityTitle: true,
+          sustainabilityScore: true,
+          totalScore: true,
+          activityType: {
+            select: {
+              energyLevel: {
+                select: {
+                  id: true,
+                  energyLevelName: true,
+                  energyColor: true,
+                  energyIcon: true,
+                },
+              },
+            },
+          },
+          ActivitiesMedia: {
+            where: { isActive: true },
+            select: {
+              id: true,
+              mediaFileName: true,
+              mediaType: true,
+            },
+          },
+          ItineraryActivities: {
+            select: {
+              ActivityFeedbacks: {
+                select: { activityStars: true },
+              },
+            },
+          },
+          ActivityVenues: {
+            select: {
+              ActivityPrices: {
+                select: { sellPrice: true },
+              },
+            },
+          },
+        },
+      });
+
+      // Sort Most Hyped by the 4 criteria
+      const mostHypedSorted = mostHypedActivitiesRaw
+        .map((act) => {
+          const feedbacks = act.ItineraryActivities.flatMap(
+            (ia) => ia.ActivityFeedbacks,
+          );
+          const totalStars = feedbacks.reduce(
+            (sum, f) => sum + f.activityStars,
+            0,
+          );
+          const avgRating =
+            feedbacks.length > 0 ? totalStars / feedbacks.length : 0;
+          const prices = act.ActivityVenues.flatMap((v) =>
+            v.ActivityPrices.map((p) => p.sellPrice),
+          ).filter((p) => p !== null) as number[];
+          const minPrice = prices.length > 0 ? Math.min(...prices) : Infinity;
+
+          return {
+            ...act,
+            avgRating,
+            minPrice,
+            sustainabilityScore: act.sustainabilityScore ?? 0,
+            totalScore: act.totalScore ?? 0,
+            hypeCount:
+              finalMostHypedGrouped.find((g) => g.activityXid === act.id)?._count
+                .activityXid ?? 0,
+          };
+        })
+        .sort((a, b) => {
+          if (b.avgRating !== a.avgRating) return b.avgRating - a.avgRating;
+          if (a.minPrice !== b.minPrice) return a.minPrice - b.minPrice;
+          if (b.sustainabilityScore !== a.sustainabilityScore)
+            return b.sustainabilityScore - a.sustainabilityScore;
+          return b.totalScore - a.totalScore;
+        });
+
+      const mostHypedActivities = await Promise.all(
+        mostHypedSorted.map(async (activity) => ({
+          activityId: activity.id,
+          activityTitle: activity.activityTitle,
+          connectionInterestedCount:
+            connectionInterestMap.get(activity.id) ?? 0,
+          hypeCount: activity.hypeCount,
+          distance: 0,
+          rating: 0,
+          energyLevel: activity.activityType.energyLevel
+            ? {
+              ...activity.activityType.energyLevel,
+              presignedUrl: await attachPresignedUrl(
+                activity.activityType.energyLevel.energyIcon
+              ),
+            }
+            : null,
+          media: await attachMediaWithPresignedUrl(activity.ActivitiesMedia),
+        })),
+      );
+
+      const formattedMostHypedActivities = {
+        page,
+        limit,
+        totalCount: totalHypedActivities,
+        hasMore: skip + limit < totalHypedActivities,
+        activities: mostHypedActivities,
+      };
+
+      // New Arrivals with filtering
+      const newArrivalsWhere: any = {
+        isActive: true,
+        activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+        amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+        id: {
+          notIn: allUserExcludedActivityIds.length
+            ? allUserExcludedActivityIds
+            : [-1],
+        },
+        createdAt: { gte: new Date(Date.now() - 31 * 24 * 60 * 60 * 1000) },
+      };
+
+      if (activityTypeXids && activityTypeXids.length > 0) {
+        newArrivalsWhere.activityTypeXid = { in: activityTypeXids };
+      }
+
+      const formattedNewArrivalsActivities = await this.rankAndPaginateActivities(
+        tx,
+        newArrivalsWhere,
+        page,
+        limit,
+        connectionInterestMap
+      );
+
+      // Other States Activities with filtering
+      const otherStatesWhere: any = {
+        isActive: true,
+        activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+        amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+        id: {
+          notIn: allUserExcludedActivityIds.length
+            ? allUserExcludedActivityIds
+            : [-1],
+        },
+      };
+
+      if (effectiveCountryXid) {
+        otherStatesWhere.checkInCountryXid = effectiveCountryXid;
+      }
+      if (effectiveStateXid) {
+        otherStatesWhere.checkInStateXid = { not: effectiveStateXid };
+      }
+      if (activityTypeXids && activityTypeXids.length > 0) {
+        otherStatesWhere.activityTypeXid = { in: activityTypeXids };
+      }
+
+      const formattedOtherStatesActivities = await this.rankAndPaginateActivities(
+        tx,
+        otherStatesWhere,
+        page,
+        limit,
+        connectionInterestMap
+      );
+
+      // Random Activities with filtering
+      const totalActiveCount = await tx.activities.count({
+        where: {
+          isActive: true,
+          activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+          amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+          deletedAt: null,
+          id: {
+            notIn: allUserExcludedActivityIds.length
+              ? allUserExcludedActivityIds
+              : [-1],
+          },
+          ...(activityTypeXids && activityTypeXids.length > 0 && {
+            activityTypeXid: { in: activityTypeXids },
+          }),
+        },
+      });
+
+      let randomActivities: any[] = [];
+
+      if (totalActiveCount > 0) {
+        const takeCount = Math.min(5, totalActiveCount);
+
+        const randomOffsets = new Set<number>();
+        while (randomOffsets.size < takeCount) {
+          randomOffsets.add(Math.floor(Math.random() * totalActiveCount));
+        }
+
+        const randomFetched = await Promise.all(
+          Array.from(randomOffsets).map((offset) =>
+            tx.activities.findFirst({
+              skip: offset,
+              where: {
+                isActive: true,
+                activityInternalStatus:
+                  ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+                amInternalStatus:
+                  ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+                deletedAt: null,
+                id: {
+                  notIn: allUserExcludedActivityIds.length
+                    ? allUserExcludedActivityIds
+                    : [-1],
+                },
+                ...(activityTypeXids && activityTypeXids.length > 0 && {
+                  activityTypeXid: { in: activityTypeXids },
+                }),
+              },
+              select: {
+                id: true,
+                activityTitle: true,
+                ActivitiesMedia: {
+                  where: { isActive: true, isCoverImage: true },
+                  orderBy: { displayOrder: 'asc' },
+                  take: 1,
+                  select: {
+                    mediaFileName: true,
+                  },
+                },
+              },
+            }),
+          ),
+        );
+
+        randomActivities = await Promise.all(
+          randomFetched
+            .filter(Boolean)
+            .map(async (activity) => {
+              const cover = activity!.ActivitiesMedia?.[0];
+
+              return {
+                activityId: activity!.id,
+                activityTitle: activity!.activityTitle,
+                coverImage: cover?.mediaFileName ?? null,
+                coverImagePresignedUrl: await attachPresignedUrl(
+                  cover?.mediaFileName
+                ),
+              };
+            }),
+        );
+      }
+
+      // Overseas Activities with filtering
+      const overseasWhere: any = {
+        isActive: true,
+        activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+        amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+        id: {
+          notIn: allUserExcludedActivityIds.length
+            ? allUserExcludedActivityIds
+            : [-1],
+        },
+      };
+
+      if (effectiveCountryXid) {
+        overseasWhere.checkInCountryXid = { not: effectiveCountryXid };
+      }
+      if (activityTypeXids && activityTypeXids.length > 0) {
+        overseasWhere.activityTypeXid = { in: activityTypeXids };
+      }
+
+      const formattedOverSeasActivities = await this.rankAndPaginateActivities(
+        tx,
+        overseasWhere,
+        page,
+        limit,
+        connectionInterestMap
+      );
+
+      return {
+        userAddressDetails,
+        experiencesLogged: 0,
+        citiesDiscovered: 0,
+        loggedInNetworkCount: 0,
+        citiesInNetworkCount: 0,
+        rating: 0,
+        interestedCount: userInterestedActivityIds.length,
+        bucketCount: userBucketActivityIds.length,
+        pagination: {
+          page,
+          limit,
+        },
+        randomActivities,
+        interests: interestsWithActivities,
+        otherStatesActivities: formattedOtherStatesActivities,
+        overSeasActivities: formattedOverSeasActivities,
+        newArrivalsActivities: formattedNewArrivalsActivities,
+        mostHypedActivities: formattedMostHypedActivities,
+      };
+    });
+
+    return data;
+  }
+}
--- a/src/modules/user/services/itinerary.service.ts
+++ b/src/modules/user/services/itinerary.service.ts
@@ -0,0 +1,207 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaClient } from '@prisma/client';
+import { getPresignedUrl } from '../../../common/middlewares/aws/getPreSignedUrl';
+import {
+  ACTIVITY_AM_INTERNAL_STATUS,
+  ACTIVITY_INTERNAL_STATUS,
+} from '../../../common/utils/constants/host.constant';
+
+import config from '@/config/config';
+
+const bucket = config.aws.bucketName;
+
+const attachPresignedUrl = async (file: string | null | undefined) => {
+  if (!file) return null;
+
+  const key = file.startsWith('http')
+    ? new URL(file).pathname.replace(/^\/+/, '')
+    : file;
+
+  return getPresignedUrl(bucket, key);
+};
+
+const attachMediaWithPresignedUrl = async (
+  mediaArr: Array<{
+    id: number;
+    mediaType: string;
+    mediaFileName: string;
+    isCoverImage: boolean;
+    displayOrder: number;
+  }> = [],
+) => {
+  return Promise.all(
+    mediaArr.map(async (media) => ({
+      id: media.id,
+      mediaType: media.mediaType,
+      mediaFileName: media.mediaFileName,
+      isCoverImage: media.isCoverImage,
+      displayOrder: media.displayOrder,
+      presignedUrl: await attachPresignedUrl(media.mediaFileName),
+    })),
+  );
+};
+
+@Injectable()
+export class ItineraryService {
+  constructor(private prisma: PrismaClient) {}
+
+  async getUserItineraryDetails(userXid: number) {
+    const [userLocation, activityEntries, travellerType] = await Promise.all([
+      this.prisma.userAddressDetails.findFirst({
+        where: {
+          userXid,
+          isActive: true,
+          deletedAt: null,
+        },
+        orderBy: {
+          createdAt: 'desc',
+        },
+        select: {
+          id: true,
+          address1: true,
+          address2: true,
+          pinCode: true,
+          locationName: true,
+          locationAddress: true,
+          locationLat: true,
+          locationLong: true,
+          countryXid: true,
+          stateXid: true,
+          cityXid: true,
+          country: {
+            select: {
+              id: true,
+              countryName: true,
+              countryCode: true,
+            },
+          },
+          states: {
+            select: {
+              id: true,
+              stateName: true,
+            },
+          },
+          cities: {
+            select: {
+              id: true,
+              cityName: true,
+            },
+          },
+        },
+      }),
+      this.prisma.userBucketInterested.findMany({
+        where: {
+          userXid,
+          isActive: true,
+          deletedAt: null,
+          Activities: {
+            isActive: true,
+            deletedAt: null,
+            activityInternalStatus: ACTIVITY_INTERNAL_STATUS.ACTIVITY_LISTED,
+            amInternalStatus: ACTIVITY_AM_INTERNAL_STATUS.ACTIVITY_LISTED,
+          },
+        },
+        orderBy: {
+          createdAt: 'desc',
+        },
+        select: {
+          id: true,
+          isBucket: true,
+          bucketTypeName: true,
+          activityStatus: true,
+          createdAt: true,
+          activityXid: true,
+          Activities: {
+            select: {
+              id: true,
+              activityTitle: true,
+              activityDescription: true,
+              activityDurationMins: true,
+              checkInAddress: true,
+              checkInLat: true,
+              checkInLong: true,
+              ActivitiesMedia: {
+                where: {
+                  isActive: true,
+                  deletedAt: null,
+                },
+                orderBy: {
+                  displayOrder: 'asc',
+                },
+                select: {
+                  id: true,
+                  mediaType: true,
+                  mediaFileName: true,
+                  isCoverImage: true,
+                  displayOrder: true,
+                },
+              },
+            },
+          },
+        },
+      }),
+      this.prisma.allowedEntryTypes.findMany({
+        where: {
+          isActive: true,
+          deletedAt: null,
+        },
+        select: {
+          id: true,
+          allowedEntryTypeName: true,
+        },
+        orderBy: {
+          id: 'asc',
+        },
+      }),
+    ]);
+
+    const formattedActivities = await Promise.all(
+      activityEntries.map(async (entry) => {
+        const coverImage =
+          entry.Activities?.ActivitiesMedia.find((media) => media.isCoverImage) ??
+          entry.Activities?.ActivitiesMedia[0] ??
+          null;
+
+        return {
+          id: entry.id,
+          activityXid: entry.activityXid,
+          isBucket: entry.isBucket,
+          bucketTypeName: entry.bucketTypeName,
+          activityStatus: entry.activityStatus,
+          addedOn: entry.createdAt,
+          activityDetails: {
+            id: entry.Activities?.id ?? null,
+            activityTitle: entry.Activities?.activityTitle ?? null,
+            activityDescription: entry.Activities?.activityDescription ?? null,
+            activityDurationMins: entry.Activities?.activityDurationMins ?? null,
+            checkInAddress: entry.Activities?.checkInAddress ?? null,
+            checkInLat: entry.Activities?.checkInLat ?? null,
+            checkInLong: entry.Activities?.checkInLong ?? null,
+            coverImage: coverImage?.mediaFileName ?? null,
+            coverImagePresignedUrl: await attachPresignedUrl(
+              coverImage?.mediaFileName,
+            ),
+            media: await attachMediaWithPresignedUrl(
+              entry.Activities?.ActivitiesMedia ?? [],
+            ),
+          },
+        };
+      }),
+    );
+
+    const latestAddedActivity = formattedActivities[0] ?? null;
+
+    return {
+      userLocation,
+      travellerType,
+      bucketCount: formattedActivities.filter((item) => item.isBucket).length,
+      interestedCount: formattedActivities.filter((item) => !item.isBucket).length,
+      latestAddedActivityCoverImage:
+        latestAddedActivity?.activityDetails.coverImage ?? null,
+      latestAddedActivityCoverImagePresignedUrl:
+        latestAddedActivity?.activityDetails.coverImagePresignedUrl ?? null,
+      bucketActivities: formattedActivities.filter((item) => item.isBucket),
+      interestedActivities: formattedActivities.filter((item) => !item.isBucket),
+    };
+  }
+}
--- a/src/modules/user/services/user.service.ts
+++ b/src/modules/user/services/user.service.ts
--- a/test-stepper-handler.ts
+++ b/test-stepper-handler.ts
@@ -1,122 +0,0 @@
-/**
- * Test script for stepper handler
- * Run with: npx ts-node test-stepper-handler.ts
- */
-
-import { PrismaClient } from '@prisma/client';
-import * as jwt from 'jsonwebtoken';
-
-const prisma = new PrismaClient();
-
-async function testStepperHandler() {
-  console.log('🧪 Testing Stepper Handler...\n');
-
-  try {
-    // 1. Find a host user with HostHeader data
-    console.log('📍 Step 1: Finding host user with HostHeader...');
-    const hostUser = await prisma.user.findFirst({
-      where: { roleXid: 4 },
-      include: {
-        HostHeader: {
-          select: {
-            id: true,
-            stepper: true,
-            hostRefNumber: true,
-            companyName: true,
-          },
-        },
-      },
-    });
-
-    if (!hostUser) {
-      console.log('❌ No host user found (roleXid=4) in database.');
-      return;
-    }
-
-    if (!hostUser.HostHeader || hostUser.HostHeader.length === 0) {
-      console.log('⚠️  Host user found but no HostHeader records.');
-      console.log(`   User ID: ${hostUser.id}, Email: ${hostUser.emailAddress}`);
-      return;
-    }
-
-    const hostHeader = hostUser.HostHeader[0];
-    console.log(`✅ Found host user and HostHeader\n`);
-    console.log(`   User ID: ${hostUser.id}`);
-    console.log(`   Email: ${hostUser.emailAddress}`);
-    console.log(`   First Name: ${hostUser.firstName}`);
-    console.log(`   Host ID: ${hostHeader.id}`);
-    console.log(`   Company: ${hostHeader.companyName}`);
-    console.log(`   Ref Number: ${hostHeader.hostRefNumber}`);
-    console.log(`   Current Stepper: ${hostHeader.stepper}\n`);
-
-    // 2. Simulate what the handler returns
-    console.log('📍 Step 2: Simulating handler response...\n');
-
-    const stepDescriptions: { [key: number]: string } = {
-      1: 'Basic Company Information',
-      2: 'Company Documents & Verification',
-      3: 'Bank & Payment Details',
-      4: 'Activities Setup',
-      5: 'Pricing & Services',
-      6: 'Review & Approval',
-      7: 'Active & Live',
-    };
-
-    const stepperDescription =
-      stepDescriptions[hostHeader.stepper] || 'Unknown Step';
-
-    const response = {
-      success: true,
-      message: 'Stepper information retrieved successfully',
-      data: {
-        user: {
-          id: hostUser.id,
-          firstName: hostUser.firstName,
-          lastName: hostUser.lastName,
-          emailAddress: hostUser.emailAddress,
-          roleXid: hostUser.roleXid,
-        },
-        stepper: {
-          hostId: hostHeader.id,
-          currentStep: hostHeader.stepper,
-          stepperDescription: stepperDescription,
-        },
-      },
-    };
-
-    console.log('✅ Handler Response:\n');
-    console.log(JSON.stringify(response, null, 2));
-
-    // 3. Verify stepper value is numeric
-    console.log('\n📍 Step 3: Validation checks...\n');
-
-    if (typeof hostHeader.stepper !== 'number') {
-      console.log('❌ Stepper is not a number');
-      return;
-    }
-    console.log('✅ Stepper is numeric:', hostHeader.stepper);
-
-    if (hostHeader.stepper < 1 || hostHeader.stepper > 7) {
-      console.log(
-        '⚠️  Stepper value is out of expected range (1-7):',
-        hostHeader.stepper
-      );
-    } else {
-      console.log('✅ Stepper value in valid range (1-7)');
-    }
-
-    if (!stepperDescription.includes('Unknown')) {
-      console.log('✅ Stepper description found:', stepperDescription);
-    } else {
-      console.log('⚠️  Unknown stepper value');
-    }
-
-    console.log('\n✅ Test passed! Handler is working correctly.');
-  } catch (error) {
-    console.error('❌ Test error:', error);
-  } finally {
-    await prisma.$disconnect();
-  }
-}
-
-testStepperHandler();