feat: Add multiple Serverless configuration files for modular deployment and update package.json to remove serverless-esbuild

- Added a new API endpoint to set a user passcode with validation.
- Created SetPasscodeDTO for passcode input validation.
- Implemented setUserPasscode method in UserService to handle passcode setting.
- Updated user.yml to include the new set-passcode endpoint.
- Created setPasscodeForMobile handler to manage the passcode setting logic.
- Removed unused test-stepper-handler.ts file.
- Deleted Dockerfile, docker-compose.yml, init.sql, and serverless.yml.backup files as part of cleanup.

.env.example

@@ -0,0 +1,44 @@
+# Environment Configuration Template
+# Copy this file to .env.dev, .env.test, or .env.uat and fill in the values
+
+# Database
+DATABASE_URL=
+DB_USERNAME=
+DB_PASSWORD=
+DB_DATABASE_NAME=
+DB_HOSTNAME=
+DB_PORT=5432
+
+# Email Bypass (set to true for dev/test, false for production-like environments)
+BY_PASS_EMAIL=
+BYPASS_OTP=
+
+# Brevo Email Configuration
+BREVO_EMAIL_API_KEY=
+BREVO_API_BASEURL=https://api.brevo.com
+BREVO_FROM_EMAIL=
+BREVO_SMTP_HOST=smtp-relay.brevo.com
+BREVO_SMTP_PORT=587
+BREVO_SMTP_USER=
+BREVO_SMTP_PASS=
+
+# JWT Configuration
+REFRESH_TOKEN_SECRET=
+JWT_SECRET=
+JWT_ACCESS_EXPIRATION_MINUTES=30
+JWT_REFRESH_EXPIRATION_DAYS=7
+JWT_RESET_PASSWORD_EXPIRATION_MINUTES=15
+JWT_VERIFY_EMAIL_EXPIRATION_MINUTES=15
+
+# Security
+SALT_ROUNDS=
+NODE_ENV=
+
+# AWS S3
+S3_BUCKET_NAME=
+
+# Admin Configuration
+MINGLAR_ADMIN_NAME=
+MINGLAR_ADMIN_EMAIL=
+AM_INVITATION_LINK=
+HOST_LINK=

.gitignore

@@ -40,10 +40,14 @@ lerna-debug.log*
 .env.test.local
 .env.production.local
 .env.local
+.env.dev
+.env.test
+.env.uat
 
 # temp
 .tmp
 .temp
+undefined/
 
 # Runtime data
 pids

Dockerfile

@@ -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"]

LAMBDA_OPTIMIZATION_GUIDE.md

@@ -0,0 +1,490 @@
+# AWS Lambda Bundle Size Optimization Guide
+
+## Overview
+
+This guide documents how to optimize AWS Lambda function bundle sizes when using:
+- **Serverless Framework v4** (with built-in esbuild)
+- **Prisma ORM** (with driver adapters)
+- **NestJS** or any Node.js framework
+
+## Problem
+
+Lambda functions can become bloated (25+ MB) due to:
+1. **Prisma binary engines** (~50MB uncompressed)
+2. **AWS SDK v3** being bundled (~5-10MB)
+3. **Dependencies copied to node_modules** instead of being bundled
+
+## Solution Architecture
+
+```
+┌─────────────────────────────────────────────────────────┐
+│                    Lambda Function                       │
+│  ┌─────────────────────────────────────────────────┐    │
+│  │  Your Code (bundled by esbuild)     ~50-500 KB  │    │
+│  └─────────────────────────────────────────────────┘    │
+│                         │                                │
+│                         ▼                                │
+│  ┌─────────────────────────────────────────────────┐    │
+│  │  Prisma Layer (shared)              ~15 MB      │    │
+│  │  - @prisma/client                               │    │
+│  │  - @prisma/adapter-pg                           │    │
+│  │  - .prisma/client (generated)                   │    │
+│  │  - pg driver                                    │    │
+│  └─────────────────────────────────────────────────┘    │
+│                         │                                │
+│                         ▼                                │
+│  ┌─────────────────────────────────────────────────┐    │
+│  │  AWS Lambda Runtime                             │    │
+│  │  - AWS SDK v3 (built-in for Node.js 18+)        │    │
+│  └─────────────────────────────────────────────────┘    │
+└─────────────────────────────────────────────────────────┘
+```
+
+---
+
+## Step-by-Step Setup
+
+### 1. Project Structure
+
+```
+your-project/
+├── serverless.yml
+├── package.json
+├── prisma/
+│   └── schema.prisma
+├── layers/
+│   └── prisma/
+│       └── nodejs/
+│           └── package.json
+├── src/
+│   └── ... your code
+└── build-prisma-layer.ps1  (or .sh for Linux/Mac)
+```
+
+### 2. Prisma Schema Configuration
+
+**`prisma/schema.prisma`**
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  // For Prisma 7+ with driver adapters, no binary targets needed
+  // The WASM-based query engine is used automatically
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+}
+```
+
+> **Note**: Prisma 7+ uses WASM-based query compiler instead of binary engines when using driver adapters, which is much smaller.
+
+### 3. Layer Package.json
+
+**`layers/prisma/nodejs/package.json`**
+```json
+{
+  "name": "prisma-layer",
+  "version": "1.0.0",
+  "description": "Lambda layer for Prisma with pg driver adapter",
+  "dependencies": {
+    "@prisma/client": "^7.0.0",
+    "@prisma/adapter-pg": "^7.0.0",
+    "pg": "^8.13.0"
+  }
+}
+```
+
+### 4. Serverless Configuration
+
+**`serverless.yml`**
+```yaml
+service: your-service-name
+
+provider:
+  name: aws
+  runtime: nodejs22.x
+  region: your-region
+  memorySize: 512
+  # Apply Prisma layer to ALL functions
+  layers:
+    - !Ref PrismaLambdaLayer
+  environment:
+    DATABASE_URL: ${env:DATABASE_URL}
+    # ... other env vars
+
+# esbuild configuration (Serverless v4 built-in)
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node20
+    platform: node
+    # Mark packages as external (not bundled into JS)
+    external:
+      - '@prisma/client'
+      - '@prisma/adapter-pg'
+      - '.prisma/client'
+      - '.prisma'
+      - 'pg'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    # Exclude from npm install in zip (CRITICAL!)
+    exclude:
+      - 'aws-sdk'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+      - '@prisma/client'
+      - '@prisma/adapter-pg'
+      - '.prisma'
+      - '.prisma/client'
+      - 'pg'
+      - 'pg-*'
+      - 'postgres-*'
+      - 'pgpass'
+      - 'split2'
+      - 'xtend'
+
+# Define the Prisma layer
+layers:
+  prisma:
+    path: layers/prisma
+    name: ${self:service}-prisma-layer-${sls:stage}
+    description: Prisma client with pg driver adapter
+    compatibleRuntimes:
+      - nodejs22.x
+    retain: false
+
+# Package configuration
+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'
+    - '!.git/**'
+
+functions:
+  myFunction:
+    handler: src/handlers/myHandler.handler
+    events:
+      - httpApi:
+          path: /my-endpoint
+          method: get
+
+plugins:
+  - serverless-offline
+```
+
+### 5. Build Script for Prisma Layer
+
+**Windows (PowerShell) - `build-prisma-layer.ps1`**
+```powershell
+# Build Prisma Lambda Layer
+$layerPath = "layers\prisma\nodejs"
+
+Write-Host "Building Prisma Lambda Layer..." -ForegroundColor Cyan
+
+# 1. Clean existing node_modules in layer
+Write-Host "Cleaning layer node_modules..."
+if (Test-Path "$layerPath\node_modules") {
+    Remove-Item -Recurse -Force "$layerPath\node_modules"
+}
+
+# 2. Install dependencies in layer
+Write-Host "Installing layer dependencies..."
+Push-Location $layerPath
+npm install --omit=dev
+Pop-Location
+
+# 3. Generate Prisma client
+Write-Host "Generating Prisma client..."
+npx prisma generate
+
+# 4. Copy .prisma/client to layer
+Write-Host "Copying generated Prisma client to layer..."
+$sourcePrisma = "node_modules\.prisma"
+$destPrisma = "$layerPath\node_modules\.prisma"
+
+if (Test-Path $sourcePrisma) {
+    if (Test-Path $destPrisma) {
+        Remove-Item -Recurse -Force $destPrisma
+    }
+    Copy-Item -Recurse $sourcePrisma $destPrisma
+    Write-Host "Copied .prisma/client successfully!" -ForegroundColor Green
+} else {
+    Write-Host "ERROR: .prisma folder not found. Run 'npx prisma generate' first." -ForegroundColor Red
+    exit 1
+}
+
+# 5. Show layer size
+$layerSize = (Get-ChildItem "$layerPath\node_modules" -Recurse | Measure-Object -Property Length -Sum).Sum / 1MB
+Write-Host "`nTotal layer size: $([math]::Round($layerSize, 2)) MB" -ForegroundColor Yellow
+Write-Host "Prisma layer built successfully!" -ForegroundColor Green
+```
+
+**Linux/Mac (Bash) - `build-prisma-layer.sh`**
+```bash
+#!/bin/bash
+set -e
+
+LAYER_PATH="layers/prisma/nodejs"
+
+echo "Building Prisma Lambda Layer..."
+
+# 1. Clean existing node_modules in layer
+echo "Cleaning layer node_modules..."
+rm -rf "$LAYER_PATH/node_modules"
+
+# 2. Install dependencies in layer
+echo "Installing layer dependencies..."
+cd "$LAYER_PATH"
+npm install --omit=dev
+cd -
+
+# 3. Generate Prisma client
+echo "Generating Prisma client..."
+npx prisma generate
+
+# 4. Copy .prisma/client to layer
+echo "Copying generated Prisma client to layer..."
+if [ -d "node_modules/.prisma" ]; then
+    rm -rf "$LAYER_PATH/node_modules/.prisma"
+    cp -r "node_modules/.prisma" "$LAYER_PATH/node_modules/.prisma"
+    echo "Copied .prisma/client successfully!"
+else
+    echo "ERROR: .prisma folder not found. Run 'npx prisma generate' first."
+    exit 1
+fi
+
+# 5. Show layer size
+LAYER_SIZE=$(du -sm "$LAYER_PATH/node_modules" | cut -f1)
+echo "Total layer size: ${LAYER_SIZE} MB"
+echo "Prisma layer built successfully!"
+```
+
+### 6. Prisma Client Usage
+
+**`src/common/database/prisma.client.ts`**
+```typescript
+import { PrismaClient } from '@prisma/client';
+import { PrismaPg } from '@prisma/adapter-pg';
+import { Pool } from 'pg';
+
+// Connection pool for serverless
+const pool = new Pool({
+  connectionString: process.env.DATABASE_URL,
+  max: 5, // Limit connections in Lambda
+});
+
+const adapter = new PrismaPg(pool);
+
+// Single instance for Lambda warm starts
+let prisma: PrismaClient;
+
+export function getPrismaClient(): PrismaClient {
+  if (!prisma) {
+    prisma = new PrismaClient({
+      adapter,
+      log: process.env.NODE_ENV === 'development' ? ['query', 'error', 'warn'] : ['error'],
+    });
+  }
+  return prisma;
+}
+
+export { prisma };
+```
+
+---
+
+## Deployment Workflow
+
+```bash
+# 1. Build the Prisma layer (run after schema changes)
+./build-prisma-layer.ps1   # Windows
+# or
+./build-prisma-layer.sh    # Linux/Mac
+
+# 2. Deploy
+npx serverless deploy --stage=dev
+
+# 3. Deploy single function (faster, uses existing layer)
+npx serverless deploy function -f myFunction --stage=dev
+```
+
+---
+
+## Key Configuration Explained
+
+### esbuild `external` vs `exclude`
+
+| Property | Purpose |
+|----------|---------|
+| `external` | Tells esbuild NOT to bundle these into the JS file. They become `require()` calls. |
+| `exclude` | Tells Serverless NOT to `npm install` these packages into the function zip. |
+
+**Both are required!** 
+- `external` alone = esbuild doesn't bundle, but Serverless still installs to node_modules
+- `exclude` alone = Serverless doesn't install, but esbuild bundles the code
+
+### Layer Reference
+
+```yaml
+# This creates a CloudFormation reference to the layer defined in the same stack
+layers:
+  - !Ref PrismaLambdaLayer
+```
+
+The `PrismaLambdaLayer` name comes from the layer key (`prisma`) converted to PascalCase + `LambdaLayer`.
+
+### Why Exclude pg-* packages?
+
+When `pg` is external, its dependencies still get installed:
+- `pg-connection-string`
+- `pg-pool`
+- `pg-protocol`
+- `pg-types`
+- etc.
+
+These must all be in the `exclude` list to prevent duplication.
+
+---
+
+## Expected Results
+
+| Function Type | Before | After |
+|---------------|--------|-------|
+| Simple handlers | 25+ MB | **50-100 kB** |
+| With validation (zod/yup) | 25+ MB | **300-500 kB** |
+| With S3 uploads | 30+ MB | **1-2 MB** |
+
+---
+
+## Troubleshooting
+
+### 1. "Cannot find module '@prisma/client'"
+
+**Cause**: Layer doesn't have the generated `.prisma/client`
+
+**Fix**: Run `build-prisma-layer.ps1` to regenerate the layer
+
+### 2. Function size still large
+
+**Debug**: Extract and inspect the zip:
+```powershell
+Expand-Archive ".serverless\build\your-function.zip" -DestinationPath "extracted"
+Get-ChildItem "extracted\node_modules" -Directory
+```
+
+If you see `@prisma` or `pg` folders, the `exclude` config isn't working.
+
+### 3. "Cannot resolve CloudFormation reference"
+
+**Cause**: Using `${cf:...}` reference before first deploy
+
+**Fix**: Use `!Ref PrismaLambdaLayer` instead (works on first deploy)
+
+### 4. Cold starts still slow
+
+Consider:
+- **Provisioned Concurrency**: Pre-warm instances
+- **Reduce memory**: Sometimes lower memory = same speed, lower cost
+- **Connection pooling**: Use tools like PgBouncer for RDS
+
+---
+
+## Additional Optimizations
+
+### 1. Remove duplicate validation libraries
+
+Pick ONE of: `zod`, `yup`, or `class-validator`. Don't use all three.
+
+### 2. Tree-shake NestJS
+
+If not using full NestJS, import only what you need:
+```typescript
+// Instead of
+import { Controller, Get } from '@nestjs/common';
+
+// For Lambda handlers, you might not need NestJS at all
+```
+
+### 3. Use AWS SDK v3 selectively
+
+```yaml
+external:
+  - '@aws-sdk/*'  # Exclude all
+```
+
+Then in code:
+```typescript
+// AWS SDK v3 is available in Lambda runtime (Node.js 18+)
+import { S3Client } from '@aws-sdk/client-s3';
+```
+
+---
+
+## Quick Reference
+
+```yaml
+# Minimal serverless.yml for Prisma + Lambda optimization
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    external:
+      - '@prisma/client'
+      - '@prisma/adapter-pg'
+      - '.prisma/client'
+      - '.prisma'
+      - 'pg'
+      - '@aws-sdk/*'
+    exclude:
+      - '@prisma/client'
+      - '@prisma/adapter-pg'
+      - '.prisma'
+      - '.prisma/client'
+      - 'pg'
+      - 'pg-*'
+      - 'postgres-*'
+      - 'pgpass'
+      - 'split2'
+      - 'xtend'
+      - '@aws-sdk/*'
+
+layers:
+  prisma:
+    path: layers/prisma
+    name: ${self:service}-prisma-${sls:stage}
+    compatibleRuntimes:
+      - nodejs22.x
+
+provider:
+  layers:
+    - !Ref PrismaLambdaLayer
+```
+
+---
+
+## Version Compatibility
+
+| Tool | Tested Version |
+|------|----------------|
+| Serverless Framework | v4.x |
+| Prisma | v7.x |
+| Node.js | 20.x, 22.x |
+| AWS Lambda Runtime | nodejs20.x, nodejs22.x |
+
+---
+
+*Last updated: December 2025*

build-prisma-layer.ps1

@@ -0,0 +1,51 @@
+# Build Prisma Lambda Layer
+# Run this script before deploying to ensure the layer has the generated client
+
+$layerPath = "layers\prisma\nodejs"
+
+Write-Host "Building Prisma Lambda Layer..." -ForegroundColor Cyan
+
+# 1. Clean existing node_modules in layer
+Write-Host "Cleaning layer node_modules..."
+if (Test-Path "$layerPath\node_modules") {
+    Remove-Item -Recurse -Force "$layerPath\node_modules"
+}
+
+# 2. Install dependencies in layer
+Write-Host "Installing layer dependencies..."
+Push-Location $layerPath
+npm install --omit=dev
+Pop-Location
+
+# 3. Generate Prisma client into the layer
+Write-Host "Generating Prisma client into layer..."
+# Set the output directory for Prisma client
+$env:PRISMA_GENERATE_DATAPROXY = "false"
+
+# Generate client - this creates .prisma/client
+npx prisma generate
+
+# 4. Copy .prisma/client to layer
+Write-Host "Copying generated Prisma client to layer..."
+$sourcePrisma = "node_modules\.prisma"
+$destPrisma = "$layerPath\node_modules\.prisma"
+
+if (Test-Path $sourcePrisma) {
+    if (Test-Path $destPrisma) {
+        Remove-Item -Recurse -Force $destPrisma
+    }
+    Copy-Item -Recurse $sourcePrisma $destPrisma
+    Write-Host "Copied .prisma/client successfully!" -ForegroundColor Green
+} else {
+    Write-Host "ERROR: .prisma folder not found. Run 'npx prisma generate' first." -ForegroundColor Red
+    exit 1
+}
+
+# 5. Show layer size
+Write-Host "`nLayer contents:"
+Get-ChildItem "$layerPath\node_modules" -Directory | Select-Object Name
+$layerSize = (Get-ChildItem "$layerPath\node_modules" -Recurse | Measure-Object -Property Length -Sum).Sum / 1MB
+Write-Host "`nTotal layer size: $([math]::Round($layerSize, 2)) MB" -ForegroundColor Yellow
+
+Write-Host "`nPrisma layer built successfully!" -ForegroundColor Green
+Write-Host "Run 'serverless deploy' to deploy with the updated layer."

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

docs/serverless-split-services.md

@@ -0,0 +1,40 @@
+# Split Serverless services (deploy order)
+
+This repo is split into multiple Serverless configs so you can deploy smaller CloudFormation stacks instead of one huge stack.
+
+## Config files
+
+- `serverless.layers.yml`: Prisma layer stack (deploy once per stage)
+- `serverless.host.yml`: Host + PQQ functions (owns the shared HTTP API)
+- `serverless.admin.yml`: Minglar Admin functions (attaches routes to Host HTTP API)
+- `serverless.user.yml`: User functions (attaches routes to Host HTTP API)
+- `serverless.prepopulate.yml`: Prepopulate functions (attaches routes to Host HTTP API)
+
+## Deploy order (per stage)
+
+1) Deploy the layer:
+
+```bash
+npx serverless deploy --config serverless.layers.yml --stage dev
+```
+
+2) Deploy Host (creates the HTTP API + routes for host functions):
+
+```bash
+npx serverless deploy --config serverless.host.yml --stage dev
+```
+
+3) Deploy remaining services (they reuse Host's HTTP API id):
+
+```bash
+npx serverless deploy --config serverless.admin.yml --stage dev
+npx serverless deploy --config serverless.user.yml --stage dev
+npx serverless deploy --config serverless.prepopulate.yml --stage dev
+```
+
+## Deploy a single function
+
+```bash
+npx serverless deploy function --config serverless.host.yml --stage dev -f getHosts
+```
+

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;

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();

layers/prisma/nodejs/package-lock.json

@@ -0,0 +1,217 @@
+{
+  "name": "prisma-layer",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "prisma-layer",
+      "version": "1.0.0",
+      "dependencies": {
+        "@prisma/adapter-pg": "^7.0.1",
+        "@prisma/client": "^7.0.1",
+        "pg": "^8.13.0",
+        "zod": "^4.1.12"
+      }
+    },
+    "node_modules/@prisma/adapter-pg": {
+      "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.2.0",
+        "pg": "^8.16.3",
+        "postgres-array": "3.0.4"
+      }
+    },
+    "node_modules/@prisma/client": {
+      "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.2.0"
+      },
+      "engines": {
+        "node": "^20.19 || ^22.12 || >=24.0"
+      },
+      "peerDependencies": {
+        "prisma": "*",
+        "typescript": ">=5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "prisma": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@prisma/client-runtime-utils": {
+      "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.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.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.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==",
+      "dependencies": {
+        "pg-connection-string": "^2.9.1",
+        "pg-pool": "^3.10.1",
+        "pg-protocol": "^1.10.3",
+        "pg-types": "2.2.0",
+        "pgpass": "1.0.5"
+      },
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "optionalDependencies": {
+        "pg-cloudflare": "^1.2.7"
+      },
+      "peerDependencies": {
+        "pg-native": ">=3.0.1"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pg-cloudflare": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
+      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
+      "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=="
+    },
+    "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==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pg-pool": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
+      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
+      "peerDependencies": {
+        "pg": ">=8.0"
+      }
+    },
+    "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=="
+    },
+    "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==",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pg-types/node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pgpass": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "dependencies": {
+        "split2": "^4.1.0"
+      }
+    },
+    "node_modules/postgres-array": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.4.tgz",
+      "integrity": "sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "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"
+      }
+    },
+    "node_modules/postgres-date": {
+      "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==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/zod": {
+      "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"
+      }
+    }
+  }
+}

layers/prisma/nodejs/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "prisma-layer",
+  "version": "1.0.0",
+  "description": "Lambda layer for Prisma 7 with pg driver adapter and zod",
+  "dependencies": {
+    "@prisma/client": "^7.0.1",
+    "@prisma/adapter-pg": "^7.0.1",
+    "pg": "^8.13.0",
+    "zod": "^4.1.12"
+  }
+}

package-lock.json

@@ -46,7 +46,7 @@
         "prisma": "^7.0.1",
         "reflect-metadata": "^0.1.13",
         "rxjs": "^7.8.1",
-        "serverless": "4.17.0",
+        "serverless": "4.24.0",
         "swagger-ui-express": "^5.0.0",
         "tslib": "^2.8.1",
         "uuid": "^13.0.0",
@@ -14467,12 +14467,12 @@
       }
     },
     "node_modules/serverless": {
-      "version": "4.17.0",
-      "resolved": "https://registry.npmjs.org/serverless/-/serverless-4.17.0.tgz",
-      "integrity": "sha512-hoZmipwyN/h7y9HwkWGlJ0YT06RFq7WNOD7fFEiPfnSnnUMVTzeNHq2BRrUlpHhf5s9srCHDc2wx5I06acfq1Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/serverless/-/serverless-4.24.0.tgz",
+      "integrity": "sha512-bgxFQ6QyOGJC9IZjZIXo4m6bdWMl9I7HNZ4jrmwSpdePdsRd46igGRpSnhdYFOc71GNplhSOeoCibL94yCHfrg==",
       "hasInstallScript": true,
       "dependencies": {
-        "axios": "^1.8.3",
+        "axios": "^1.12.1",
         "axios-proxy-builder": "^0.1.2",
         "rimraf": "^5.0.5",
         "xml2js": "0.6.2"

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,22 +48,31 @@
     "@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",
-    "serverless": "4.17.0",
+    "serverless": "4.24.0",
     "swagger-ui-express": "^5.0.0",
     "tslib": "^2.8.1",
     "uuid": "^13.0.0",
@@ -88,7 +97,6 @@
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "prettier": "^3.2.5",
-    "serverless-esbuild": "^1.55.1",
     "serverless-offline": "^14.4.0",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.4",

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!')
+}
+

prisma/prisma.ts

@@ -1,8 +1,8 @@
 // prisma.ts
-import { PrismaClient } from '@prisma/client';
+// Re-export from the main singleton for consistency
+import { prisma } from '../src/common/database/prisma.client';
 
-// The DATABASE_URL environment variable will be automatically used
-export const prisma = new PrismaClient();
+export { prisma };
 
 process.on('SIGINT', async () => {
   await prisma.$disconnect();

serverless.admin.yml

@@ -0,0 +1,133 @@
+service: minglar-admin
+
+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'}
+  versionFunctions: false
+  memorySize: 512
+  layers:
+    - ${cf:minglar-layers-${sls:stage}.PrismaLambdaLayerQualifiedArn}
+  httpApi:
+    id: ${cf:minglar-host-${sls:stage}.HttpApiId}
+  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}/*'
+
+custom:
+  serverless-offline:
+    reloadHandler: true
+
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node22
+    platform: node
+    external:
+      - '@prisma/client'
+      - '.prisma/client'
+      - '.prisma'
+      - '@prisma/adapter-pg'
+      - 'pg'
+      - 'zod'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    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
+  excludeDevDependencies: 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/**'
+
+functions:
+  - ${file(./serverless/functions/minglaradmin.yml)}
+
+plugins:
+  - serverless-offline

serverless.host.yml

@@ -0,0 +1,132 @@
+service: minglar-host
+
+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'}
+  versionFunctions: false
+  memorySize: 512
+  layers:
+    - ${cf:minglar-layers-${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}/*'
+
+custom:
+  serverless-offline:
+    reloadHandler: true
+
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node22
+    platform: node
+    external:
+      - '@prisma/client'
+      - '.prisma/client'
+      - '.prisma'
+      - '@prisma/adapter-pg'
+      - 'pg'
+      - 'zod'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    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
+  excludeDevDependencies: 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/**'
+
+functions:
+  - ${file(./serverless/functions/host.yml)}
+  - ${file(./serverless/functions/pqq.yml)}
+
+plugins:
+  - serverless-offline

serverless.layers.yml

@@ -0,0 +1,30 @@
+service: minglar-layers
+
+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'}
+  versionFunctions: false
+
+# Define layers (deployed once; other stacks reference via cf output)
+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
+
+plugins: []

serverless.prepopulate.yml

@@ -0,0 +1,133 @@
+service: minglar-prepopulate
+
+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'}
+  versionFunctions: false
+  memorySize: 512
+  layers:
+    - ${cf:minglar-layers-${sls:stage}.PrismaLambdaLayerQualifiedArn}
+  httpApi:
+    id: ${cf:minglar-host-${sls:stage}.HttpApiId}
+  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}/*'
+
+custom:
+  serverless-offline:
+    reloadHandler: true
+
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node22
+    platform: node
+    external:
+      - '@prisma/client'
+      - '.prisma/client'
+      - '.prisma'
+      - '@prisma/adapter-pg'
+      - 'pg'
+      - 'zod'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    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
+  excludeDevDependencies: 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/**'
+
+functions:
+  - ${file(./serverless/functions/prepopulate.yml)}
+
+plugins:
+  - serverless-offline

serverless.user.yml

@@ -0,0 +1,133 @@
+service: minglar-user
+
+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'}
+  versionFunctions: false
+  memorySize: 512
+  layers:
+    - ${cf:minglar-layers-${sls:stage}.PrismaLambdaLayerQualifiedArn}
+  httpApi:
+    id: ${cf:minglar-host-${sls:stage}.HttpApiId}
+  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}/*'
+
+custom:
+  serverless-offline:
+    reloadHandler: true
+
+build:
+  esbuild:
+    bundle: true
+    minify: true
+    sourcemap: false
+    target: node22
+    platform: node
+    external:
+      - '@prisma/client'
+      - '.prisma/client'
+      - '.prisma'
+      - '@prisma/adapter-pg'
+      - 'pg'
+      - 'zod'
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+    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
+  excludeDevDependencies: 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/**'
+
+functions:
+  - ${file(./serverless/functions/user.yml)}
+
+plugins:
+  - serverless-offline

serverless.yml

@@ -1,11 +1,29 @@
-service: minglarDev
+service: minglar
+
+
+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'}
   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)
+    # For offline/local, fall back to an empty string so the CF lookup is optional.
+    - ${cf:${self:service}-${sls:stage}.PrismaLambdaLayerQualifiedArn}
   apiGateway:
     binaryMediaTypes:
       - '*/*'
@@ -38,6 +56,9 @@ provider:
     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:
@@ -53,25 +74,62 @@ provider:
             - 'arn:aws:s3:::${env:S3_BUCKET_NAME}/*'
  
 custom:
+  serverless-offline:
+    reloadHandler: true
+
+build:
   esbuild:
     bundle: true
     minify: true
     sourcemap: false
-    target: node20
+    target: node22
     platform: node
-    concurrency: 5
+    # 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'
-  serverless-offline:
-    reloadHandler: true
+      - '@aws-sdk/*'
+      - '@smithy/*'
+      - '@aws-crypto/*'
+      - '@prisma/adapter-pg'
+      - '@prisma/client'
+      - '.prisma'
+      - '.prisma/client'
+      - 'pg'
+      - 'zod'
+      - 'pg-*'
+      - 'postgres-*'
+      - 'pgpass'
+      - 'split2'
+      - 'xtend'
+ 
+# Define layers
+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
  
 package:
   individually: true
+  excludeDevDependencies: true
   patterns:
     - '!node_modules/**'
+    - '!node_modules/@prisma/**'
+    - '!node_modules/.prisma/**'
     - '!**/*.test.js'
     - '!**/*.spec.js'
     - '!**/test/**'
@@ -88,6 +146,8 @@ 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.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

serverless/functions/host.yml

@@ -161,7 +161,7 @@ getPQQ_LastUpdatedQuestion:
         path: /host/Activity_Hub/OnBoarding/get-latest-pqq-question-details
         method: get
 
-getAllActivityType:
+prePopulateNewActivity:
   handler: src/modules/host/handlers/Activity_Hub/OnBoarding/getAllActivityType.handler
   memorySize: 384
   package:
@@ -174,9 +174,26 @@ getAllActivityType:
       - ${file(./serverless/patterns/base.yml):pattern4}
   events:
     - httpApi:
-        path: /host/Activity_Hub/OnBoarding/get-activity-type
+        path: /host/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: /host/Activity_Hub/OnBoarding/create-new-activity
+        method: patch
+
 showSuggestion:
   handler: src/modules/host/handlers/Host_Admin/onboarding/showSuggestion.handler
   memorySize: 384
@@ -193,6 +210,22 @@ showSuggestion:
         path: /host/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: /host/get-Activity-suggestion
+        method: get
+
 getAllHostActivity:
   handler: src/modules/host/handlers/Activity_Hub/OnBoarding/getAllHostActivity.handler
   memorySize: 384
@@ -253,28 +286,6 @@ submitCompanyDetails:
       - '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/Host_Admin/onboarding/add-company-details
@@ -291,24 +302,6 @@ submitPQQ_Answer:
       - ${file(./serverless/patterns/base.yml):pattern2}
       - ${file(./serverless/patterns/base.yml):pattern3}
       - ${file(./serverless/patterns/base.yml):pattern4}
-      - '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/**'
   events:
     - httpApi:
         path: /host/Activity_Hub/OnBoarding/submit-pqq-answer
@@ -330,6 +323,22 @@ updatePQQ_LastAnswer:
         path: /host/Activity_Hub/OnBoarding/submit-final-pqq-answer
         method: post
 
+submitPQQForReview:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQForReview.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQForReview.*'
+      - '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/Activity_Hub/OnBoarding/submit-pqq-for-review
+        method: patch
+
 getAllPQQwithSubmittedAns:
   handler: src/modules/host/handlers/Activity_Hub/OnBoarding/getAllPQQwithSubmittedAns.handler
   memorySize: 512
@@ -345,6 +354,21 @@ getAllPQQwithSubmittedAns:
         path: /host/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: /host/Activity_Hub/OnBoarding/get-all-details-activity-venue/{activityXid}
+        method: get
+
 updateSuggestionAsReviewed:
   handler: src/modules/host/handlers/Activity_Hub/OnBoarding/updateSuggestionAsReviewed.handler
   memorySize: 512
@@ -374,3 +398,128 @@ 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

serverless/functions/minglaradmin.yml

@@ -1,8 +1,6 @@
 # Minglar Admin Module Functions
 # Admin dashboard and management endpoints
 
-
-
 minglarRegistration:
   handler: src/modules/minglaradmin/handlers/registration.handler
   memorySize: 384
@@ -60,22 +58,6 @@ updateMinglarProfile:
       - ${file(./serverless/patterns/base.yml):pattern2}
       - ${file(./serverless/patterns/base.yml):pattern3}
       - ${file(./serverless/patterns/base.yml):pattern4}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern1}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern2}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern3}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern4}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern5}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern6}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern7}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern8}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern9}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern10}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern11}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern12}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern13}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern14}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern15}
-      - ${file(./serverless/patterns/aws-s3.yml):pattern16}
   events:
     - httpApi:
         path: /minglaradmin/update-profile
@@ -96,7 +78,6 @@ prepopulateRole:
         path: /minglaradmin/prepopulate-Roles
         method: get
 
-
 getHostDetailsById:
   handler: src/modules/minglaradmin/handlers/hosthub/hosts/getByIdHostDetails.handler
   memorySize: 384
@@ -283,8 +264,8 @@ assignAMToHost:
         path: /minglaradmin/hosthub/onboarding/assign-am
         method: patch
 
-editAgreementDetails:
-  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/editAgreementDetails.handler
+editAgreementDetailsAndAccept:
+  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/editAgreementDetailsAndAccept.handler
   memorySize: 384
   package:
     patterns:
@@ -296,9 +277,24 @@ editAgreementDetails:
       - ${file(./serverless/patterns/base.yml):pattern4}
   events:
     - httpApi:
-        path: /minglaradmin/hosthub/onboarding/edit-agreement
+        path: /minglaradmin/hosthub/onboarding/edit-agreement-accept-host
         method: patch
 
+getAllPqqQuesAnsForAM:
+  handler: src/modules/host/handlers/Activity_Hub/OnBoarding/getAllPQQwithSubmittedAns.handler
+  memorySize: 512
+  package:
+    patterns:
+      - 'src/modules/host/handlers/Activity_Hub/OnBoarding/getAllPQQwithSubmittedAns**'
+      - ${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/onboarding/get-all-pqq-ques-ans-for-am
+        method: get
+
 acceptHostApplication:
   handler: src/modules/minglaradmin/handlers/hosthub/hosts/acceptHostApplication.handler
   memorySize: 384
@@ -328,15 +324,15 @@ RejectPQQByAM:
       - ${file(./serverless/patterns/base.yml):pattern4}
   events:
     - httpApi:
-        path: /minglaradmin/hosthub/hosts/reject-pqq-by-am
+        path: /minglaradmin/hosthub/hosts/reject-pq-by-am
         method: patch
 
-acceptHostApplicationMinglar:
-  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/acceptHostAppMinglar.handler
+rejectActivityDetailsApplicationByAM:
+  handler: src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM.handler
   memorySize: 384
   package:
     patterns:
-      - 'src/modules/minglaradmin/handlers/hosthub/onboarding/**'
+      - 'src/modules/minglaradmin/handlers/hosthub/hosts/rejectActivityApplicationByAM**'
       - 'src/modules/minglaradmin/services/**'
       - ${file(./serverless/patterns/base.yml):pattern1}
       - ${file(./serverless/patterns/base.yml):pattern2}
@@ -344,7 +340,39 @@ acceptHostApplicationMinglar:
       - ${file(./serverless/patterns/base.yml):pattern4}
   events:
     - httpApi:
-        path: /minglaradmin/hosthub/onboarding/accept-host-application-minglar
+        path: /minglaradmin/hosthub/hosts/reject-activity-application-by-am
+        method: patch
+
+acceptPQByAM:
+  handler: src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM**'
+      - '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-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:
@@ -361,7 +389,7 @@ rejectHostApplication:
   events:
     - httpApi:
         path: /minglaradmin/hosthub/onboarding/reject-host-application
-        method: post
+        method: patch
 
 rejectHostApplicationAM:
   handler: src/modules/minglaradmin/handlers/hosthub/hosts/rejectHostApplicationAM.handler
@@ -377,7 +405,7 @@ rejectHostApplicationAM:
   events:
     - httpApi:
         path: /minglaradmin/hosthub/hosts/reject-host-application-am
-        method: post
+        method: patch
 
 addPQQSuggestion:
   handler: src/modules/minglaradmin/handlers/hosthub/hosts/addPQQSuggestion.handler
@@ -394,3 +422,51 @@ addPQQSuggestion:
     - httpApi:
         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
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/pqp/getAllPQPDetailsForAM**'
+      - '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/pqp/pqp-details-for-am/{activityXid}
+        method: get
+
+getSuggestionsForAM:
+  handler: src/modules/minglaradmin/handlers/hosthub/onboarding/showSuggestionToAM.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/minglaradmin/handlers/hosthub/onboarding/showSuggestionToAM**'
+      - '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/onboarding/show-suggestion-to-am/{hostXid}
+        method: get

serverless/functions/pqq.yml

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

serverless/functions/prepopulate.yml

@@ -92,3 +92,18 @@ getFrequenciesOfActivity:
     - httpApi:
         path: /prepopulate/get-all-Frequencies
         method: get
+
+getAddActivityPrePopulate:
+  handler: src/modules/prepopulate/handlers/getAddActivityPrePopulate.handler
+  memorySize: 384
+  package:
+    patterns:
+      - 'src/modules/prepopulate/**'
+      - ${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: /prepopulate/get-add-activity-prepopulate
+        method: get

serverless/functions/user.yml

@@ -0,0 +1,349 @@
+# 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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/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: /user/activities/get-nearby-activities
+        method: get

serverless/patterns/base.yml

@@ -1,6 +1,9 @@
 # Base packaging patterns shared across all functions
 pattern1: 'src/common/**'
 pattern2: 'common/**'
-pattern3: 'node_modules/@prisma/client/**'
-pattern4: 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
+# REMOVED: Prisma is now provided by Lambda layer - DO NOT include in function packages
+# pattern3: 'node_modules/@prisma/client/**'
+# pattern4: 'node_modules/.prisma/client/libquery_engine-rhel-openssl-3.0.x.so.node'
+pattern3: '!node_modules/@prisma/**'
+pattern4: '!node_modules/.prisma/**'
 pattern5: '!node_modules/.prisma/client/libquery_engine*'

src/common/database/prisma.client.ts

@@ -1,11 +1,29 @@
 import { PrismaClient } from '@prisma/client';
 import { PrismaPg } from '@prisma/adapter-pg';
 
-const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
+// Singleton pattern for Prisma client - prevents "Too many database connections" error
+const globalForPrisma = globalThis as unknown as {
+  prisma: PrismaClient | undefined;
+};
 
-export const prisma = new PrismaClient({
-  adapter,
-  log: process.env.NODE_ENV === 'dev' ? ['query', 'info', 'warn', 'error'] : ['error'],
-});
+function createPrismaClient() {
+  const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
+  
+  return new PrismaClient({
+    adapter,
+    log: process.env.NODE_ENV === 'dev' ? ['query', 'info', 'warn', 'error'] : ['error'],
+  });
+}
+
+export const prisma = globalForPrisma.prisma ?? createPrismaClient();
+
+if (process.env.NODE_ENV !== 'production') {
+  globalForPrisma.prisma = prisma;
+}
+
+// For serverless environments, always cache the client
+if (process.env.IS_OFFLINE || process.env.AWS_LAMBDA_FUNCTION_NAME) {
+  globalForPrisma.prisma = prisma;
+}
 
 

src/common/database/prisma.lambda.service.ts

@@ -0,0 +1,5 @@
+// Re-export the singleton prisma client for Lambda handlers
+// This ensures all Lambda functions use the same cached connection
+import { prisma } from './prisma.client';
+
+export const prismaClient = prisma;

src/common/database/prisma.module.ts

@@ -1,5 +1,5 @@
 import { Global, Module } from '@nestjs/common';
-import { PrismaService } from './prisma.service';
+import { PrismaService } from './prisma.service'; // correct export location
 
 @Global()
 @Module({

src/common/database/prisma.service.ts

@@ -1,15 +1,13 @@
-import { Injectable, OnModuleInit, OnModuleDestroy, INestApplication } from '@nestjs/common';
+import { Injectable, OnModuleInit, OnModuleDestroy } from '@nestjs/common';
 import { PrismaClient } from '@prisma/client';
-import { PrismaPg } from '@prisma/adapter-pg';
+import { prisma } from './prisma.client';
 
 @Injectable()
 export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
   constructor() {
-    const adapter = new PrismaPg({ connectionString: process.env.DATABASE_URL });
-    super({
-      adapter,
-      log: process.env.NODE_ENV === 'dev' ? ['query', 'info', 'warn', 'error'] : ['error'],
-    });
+    super();
+    // Use the singleton instance
+    Object.assign(this, prisma);
   }
 
   async onModuleInit() {
@@ -19,10 +17,4 @@ export class PrismaService extends PrismaClient implements OnModuleInit, OnModul
   async onModuleDestroy() {
     await this.$disconnect();
   }
-
-  async enableShutdownHooks(app: INestApplication) {
-    process.on('beforeExit', async () => {
-      await app.close();
-    });
-  }
 }

src/common/middlewares/jwt/authForHost.ts

@@ -49,6 +49,17 @@ export async function verifyHostToken(token: string): Promise<{ id: number; role
       include: { role: true },
     });
 
+    const latestToken = await prisma.token.findFirst({
+      where: {
+        userXid: userId
+      },
+      orderBy: { id: 'desc' }
+    })
+
+    if (latestToken.isBlackListed == true) {
+      throw new ApiError(401, "This session is expired. Please login.")
+    }
+
     if (!user) {
       throw new ApiError(httpStatus.UNAUTHORIZED, 'User not found');
     }
@@ -104,12 +115,12 @@ const verifyCallback = async (
  */
 const authForHost =
   () =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    return new Promise((resolve, reject) => {
-      verifyCallback(req, resolve, reject);
-    })
-      .then(() => next())
-      .catch((err) => next(err));
-  };
+    async (req: Request, res: Response, next: NextFunction) => {
+      return new Promise((resolve, reject) => {
+        verifyCallback(req, resolve, reject);
+      })
+        .then(() => next())
+        .catch((err) => next(err));
+    };
 
 export default authForHost;

src/common/middlewares/jwt/authForMinglarAdmin.ts

@@ -49,6 +49,17 @@ export async function verifyMinglarAdminToken(token: string): Promise<{ id: numb
       include: { role: true },
     });
 
+    const latestToken = await prisma.token.findFirst({
+      where: {
+        userXid: userId
+      },
+      orderBy: { id: 'desc' }
+    })
+
+    if (latestToken.isBlackListed == true) {
+      throw new ApiError(401, "This session is expired. Please login.")
+    }
+
     if (!user) {
       throw new ApiError(httpStatus.UNAUTHORIZED, 'User not found');
     }
@@ -105,12 +116,12 @@ const verifyCallback = async (
  */
 const authForHost =
   () =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    return new Promise((resolve, reject) => {
-      verifyCallback(req, resolve, reject);
-    })
-      .then(() => next())
-      .catch((err) => next(err));
-  };
+    async (req: Request, res: Response, next: NextFunction) => {
+      return new Promise((resolve, reject) => {
+        verifyCallback(req, resolve, reject);
+      })
+        .then(() => next())
+        .catch((err) => next(err));
+    };
 
 export default authForHost;

src/common/middlewares/jwt/authForMinglarAdminHost.ts

@@ -51,6 +51,17 @@ export async function verifyMinglarAdminHostToken(token: string): Promise<{ id:
             include: { role: true },
         });
 
+        const latestToken = await prisma.token.findFirst({
+            where: {
+                userXid: userId
+            },
+            orderBy: { id: 'desc' }
+        })
+
+        if (latestToken.isBlackListed == true) {
+            throw new ApiError(401, "This session is expired. Please login.")
+        }
+
         if (!user) {
             throw new ApiError(httpStatus.UNAUTHORIZED, 'User not found');
         }

src/common/middlewares/jwt/authForOnlyMinglarAdmin.ts

@@ -49,6 +49,17 @@ export async function verifyOnlyMinglarAdminToken(token: string): Promise<{ id:
       include: { role: true },
     });
 
+    const latestToken = await prisma.token.findFirst({
+      where: {
+        userXid: userId
+      },
+      orderBy: { id: 'desc' }
+    })
+
+    if (latestToken.isBlackListed == true) {
+      throw new ApiError(401, "This session is expired. Please login.")
+    }
+
     if (!user) {
       throw new ApiError(httpStatus.UNAUTHORIZED, 'User not found');
     }
@@ -105,12 +116,12 @@ const verifyCallback = async (
  */
 const authForHost =
   () =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    return new Promise((resolve, reject) => {
-      verifyCallback(req, resolve, reject);
-    })
-      .then(() => next())
-      .catch((err) => next(err));
-  };
+    async (req: Request, res: Response, next: NextFunction) => {
+      return new Promise((resolve, reject) => {
+        verifyCallback(req, resolve, reject);
+      })
+        .then(() => next())
+        .catch((err) => next(err));
+    };
 
 export default authForHost;

src/common/middlewares/jwt/authForUser.ts

@@ -50,6 +50,17 @@ export async function verifyUserToken(token: string): Promise<{ id: number; role
       include: { role: true },
     });
 
+    const latestToken = await prisma.token.findFirst({
+      where: {
+        userXid: userId
+      },
+      orderBy: { id: 'desc' }
+    })
+
+    if (latestToken.isBlackListed == true) {
+      throw new ApiError(401, "This session is expired. Please login.")
+    }
+
     if (!user) {
       throw new ApiError(httpStatus.UNAUTHORIZED, 'User not found');
     }
@@ -105,12 +116,12 @@ const verifyCallback = async (
  */
 const authForHost =
   () =>
-  async (req: Request, res: Response, next: NextFunction) => {
-    return new Promise((resolve, reject) => {
-      verifyCallback(req, resolve, reject);
-    })
-      .then(() => next())
-      .catch((err) => next(err));
-  };
+    async (req: Request, res: Response, next: NextFunction) => {
+      return new Promise((resolve, reject) => {
+        verifyCallback(req, resolve, reject);
+      })
+        .then(() => next())
+        .catch((err) => next(err));
+    };
 
 export default authForHost;

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]
+`;

src/common/utils/constants/common.constant.ts

@@ -22,3 +22,8 @@ export const USER_STATUS = {
     DE_ACTIVATED: "De-activated",
     REJECTED: "Rejected"
 }
+
+export const RESTRICTION_NAME = {
+    ABOVE: "Above",
+    BELOW: "Below",
+}

src/common/utils/constants/host.constant.ts

@@ -1,72 +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
-}
-
-export const LAST_QUESTION_ID = {
-    Q_ID: 55
-}
+  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',
-    PQQ_FAILED: 'PQQ Failed',
-    PQQ_TO_UPDATE: 'PQ To Update',
-    PQQ_SUBMITTED: 'PQ Submitted'
-}
+  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',
-    PQQ_FAILED: 'PQQ Failed',
-    ENHANCING: 'Enchancing',
-    PQ_IN_REVIEW: 'PQ In Review'
-}
+  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',
-    PQQ_FAILED: 'PQQ Failed',
-    PQQ_REJECTED: 'PQ Rejected',
-    PQQ_TO_REVIEW: 'PQ To Review'
-}
+  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',
-    PQQ_FAILED: 'PQQ Failed',
-    ENHANCING: 'Enchancing',
-    NEW: 'New'
-}
+  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',
+};

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'
 };
 
@@ -25,23 +26,38 @@ export const MINGLAR_INVITATION_STATUS = {
   INVITED: 'Invited',
 };
 
-export const HOST_SUGGESTION_TITLES = {
-  COMPANY_DETAILS: 'Complete Details',
-  COMPANY_DOCUMENTATION: 'Company documentataion',
-  COMPANY_SOCIAL_PROOF: 'Social Proof',
-  ACTIVITY_INFORMATION: 'Activity Information',
-  ACTIVITY_LOCATION: 'Activity Location',
-  PICKUP_DROP_LOCATION: 'Pickup-Drop Location',
-  NUMBER_OF_PEOPLE: 'Number of People',
-  INCLUSION: 'Inclusion',
-  TAX_SETUP: 'Tax Setup',
-  ENERGY_LEVEL: 'Energy Level',
-  ELIGIBILITY_CRITERIA: 'Eligibility Criteria',
-  AMENITIES: 'Amenities',
-  EXLUSIVE_NOTES: 'Exclusive Notes',
-  CANCELLATION_POLICY: 'Cancellation Policy',
-  DOs_AND_DONTs: 'Do’s and Dont’s',
-  TIPS_FOR_USERS: 'Tips for Users',
-  SUSTAINABILITY: 'Sustainability',
-  TERMS_AND_CONDITION_FOR_USER: 'Terms and Conditions for User'
-};
+export const ACTIVITY_TRACK_TYPE = {
+  PQ: 'PQ',
+  ACTIVITY: 'Activity'
+}
+
+export const ACTIVITY_TRACK_STATUS = {
+  REJECTED_BY_AM: 'Rejected By AM',
+  ACCEPTED_BY_AM: 'Accepted By AM',
+  ENHANCING: 'Enhancing',
+  PQ_SUBMITTED: 'PQ Submitted',
+  UNDER_REVIEW:'Under Review',
+  SUBMITTED:'Activity Submitted',
+  DRAFT:'Activity Draft'
+}
+
+// export const HOST_SUGGESTION_TITLES = {
+//   COMPANY_DETAILS: 'Complete Details',
+//   COMPANY_DOCUMENTATION: 'Company documentataion',
+//   COMPANY_SOCIAL_PROOF: 'Social Proof',
+//   ACTIVITY_INFORMATION: 'Activity Information',
+//   ACTIVITY_LOCATION: 'Activity Location',
+//   PICKUP_DROP_LOCATION: 'Pickup-Drop Location',
+//   NUMBER_OF_PEOPLE: 'Number of People',
+//   INCLUSION: 'Inclusion',
+//   TAX_SETUP: 'Tax Setup',
+//   ENERGY_LEVEL: 'Energy Level',
+//   ELIGIBILITY_CRITERIA: 'Eligibility Criteria',
+//   AMENITIES: 'Amenities',
+//   EXLUSIVE_NOTES: 'Exclusive Notes',
+//   CANCELLATION_POLICY: 'Cancellation Policy',
+//   DOs_AND_DONTs: 'Do’s and Dont’s',
+//   TIPS_FOR_USERS: 'Tips for Users',
+//   SUSTAINABILITY: 'Sustainability',
+//   TERMS_AND_CONDITION_FOR_USER: 'Terms and Conditions for User'
+// };

src/common/utils/helper/resendOtpHelper.ts

@@ -12,7 +12,6 @@ export interface OtpResult {
 export async function resendOtpHelper(
   prisma: any,                            
   userId: number,
-  email: string,
   emailPurpose: "Register" | "Login" | "ForgotPassword",
   otpLength: 4 | 6 = 4,
   expiryMinutes: number = 5

src/common/utils/validation/host/addPaymentDetails.validation.ts

@@ -11,11 +11,6 @@ export const hostBankDetailsSchema = z.object({
     .nonempty("Account holder name is required")
     .min(2, { message: "Account holder name must be at least 2 characters" }),
 
-  ifscCode: z
-    .string()
-    .nonempty("IFSC code is required")
-    .regex(/^[A-Z]{4}0[A-Z0-9]{6}$/, { message: "Invalid IFSC code format" }),
-
   bankXid: z
     .number()
     .int({ message: "Bank ID must be an integer" })

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>;
+
+

src/common/utils/validation/host/hostCompanyDetails.validation.ts

@@ -2,31 +2,29 @@ import { z } from "zod";
 
 export const parentCompanySchema = z.object({
   companyName: z.string()
-    .min(1, "Parent company name is required")
-    .max(100, "Parent company name cannot exceed 100 characters"),
+    .max(100, "Parent company name cannot exceed 100 characters")
+    .optional(),
 
   address1: z.string()
-    .min(1, "Address1 is required")
-    .max(150, "Address1 cannot exceed 150 characters"),
+    .max(150, "Address1 cannot exceed 150 characters")
+    .optional(),
 
   address2: z.string()
     .max(150, "Address2 cannot exceed 150 characters")
     .optional(),
 
-  cityXid: z.number().min(1, "City is required"),
-  stateXid: z.number().min(1, "State is required"),
-  countryXid: z.number().min(1, "Country is required"),
+  cityXid: z.number().optional(),
+  stateXid: z.number().optional(),
+  countryXid: z.number().optional(),
 
   pinCode: z.string()
-    .min(4, "Pincode/Zipcode is required")
-    .max(30, "Pincode cannot exceed 30 characters"),
+    .max(30, "Pincode cannot exceed 30 characters")
+    .optional(),
 
   logoPath: z.string()
     .max(400, "Logo path cannot exceed 400 characters")
     .optional(),
 
-  isSubsidairy: z.boolean().optional(),
-
   registrationNumber: z.string()
     .max(30, "Registration number cannot exceed 30 characters")
     .optional(),
@@ -45,15 +43,15 @@ export const parentCompanySchema = z.object({
       message: "Formation date must be a valid date",
     }),
 
-  companyType: z.string()
-    .min(1, "Company type is required")
-    .max(30, "Company type cannot exceed 30 characters"),
+  companyTypeXid: z.number()
+    .optional(),
+
+  websiteUrl: z.string().nullable().optional(),
+  instagramUrl: z.string().nullable().optional(),
+  facebookUrl: z.string().nullable().optional(),
+  linkedinUrl: z.string().nullable().optional(),
+  twitterUrl: z.string().nullable().optional(),
 
-  websiteUrl: z.string().url().max(80, "Website URL cannot exceed 80 characters").optional(),
-  instagramUrl: z.string().url().max(80, "Instagram URL cannot exceed 80 characters").optional(),
-  facebookUrl: z.string().url().max(80, "Facebook URL cannot exceed 80 characters").optional(),
-  linkedinUrl: z.string().url().max(80, "LinkedIn URL cannot exceed 80 characters").optional(),
-  twitterUrl: z.string().url().max(80, "Twitter URL cannot exceed 80 characters").optional(),
 });
 
 
@@ -106,15 +104,20 @@ export const hostCompanyDetailsSchema = z.object({
       message: "Formation date must be a valid date",
     }),
 
-  companyType: z.string()
-    .min(1, "Company type is required")
-    .max(30, "Company type cannot exceed 30 characters"),
+  companyTypeXid: z.number()
+    .int("Company type must be a valid integer")
+    .min(1, "Company type is required"),
+
+
+  referencedBy: z.string()
+    .optional(),
+
+  websiteUrl: z.string().nullable().optional(),
+  instagramUrl: z.string().nullable().optional(),
+  facebookUrl: z.string().nullable().optional(),
+  linkedinUrl: z.string().nullable().optional(),
+  twitterUrl: z.string().nullable().optional(),
 
-  websiteUrl: z.string().url().max(50, "Website URL cannot exceed 50 characters").optional(),
-  instagramUrl: z.string().url().max(80, "Instagram URL cannot exceed 80 characters").optional(),
-  facebookUrl: z.string().url().max(80, "Facebook URL cannot exceed 80 characters").optional(),
-  linkedinUrl: z.string().url().max(80, "LinkedIn URL cannot exceed 80 characters").optional(),
-  twitterUrl: z.string().url().max(80, "Twitter URL cannot exceed 80 characters").optional(),
 
   parentCompany: parentCompanySchema.optional(),
 });

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>;

src/config/config.ts

@@ -81,6 +81,10 @@ const envVarsSchema = yup
 		DB_PORT: yup.number().default(3306).required('DB Port is required'),
 		//OTP Bypass
 		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_PQ: yup.string().required('Link to host panel pqp is required')
 	})
 	.noUnknown(true);
 
@@ -158,6 +162,9 @@ function getConfig() {
 			//Minglar admin
 			MinglarAdminEmail: envVars.MINGLAR_ADMIN_EMAIL,
 			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,

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({
+  navigationModeXid: z.number().int(),
+  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>;

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;
+// }

src/modules/host/dto/host.dto.ts

@@ -90,5 +90,6 @@ export class AddPaymentDetailsDTO {
     this.accountHolderName = accountHolderName;
     this.ifscCode = ifscCode;
     this.hostXid = hostXid;
+    this.currencyXid = currencyXid;
   }
 }

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,
+      }),
+    };
+  }
+);

src/modules/host/handlers/Activity_Hub/OnBoarding/createActivityAndAllQuestionsEntry.ts

@@ -0,0 +1,61 @@
+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);
+
+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 verifyHostToken(token);
+
+        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;
+
+        if (!activityTypeXid || !frequenciesXid) {
+            throw new ApiError(400, 'activityType and frequency ID is required');
+        }
+
+        // Get all host applications from service based on user role
+        const createdData = await hostService.createActivityAndAllQuestionsEntry(userInfo.id, activityTypeXid, frequenciesXid);
+
+        return {
+            statusCode: 200,
+            headers: {
+                'Content-Type': 'application/json',
+                'Access-Control-Allow-Origin': '*',
+            },
+            body: JSON.stringify({
+                success: true,
+                message: 'Activity created successfully',
+                data: createdData
+            }),
+        };
+    },
+);

src/modules/host/handlers/Activity_Hub/OnBoarding/getAllActivityType.ts

@@ -1,14 +1,13 @@
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 { PrePopulateService } from '../../../../prepopulate/services/prepopulate.service';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
-const prePopulateService = new PrePopulateService(prismaService);
+const hostService = new HostService(prismaClient);
+const prePopulateService = new PrePopulateService(prismaClient);
 
 /**
  * Add suggestion handler for host applications
@@ -26,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=)

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,
+        }),
+    };
+});

src/modules/host/handlers/Activity_Hub/OnBoarding/getAllHostActivity.ts

@@ -1,14 +1,13 @@
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 { string } from 'zod';
+import { paginationService } from '../../../../../common/utils/pagination/pagination.service';
 
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 
 /**
@@ -29,11 +28,18 @@ export const handler = safeHandler(async (
     // Verify token and get user info
     const userInfo = await verifyHostToken(token);
 
+    // Get pagination params from event
+    const paginationParams = paginationService.getPaginationFromEvent(event);
+    const paginationOptions = paginationService.parsePaginationParams(paginationParams);
 
     // Read optional search query (supports ?search= or ?q=)
     const search = event.queryStringParameters?.search || event.queryStringParameters?.q || undefined;
 
-    const data = await hostService.getAllHostActivity(search ? String(search) : undefined, Number(userInfo.id));
+    const result = await hostService.getAllHostActivity(
+        search ? String(search) : undefined,
+        Number(userInfo.id),
+        paginationOptions
+    );
     
 
     return {
@@ -45,8 +51,7 @@ export const handler = safeHandler(async (
         body: JSON.stringify({
             success: true,
             message: 'Data retrieved successfully',
-            data,
-
+            ...result,
         }),
     };
 });

src/modules/host/handlers/Activity_Hub/OnBoarding/getAllPQQwithSubmittedAns.ts

@@ -1,14 +1,11 @@
-import { verifyOnlyMinglarAdminToken } from '@/common/middlewares/jwt/authForOnlyMinglarAdmin';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { PrePopulateService } from '../../../../prepopulate/services/prepopulate.service';
 import { HostService } from '../../../services/host.service';
-import { verifyMinglarAdminHostToken } from '@/common/middlewares/jwt/authForMinglarAdmin&Host';
+import { verifyMinglarAdminHostToken } from '../../../../../common/middlewares/jwt/authForMinglarAdminHost';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export const handler = safeHandler(async (
     event: APIGatewayProxyEvent,
@@ -23,7 +20,15 @@ export const handler = safeHandler(async (
     // Authenticate user using the shared authForHost function
     await verifyMinglarAdminHostToken(token);
 
-    const result = await hostService.getAllPQQQuesAndSubmittedAns();
+    const activity_xid = event.queryStringParameters?.activity_xid
+        ? Number(event.queryStringParameters.activity_xid)
+        : null;
+
+    if (!activity_xid) {
+        throw new ApiError(409, "Activity ID is required")
+    }
+
+    const result = await hostService.getAllPQQQuesAndSubmittedAns(Number(activity_xid));
 
     return {
         statusCode: 200,

src/modules/host/handlers/Activity_Hub/OnBoarding/getPQQScore.ts

@@ -1,55 +1,42 @@
-import config from '@/config/config';
+import config from '../../../../../config/config';
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
 import AWS from 'aws-sdk';
 import Busboy from 'busboy';
 import crypto from 'crypto';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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';
-import { LAST_QUESTION_ID } from '@/common/utils/constants/host.constant';
 
-const prisma = new PrismaService();
-const pqqService = new HostService(prisma);
+const hostService = new HostService(prismaClient);
 
 const s3 = new AWS.S3({ region: config.aws.region });
 
-// Function to extract S3 key from URL
+// Extract S3 key from URL
 function getS3KeyFromUrl(url: string): string {
     const bucketBaseUrl = `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/`;
     return url.replace(bucketBaseUrl, '');
 }
 
-// Function to delete file from S3
+// Delete file from S3
 async function deleteFromS3(s3Key: string): Promise<void> {
     try {
         await s3.deleteObject({
             Bucket: config.aws.bucketName,
             Key: s3Key,
         }).promise();
-        console.log(`✅ File deleted from S3: ${s3Key}`);
-    } catch (error) {
-        console.error(`❌ Error deleting file from S3: ${s3Key}`, error);
-        // Don't throw error here, continue with upload
+        console.log(`✅ Deleted from S3: ${s3Key}`);
+    } catch (err) {
+        console.error(`❌ Failed to delete from S3: ${s3Key}`, err);
     }
 }
 
-async function uploadToS3(buffer: Buffer, mimeType: string, originalName: string, prefix: string, existingUrl?: string): Promise<string> {
-    let s3Key: string;
+// Upload new file
+async function uploadToS3(buffer: Buffer, mimeType: string, originalName: string, prefix: string): Promise<string> {
+    const uniqueKey = `${crypto.randomUUID()}_${originalName}`;
+    const s3Key = `${prefix}/${uniqueKey}`;
 
-    // If existing URL provided, use the same S3 key to replace the file
-    if (existingUrl) {
-        s3Key = getS3KeyFromUrl(existingUrl);
-        // Delete existing file first
-        await deleteFromS3(s3Key);
-    } else {
-        // Generate new unique key for new file
-        const uniqueKey = `${crypto.randomUUID()}_${originalName}`;
-        s3Key = `${prefix}/${uniqueKey}`;
-    }
-
-    // Upload new file (replaces existing if same key)
     await s3.upload({
         Bucket: config.aws.bucketName,
         Key: s3Key,
@@ -58,253 +45,160 @@ async function uploadToS3(buffer: Buffer, mimeType: string, originalName: string
         ACL: 'private'
     }).promise();
 
-    console.log(`✅ File uploaded to S3: ${s3Key}`);
+    console.log(`✅ Uploaded to S3: ${s3Key}`);
     return `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/${s3Key}`;
 }
 
 export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
     try {
-        // 1) Auth
+        // AUTH
         const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
-        if (!token) throw new ApiError(401, 'Missing token.');
+        if (!token) throw new ApiError(401, 'Missing token');
+
         const user = await verifyHostToken(token);
 
-        // 2) Content-Type check
+        // Content-Type
         const contentType = event.headers["content-type"] || event.headers["Content-Type"];
         if (!contentType?.startsWith("multipart/form-data"))
             throw new ApiError(400, "Content-Type must be multipart/form-data");
 
-        if (!event.isBase64Encoded)
-            throw new ApiError(400, "Body must be base64 encoded");
+        if (!event.isBase64Encoded) throw new ApiError(400, "Body must be base64 encoded");
 
         const bodyBuffer = Buffer.from(event.body!, "base64");
 
         const fields: any = {};
         const files: Array<{ buffer: Buffer; mimeType: string; fileName: string; fieldName: string }> = [];
 
-        // 3) Parse multipart data
+        // Parse multipart
         await new Promise<void>((resolve, reject) => {
             const bb = Busboy({ headers: { 'content-type': contentType } });
 
             bb.on('file', (fieldname, file, info) => {
                 const { filename, mimeType } = info;
-
-                // Skip if no filename (empty file field)
-                if (!filename) {
-                    file.resume();
-                    return;
-                }
+                if (!filename) return file.resume();
 
                 const chunks: Buffer[] = [];
-                let totalSize = 0;
-                const MAX_SIZE = 5 * 1024 * 1024; // 5 MB
+                let size = 0;
+
+                file.on('data', chunk => {
+                    size += chunk.length;
+                    if (size > 5 * 1024 * 1024)
+                        return reject(new ApiError(400, `File ${filename} exceeds 5MB limit`));
 
-                file.on('data', (chunk) => {
-                    totalSize += chunk.length;
-                    if (totalSize > MAX_SIZE) {
-                        file.resume();
-                        return reject(new ApiError(400, `File ${filename} exceeds 5MB limit.`));
-                    }
                     chunks.push(chunk);
                 });
 
                 file.on('end', () => {
-                    // Only add file if we have data
                     if (chunks.length > 0) {
                         files.push({
                             buffer: Buffer.concat(chunks),
                             mimeType,
                             fileName: filename,
-                            fieldName: fieldname,
+                            fieldName: fieldname
                         });
                     }
                 });
-
-                file.on('error', (err) => {
-                    reject(new ApiError(400, `File upload error: ${err.message}`));
-                });
             });
 
             bb.on('field', (fieldname, val) => {
-                // Handle empty or null values
-                if (val === '' || val === 'null' || val === 'undefined') {
-                    fields[fieldname] = null;
-                } else {
-                    try {
-                        fields[fieldname] = JSON.parse(val);
-                    } catch {
-                        fields[fieldname] = val;
-                    }
-                }
-            });
-
-            bb.on('close', () => {
-                console.log("✅ Busboy parsing completed");
-                console.log("📌 Fields:", fields);
-                console.log("📁 Files:", files.length);
-                resolve();
-            });
-
-            bb.on('error', (err) => {
-                console.error("❌ Busboy error:", err);
-                reject(new ApiError(400, `Multipart parsing error: ${err.message}`));
+                try { fields[fieldname] = JSON.parse(val); }
+                catch { fields[fieldname] = val; }
             });
 
+            bb.on('close', resolve);
+            bb.on('error', err => reject(new ApiError(400, err.message)));
             bb.end(bodyBuffer);
         });
 
-        // 4) Extract required fields - only activityXid, pqqQuestionXid, pqqAnswerXid are required
+        // Required fields
         const activityXid = Number(fields.activityXid);
         const pqqQuestionXid = Number(fields.pqqQuestionXid);
         const pqqAnswerXid = Number(fields.pqqAnswerXid);
-
-        // Comments and files are optional
         const comments = fields.comments || null;
 
-        // Validate required fields
-        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 (pqqQuestionXid !== LAST_QUESTION_ID.Q_ID) throw new ApiError(400, "Wrong question id.")
-        if (!pqqAnswerXid || isNaN(pqqAnswerXid)) throw new ApiError(400, "Valid pqqAnswerXid is required");
-
-        // console.log(`📝 Processing - Activity: ${activityXid}, Question: ${pqqQuestionXid}, Answer: ${pqqAnswerXid}`);
-        // console.log(`💬 Comments: ${comments ? 'Provided' : 'Not provided'}`);
-        // console.log(`📎 Files: ${files.length}`);
-
-        // 5) UPSERT: Check if header already exists for this combination
-        const existingHeader = await pqqService.findHeaderByCompositeKey(
-            activityXid,
-            pqqQuestionXid,
-            pqqAnswerXid
-        );
+        if (!activityXid || !pqqQuestionXid || !pqqAnswerXid)
+            throw new ApiError(400, "Missing required fields");
 
+        // UPSERT header
+        const existingHeader = await hostService.findHeaderByCompositeKey(activityXid, pqqQuestionXid);
         let header;
+
         if (existingHeader) {
-            console.log("🔄 Updating existing PQQ header");
-            // Update existing header (comments can be null)
-            header = await pqqService.updateHeader(
-                existingHeader.id,
-                comments
-            );
+            header = await hostService.updateHeader(existingHeader.id, pqqAnswerXid, comments);
         } else {
-            console.log("🆕 Creating new PQQ header");
-            // Create new header (comments can be null)
-            header = await pqqService.createHeader(
-                activityXid,
-                pqqQuestionXid,
-                pqqAnswerXid,
-                comments
-            );
+            header = await hostService.createHeader(activityXid, pqqQuestionXid, pqqAnswerXid, comments);
         }
-        // Calculate score after answer submission
-        const score = await pqqService.calculatePqqScoreForUser(activityXid);
 
+        // SCORE
+        const score = await hostService.calculatePqqScoreForUser(activityXid);
 
-        // 6) Get existing supporting files for this header
-        const existingSupportingFiles = await pqqService.getSupportingFilesByHeaderId(header.id);
-        console.log(`📁 Found ${existingSupportingFiles.length} existing supporting files`);
+        // Existing supporting files
+        const existingSupportingFiles = await hostService.getSupportingFilesByHeaderId(header.id);
 
-        // 7) Handle file UPSERT - only if files are provided
-        const uploadedFiles: any[] = [];
+        // Read deletedFiles from frontend
+        const deletedFiles = Array.isArray(fields.deletedFiles) ? fields.deletedFiles : [];
 
+        const deleteResults = [];
+        const addResults = [];
+
+        // DELETE explicitly requested files (Case 3)
+        if (deletedFiles.length > 0) {
+            for (const del of deletedFiles) {
+                const id = Number(del.id);
+                const record = existingSupportingFiles.find(f => f.id === id);
+                if (!record) continue;
+
+                // Delete from S3
+                if (record.mediaFileName) {
+                    const key = getS3KeyFromUrl(record.mediaFileName);
+                    await deleteFromS3(key);
+                }
+
+                // Delete from DB
+                await hostService.deleteSupportingFile(record.id);
+                deleteResults.push({ id: record.id, deleted: true });
+            }
+        }
+
+        // ADD new uploaded files (Case 1 + Case 3 new files)
         if (files.length > 0) {
-            console.log("📤 Processing file uploads...");
-
-            for (let i = 0; i < files.length; i++) {
-                const file = files[i];
-                const existingFile = existingSupportingFiles[i] || null;
-
+            for (const file of files) {
                 const url = await uploadToS3(
                     file.buffer,
                     file.mimeType,
                     file.fileName,
-                    `ActivityOnboarding/supportings/${activityXid}`,
-                    existingFile ? existingFile.mediaFileName : undefined
+                    `ActivityOnboarding/supportings/${activityXid}`
                 );
 
-                let supporting;
-                if (existingFile) {
-                    // Update existing supporting file record
-                    supporting = await pqqService.updateSupportingFile(
-                        existingFile.id,
-                        file.mimeType,
-                        url
-                    );
-                    console.log(`🔄 Updated supporting file: ${existingFile.id}`);
-                } else {
-                    // Create new supporting file record
-                    supporting = await pqqService.addSupportingFile(
-                        header.id,
-                        file.mimeType,
-                        url
-                    );
-                    console.log(`🆕 Created new supporting file: ${supporting.id}`);
-                }
-
-                uploadedFiles.push(supporting);
-            }
-
-            // 8) Delete any remaining existing files that weren't replaced
-            if (existingSupportingFiles.length > files.length) {
-                const filesToDelete = existingSupportingFiles.slice(files.length);
-                console.log(`🗑️ Deleting ${filesToDelete.length} unused supporting files`);
-
-                for (const fileToDelete of filesToDelete) {
-                    await pqqService.deleteSupportingFile(fileToDelete.id);
-                    // Also delete from S3
-                    const s3Key = getS3KeyFromUrl(fileToDelete.mediaFileName);
-                    await deleteFromS3(s3Key);
-                    console.log(`🗑️ Deleted supporting file: ${fileToDelete.id}`);
-                }
-            }
-        } else {
-            console.log("📭 No files provided in request");
-
-            // If no files provided but existing files exist, delete them (cleanup)
-            if (existingSupportingFiles.length > 0) {
-                console.log(`🗑️ No new files provided, deleting ${existingSupportingFiles.length} existing files`);
-                for (const fileToDelete of existingSupportingFiles) {
-                    await pqqService.deleteSupportingFile(fileToDelete.id);
-                    const s3Key = getS3KeyFromUrl(fileToDelete.mediaFileName);
-                    await deleteFromS3(s3Key);
-                    console.log(`🗑️ Deleted supporting file: ${fileToDelete.id}`);
-                }
+                const newRec = await hostService.addSupportingFile(header.id, file.mimeType, url);
+                addResults.push(newRec);
             }
         }
 
-        // 9) Prepare response
-        const responseMessage = existingHeader ? "PQQ answer updated successfully" : "PQQ answer submitted successfully";
+        const getAllUpdatedQuestionResponse = await hostService.getAllPQUpdatedResponse(activityXid)
+
+        // CASE 2 — NO deletion & NO new files => DO NOTHING to existing files
 
         return {
             statusCode: 200,
-            headers: {
-                "Content-Type": "application/json",
-                "Access-Control-Allow-Origin": "*"
-            },
+            headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" },
             body: JSON.stringify({
                 success: true,
-                message: responseMessage,
+                message: existingHeader ? "PQQ answer updated successfully" : "PQQ answer submitted successfully",
                 data: {
                     headerId: header.id,
                     activityXid,
                     pqqQuestionXid,
                     pqqAnswerXid,
-                    comments: comments,
+                    comments,
                     score,
-                    files: {
-                        uploaded: uploadedFiles,
-                        total: uploadedFiles.length
-                    },
-                    operation: existingHeader ? 'updated' : 'created',
-                    fileOperation: files.length > 0 ?
-                        (existingSupportingFiles.length > 0 ? 'replaced' : 'added') :
-                        (existingSupportingFiles.length > 0 ? 'removed' : 'unchanged')
+                    getAllUpdatedQuestionResponse
                 }
             })
         };
 
-    } catch (error: any) {
-        console.error("❌ Error in submitPqqAnswer:", error);
-        throw error;
+    } catch (err: any) {
+        console.error("❌ Error:", err);
+        throw err;
     }
 });

src/modules/host/handlers/Activity_Hub/OnBoarding/getPQQ_ByQuestionId.ts

@@ -1,13 +1,11 @@
+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 { PrismaService } from '../../../../../common/database/prisma.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
 import { HostService } from '../../../services/host.service';
-import { verifyMinglarAdminHostToken } from '@/common/middlewares/jwt/authForMinglarAdmin&Host';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 export const handler = safeHandler(async (
     event: APIGatewayProxyEvent,
     context?: Context

src/modules/host/handlers/Activity_Hub/OnBoarding/getPQQ_LastUpdatedQuestion.ts

@@ -1,12 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { HostService } from '../../../services/host.service';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 export const handler = safeHandler(async (
     event: APIGatewayProxyEvent,
     context?: Context
@@ -29,15 +28,18 @@ export const handler = safeHandler(async (
     if (!activity_xid || isNaN(activity_xid)) {
         throw new ApiError(400, "Activity id is required and must be a number.");
     }
+    let result = null;
 
     // Fetch user with their HostHeader stepper info
     const pqqQuestionDetails = await hostService.getLatestQuestionDetailsPQQ(activity_xid);
 
-    const result = {
-        pqqQuestionXid: pqqQuestionDetails.pqqQuestionXid,
-        pqqAnswerXid: pqqQuestionDetails.pqqAnswerXid,
-        pqqSubCategoryXid: pqqQuestionDetails.pqqQuestions.pqqSubCategoryXid,
-        categoryXid: pqqQuestionDetails.pqqQuestions.pqqSubCategories.categoryXid
+    if (pqqQuestionDetails) {
+        result = {
+            pqqQuestionXid: pqqQuestionDetails.pqqQuestionXid,
+            pqqAnswerXid: pqqQuestionDetails.pqqAnswerXid || null,
+            pqqSubCategoryXid: pqqQuestionDetails.pqqQuestions.pqqSubCategoryXid || null,
+            categoryXid: pqqQuestionDetails.pqqQuestions.pqqSubCategories.categoryXid || null
+        }
     }
 
     return {

src/modules/host/handlers/Activity_Hub/OnBoarding/saveActivity_ForPQQ.ts

@@ -1,51 +1,50 @@
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
-import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.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 prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+// 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,
+//     }),
+//   };
+// });

src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQAnswer.ts

@@ -0,0 +1,300 @@
+import config from '../../../../../config/config';
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import AWS from 'aws-sdk';
+import Busboy from 'busboy';
+import crypto from 'crypto';
+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';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+
+const hostService = new HostService(prismaClient);
+
+const s3 = new AWS.S3({ region: config.aws.region });
+
+// Function to extract S3 key from URL
+function getS3KeyFromUrl(url: string): string {
+    const bucketBaseUrl = `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/`;
+    return url.replace(bucketBaseUrl, '');
+}
+
+// Function to delete file from S3
+async function deleteFromS3(s3Key: string): Promise<void> {
+    try {
+        await s3.deleteObject({
+            Bucket: config.aws.bucketName,
+            Key: s3Key,
+        }).promise();
+        console.log(`✅ File deleted from S3: ${s3Key}`);
+    } catch (error) {
+        console.error(`❌ Error deleting file from S3: ${s3Key}`, error);
+        // continue — we don't want S3 deletion failure to crash the whole request
+    }
+}
+
+async function uploadToS3(buffer: Buffer, mimeType: string, originalName: string, prefix: string, existingUrl?: string): Promise<string> {
+    // We intentionally do NOT reuse old key. If existingUrl is provided we delete old file and create a new random key.
+    if (existingUrl) {
+        try {
+            const oldKey = getS3KeyFromUrl(existingUrl);
+            await deleteFromS3(oldKey);
+        } catch (err) {
+            console.warn('Warning deleting existingUrl before upload', err);
+        }
+    }
+
+    const uniqueKey = `${crypto.randomUUID()}_${originalName}`;
+    const s3Key = `${prefix}/${uniqueKey}`;
+
+    await s3.upload({
+        Bucket: config.aws.bucketName,
+        Key: s3Key,
+        Body: buffer,
+        ContentType: mimeType,
+        ACL: 'private'
+    }).promise();
+
+    console.log(`✅ File uploaded to S3: ${s3Key}`);
+    return `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/${s3Key}`;
+}
+
+export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
+    try {
+        // 1) Auth
+        const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+        if (!token) throw new ApiError(401, 'Missing token.');
+        const user = await verifyHostToken(token);
+
+        // 2) Content-Type check
+        const contentType = event.headers["content-type"] || event.headers["Content-Type"];
+        if (!contentType?.includes("multipart/form-data"))
+            throw new ApiError(400, "Content-Type must be multipart/form-data");
+
+        // 3) Body decoding
+        const bodyBuffer = event.isBase64Encoded
+            ? Buffer.from(event.body!, "base64")
+            : Buffer.from(event.body!, "binary");
+
+        const fields: any = {};
+        const files: Array<{ buffer: Buffer; mimeType: string; fileName: string; fieldName: string }> = [];
+
+        // 4) Parse multipart data
+        await new Promise<void>((resolve, reject) => {
+            const bb = Busboy({ headers: { 'content-type': contentType } });
+
+            bb.on('file', (fieldname, file, info) => {
+                const { filename, mimeType } = info;
+
+                if (!filename) {
+                    file.resume();
+                    return;
+                }
+
+                const chunks: Buffer[] = [];
+                let size = 0;
+                const MAX_SIZE = 5 * 1024 * 1024;
+
+                file.on("data", (chunk) => {
+                    size += chunk.length;
+                    if (size > MAX_SIZE) {
+                        file.destroy(new Error(`File ${filename} exceeds 5MB limit.`));
+                        return;
+                    }
+                    chunks.push(chunk);
+                });
+
+                file.on("end", () => {
+                    if (chunks.length > 0) {
+                        files.push({
+                            buffer: Buffer.concat(chunks),
+                            mimeType,
+                            fileName: filename,
+                            fieldName: fieldname,
+                        });
+                    }
+                });
+
+                file.on("error", (err) =>
+                    reject(new ApiError(400, `File upload error: ${err.message}`))
+                );
+            });
+
+            bb.on("field", (fieldname, val) => {
+                console.log(`FIELD RAW: ${fieldname} =`, val);
+                if (val === '' || val === 'null' || val === 'undefined') fields[fieldname] = null;
+                else {
+                    try {
+                        const cleaned = val.trim();
+
+                        // If it starts and ends with quotes, remove them
+                        const withoutQuotes =
+                            (cleaned.startsWith('"') && cleaned.endsWith('"'))
+                                ? cleaned.slice(1, -1)
+                                : cleaned;
+
+                        fields[fieldname] = JSON.parse(withoutQuotes);
+                    } catch {
+                        fields[fieldname] = val;
+                    }
+                }
+            });
+
+            bb.on("close", () => resolve());
+            bb.on("error", (err) =>
+                reject(new ApiError(400, `Multipart parsing error: ${err.message}`))
+            );
+
+            // IMPORTANT FIX for HTTP API
+            bb.write(bodyBuffer);
+            bb.end();
+        });
+
+        // 5) Extract required fields
+        const activityXid = Number(fields.activityXid);
+        const pqqQuestionXid = Number(fields.pqqQuestionXid);
+        const pqqAnswerXid = Number(fields.pqqAnswerXid);
+        const comments = fields.comments || null;
+
+        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(
+            activityXid,
+            pqqQuestionXid,
+        );
+
+        let header;
+        if (existingHeader) {
+            console.log("🔄 Updating existing PQQ header");
+            header = await hostService.updateHeader(
+                existingHeader.id,
+                pqqAnswerXid,
+                comments
+            );
+        } else {
+            console.log("🆕 Creating new PQQ header");
+            header = await hostService.createHeader(
+                activityXid,
+                pqqQuestionXid,
+                pqqAnswerXid,
+                comments
+            );
+        }
+
+        // 7) Get existing supporting files
+        const existingSupportingFiles = await hostService.getSupportingFilesByHeaderId(header.id);
+        console.log(`📁 Found ${existingSupportingFiles.length} existing supporting files`);
+
+        // 8) Parse incoming control fields
+        // fields.deletedFiles should be array like [{ id: number, url: string }, ...] or null
+        const deletedFiles: Array<{ id: number; url?: string }> = Array.isArray(fields.deletedFiles) ? fields.deletedFiles : [];
+        // fields.existingFiles can be an array of urls; we accept it but do not require it
+        const existingFilesFromFront: string[] = Array.isArray(fields.existingFiles) ? fields.existingFiles : [];
+
+        // Prepare response trackers
+        const deletedResults: Array<{ id: number; success: boolean; reason?: string }> = [];
+        const addedResults: Array<any> = [];
+
+        // 9) Handle explicit deletions (ONLY delete ids provided in deletedFiles)
+        if (deletedFiles.length > 0) {
+            console.log(`🗑️ Processing ${deletedFiles.length} explicit deletions`);
+            // Build a map of existing supporting files by id for quick lookup
+            const existingById = new Map<number, any>();
+            for (const f of existingSupportingFiles) {
+                existingById.set(f.id, f);
+            }
+
+            for (const del of deletedFiles) {
+                const id = Number(del.id);
+                if (!id || !existingById.has(id)) {
+                    deletedResults.push({ id, success: false, reason: 'Not found or invalid id' });
+                    continue;
+                }
+
+                const record = existingById.get(id);
+                try {
+                    // delete from s3
+                    if (record.mediaFileName) {
+                        const s3Key = getS3KeyFromUrl(record.mediaFileName);
+                        await deleteFromS3(s3Key);
+                    }
+
+                    // delete DB record
+                    await hostService.deleteSupportingFile(record.id);
+
+                    deletedResults.push({ id: record.id, success: true });
+                    console.log(`🗑️ Deleted supporting file record ${record.id}`);
+                } catch (err: any) {
+                    console.error(`❌ Failed to delete supporting file id ${id}`, err);
+                    deletedResults.push({ id, success: false, reason: err.message || 'delete failed' });
+                }
+            }
+        } else {
+            console.log('ℹ️ No explicit deletions requested (deletedFiles empty)');
+        }
+
+        // 10) Handle new uploaded files (these are ALWAYS added as new rows)
+        if (files.length > 0) {
+            console.log(`📤 Processing ${files.length} uploaded new file(s)`);
+            for (const file of files) {
+                try {
+                    const url = await uploadToS3(
+                        file.buffer,
+                        file.mimeType,
+                        file.fileName,
+                        `ActivityOnboarding/supportings/${activityXid}`
+                    );
+
+                    // create DB record
+                    const supporting = await hostService.addSupportingFile(
+                        header.id,
+                        file.mimeType,
+                        url
+                    );
+
+                    addedResults.push(supporting);
+                    console.log(`🆕 Created new supporting file record: ${supporting.id}`);
+                } catch (err: any) {
+                    console.error('❌ Error uploading/creating supporting file', err);
+                    // push failure result but continue processing other files
+                    addedResults.push({ success: false, reason: err.message || 'upload/create failed' });
+                }
+            }
+        } else {
+            console.log('📭 No new files uploaded in request');
+        }
+
+        // NOTE: We DO NOT delete or modify existing supporting files that were not listed in deletedFiles.
+        // This satisfies your Case 2: "if no files are provided, do not touch existing supporting files".
+
+        const allPQPQuestionAnswerResponse = await hostService.getAllPQUpdatedResponse(activityXid)
+
+        // 11) Compose response
+        const responseMessage = existingHeader ? "PQQ answer updated successfully" : "PQQ answer submitted successfully";
+
+        return {
+            statusCode: 200,
+            headers: {
+                "Content-Type": "application/json",
+                "Access-Control-Allow-Origin": "*"
+            },
+            body: JSON.stringify({
+                success: true,
+                message: responseMessage,
+                data: {
+                    responseOfUpdatedData: allPQPQuestionAnswerResponse,
+                    operation: existingHeader ? 'updated' : 'created',
+                    // summary label for UI convenience:
+                    fileOperation: (deletedResults.length > 0 || addedResults.length > 0) ? 'modified' : 'unchanged'
+                }
+            })
+        };
+
+    } catch (error: any) {
+        console.error("❌ Error in submitPqqAnswer:", error);
+        throw error;
+    }
+});

src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQForReview.ts

@@ -0,0 +1,40 @@
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { APIGatewayProxyEvent, APIGatewayProxyResult } 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 pqqService = new HostService(prismaClient);
+
+export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
+    try {
+        // 1) Auth
+        const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token'];
+        if (!token) throw new ApiError(401, 'Missing token.');
+        const user = await verifyHostToken(token);
+
+        const activity_xid = event.queryStringParameters?.activity_xid
+            ? Number(event.queryStringParameters.activity_xid)
+            : null;
+
+        await pqqService.submitpqqforreview(Number(activity_xid), Number(user.id))
+
+        return {
+            statusCode: 200,
+            headers: {
+                "Content-Type": "application/json",
+                "Access-Control-Allow-Origin": "*"
+            },
+            body: JSON.stringify({
+                success: true,
+                message: "Your PQQ has been submitted for review.",
+                data: null
+            })
+        };
+
+    } catch (error: any) {
+        console.error("❌ Error in submitPqqAnswer:", error);
+        throw error;
+    }
+});

src/modules/host/handlers/Activity_Hub/OnBoarding/submitPQQ_Answer.ts

@@ -1,16 +1,15 @@
-import config from '@/config/config';
+import config from '../../../../../config/config';
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
 import AWS from 'aws-sdk';
 import Busboy from 'busboy';
 import crypto from 'crypto';
-import { PrismaService } from '../../../../../common/database/prisma.service';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+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';
 
-const prisma = new PrismaService();
-const pqqService = new HostService(prisma);
+const pqqService = new HostService(prismaClient);
 
 const s3 = new AWS.S3({ region: config.aws.region });
 
@@ -30,34 +29,24 @@ async function deleteFromS3(s3Key: string): Promise<void> {
     console.log(`✅ File deleted from S3: ${s3Key}`);
   } catch (error) {
     console.error(`❌ Error deleting file from S3: ${s3Key}`, error);
-    // Don't throw error here, continue with upload
+    // continue — we don't want S3 deletion failure to crash the whole request
   }
 }
 
 async function uploadToS3(buffer: Buffer, mimeType: string, originalName: string, prefix: string, existingUrl?: string): Promise<string> {
-  let s3Key: string;
-
-  // If existing URL provided, use the same S3 key to replace the file
-  // if (existingUrl) {
-  //   s3Key = getS3KeyFromUrl(existingUrl);
-  //   // Delete existing file first
-  //   await deleteFromS3(s3Key);
-  // } else {
-  //   // Generate new unique key for new file
-  //   const uniqueKey = `${crypto.randomUUID()}_${originalName}`;
-  //   s3Key = `${prefix}/${uniqueKey}`;
-  // }
+  // We intentionally do NOT reuse old key. If existingUrl is provided we delete old file and create a new random key.
   if (existingUrl) {
-    // Delete old file, but DO NOT reuse its name
-    const oldKey = getS3KeyFromUrl(existingUrl);
-    await deleteFromS3(oldKey);
+    try {
+      const oldKey = getS3KeyFromUrl(existingUrl);
+      await deleteFromS3(oldKey);
+    } catch (err) {
+      console.warn('Warning deleting existingUrl before upload', err);
+    }
   }
 
-  // Create new key always
   const uniqueKey = `${crypto.randomUUID()}_${originalName}`;
-  s3Key = `${prefix}/${uniqueKey}`;
+  const s3Key = `${prefix}/${uniqueKey}`;
 
-  // Upload new file (replaces existing if same key)
   await s3.upload({
     Bucket: config.aws.bucketName,
     Key: s3Key,
@@ -82,7 +71,7 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
     if (!contentType?.includes("multipart/form-data"))
       throw new ApiError(400, "Content-Type must be multipart/form-data");
 
-    // 3) Body decoding (FIXED – same as addCompanyDetails)
+    // 3) Body decoding
     const bodyBuffer = event.isBase64Encoded
       ? Buffer.from(event.body!, "base64")
       : Buffer.from(event.body!, "binary");
@@ -90,7 +79,7 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
     const fields: any = {};
     const files: Array<{ buffer: Buffer; mimeType: string; fileName: string; fieldName: string }> = [];
 
-    // 4) Parse multipart data (FIXED – using bb.write + bb.end exactly like working lambda)
+    // 4) Parse multipart data
     await new Promise<void>((resolve, reject) => {
       const bb = Busboy({ headers: { 'content-type': contentType } });
 
@@ -152,41 +141,32 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       bb.end();
     });
 
-    // 4) Extract required fields - only activityXid, pqqQuestionXid, pqqAnswerXid are required
+    // 5) Extract required fields
     const activityXid = Number(fields.activityXid);
     const pqqQuestionXid = Number(fields.pqqQuestionXid);
     const pqqAnswerXid = Number(fields.pqqAnswerXid);
-
-    // Comments and files are optional
     const comments = fields.comments || null;
 
-    // Validate required fields
-    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");
 
-    // console.log(`📝 Processing - Activity: ${activityXid}, Question: ${pqqQuestionXid}, Answer: ${pqqAnswerXid}`);
-    // console.log(`💬 Comments: ${comments ? 'Provided' : 'Not provided'}`);
-    // console.log(`📎 Files: ${files.length}`);
-
-    // 5) UPSERT: Check if header already exists for this combination
+    // 6) UPSERT header
     const existingHeader = await pqqService.findHeaderByCompositeKey(
       activityXid,
       pqqQuestionXid,
-      pqqAnswerXid
     );
 
     let header;
     if (existingHeader) {
       console.log("🔄 Updating existing PQQ header");
-      // Update existing header (comments can be null)
       header = await pqqService.updateHeader(
         existingHeader.id,
+        pqqAnswerXid,
         comments
       );
     } else {
       console.log("🆕 Creating new PQQ header");
-      // Create new header (comments can be null)
       header = await pqqService.createHeader(
         activityXid,
         pqqQuestionXid,
@@ -195,79 +175,93 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       );
     }
 
-    // 6) Get existing supporting files for this header
+    // 7) Get existing supporting files
     const existingSupportingFiles = await pqqService.getSupportingFilesByHeaderId(header.id);
     console.log(`📁 Found ${existingSupportingFiles.length} existing supporting files`);
 
-    // 7) Handle file UPSERT - only if files are provided
-    const uploadedFiles: any[] = [];
+    // 8) Parse incoming control fields
+    // fields.deletedFiles should be array like [{ id: number, url: string }, ...] or null
+    const deletedFiles: Array<{ id: number; url?: string }> = Array.isArray(fields.deletedFiles) ? fields.deletedFiles : [];
+    // fields.existingFiles can be an array of urls; we accept it but do not require it
+    const existingFilesFromFront: string[] = Array.isArray(fields.existingFiles) ? fields.existingFiles : [];
 
+    // Prepare response trackers
+    const deletedResults: Array<{ id: number; success: boolean; reason?: string }> = [];
+    const addedResults: Array<any> = [];
+
+    // 9) Handle explicit deletions (ONLY delete ids provided in deletedFiles)
+    if (deletedFiles.length > 0) {
+      console.log(`🗑️ Processing ${deletedFiles.length} explicit deletions`);
+      // Build a map of existing supporting files by id for quick lookup
+      const existingById = new Map<number, any>();
+      for (const f of existingSupportingFiles) {
+        existingById.set(f.id, f);
+      }
+
+      for (const del of deletedFiles) {
+        const id = Number(del.id);
+        if (!id || !existingById.has(id)) {
+          deletedResults.push({ id, success: false, reason: 'Not found or invalid id' });
+          continue;
+        }
+
+        const record = existingById.get(id);
+        try {
+          // delete from s3
+          if (record.mediaFileName) {
+            const s3Key = getS3KeyFromUrl(record.mediaFileName);
+            await deleteFromS3(s3Key);
+          }
+
+          // delete DB record
+          await pqqService.deleteSupportingFile(record.id);
+
+          deletedResults.push({ id: record.id, success: true });
+          console.log(`🗑️ Deleted supporting file record ${record.id}`);
+        } catch (err: any) {
+          console.error(`❌ Failed to delete supporting file id ${id}`, err);
+          deletedResults.push({ id, success: false, reason: err.message || 'delete failed' });
+        }
+      }
+    } else {
+      console.log('ℹ️ No explicit deletions requested (deletedFiles empty)');
+    }
+
+    // 10) Handle new uploaded files (these are ALWAYS added as new rows)
     if (files.length > 0) {
-      console.log("📤 Processing file uploads...");
-
-      for (let i = 0; i < files.length; i++) {
-        const file = files[i];
-        const existingFile = existingSupportingFiles[i] || null;
-
-        const url = await uploadToS3(
-          file.buffer,
-          file.mimeType,
-          file.fileName,
-          `ActivityOnboarding/supportings/${activityXid}`,
-          existingFile ? existingFile.mediaFileName : undefined
-        );
-
-        let supporting;
-        if (existingFile) {
-          // Update existing supporting file record
-          supporting = await pqqService.updateSupportingFile(
-            existingFile.id,
+      console.log(`📤 Processing ${files.length} uploaded new file(s)`);
+      for (const file of files) {
+        try {
+          const url = await uploadToS3(
+            file.buffer,
             file.mimeType,
-            url
+            file.fileName,
+            `ActivityOnboarding/supportings/${activityXid}`
           );
-          console.log(`🔄 Updated supporting file: ${existingFile.id}`);
-        } else {
-          // Create new supporting file record
-          supporting = await pqqService.addSupportingFile(
+
+          // create DB record
+          const supporting = await pqqService.addSupportingFile(
             header.id,
             file.mimeType,
             url
           );
-          console.log(`🆕 Created new supporting file: ${supporting.id}`);
-        }
 
-        uploadedFiles.push(supporting);
-      }
-
-      // 8) Delete any remaining existing files that weren't replaced
-      if (existingSupportingFiles.length > files.length) {
-        const filesToDelete = existingSupportingFiles.slice(files.length);
-        console.log(`🗑️ Deleting ${filesToDelete.length} unused supporting files`);
-
-        for (const fileToDelete of filesToDelete) {
-          await pqqService.deleteSupportingFile(fileToDelete.id);
-          // Also delete from S3
-          const s3Key = getS3KeyFromUrl(fileToDelete.mediaFileName);
-          await deleteFromS3(s3Key);
-          console.log(`🗑️ Deleted supporting file: ${fileToDelete.id}`);
+          addedResults.push(supporting);
+          console.log(`🆕 Created new supporting file record: ${supporting.id}`);
+        } catch (err: any) {
+          console.error('❌ Error uploading/creating supporting file', err);
+          // push failure result but continue processing other files
+          addedResults.push({ success: false, reason: err.message || 'upload/create failed' });
         }
       }
     } else {
-      console.log("📭 No files provided in request");
-
-      // If no files provided but existing files exist, delete them (cleanup)
-      if (existingSupportingFiles.length > 0) {
-        console.log(`🗑️ No new files provided, deleting ${existingSupportingFiles.length} existing files`);
-        for (const fileToDelete of existingSupportingFiles) {
-          await pqqService.deleteSupportingFile(fileToDelete.id);
-          const s3Key = getS3KeyFromUrl(fileToDelete.mediaFileName);
-          await deleteFromS3(s3Key);
-          console.log(`🗑️ Deleted supporting file: ${fileToDelete.id}`);
-        }
-      }
+      console.log('📭 No new files uploaded in request');
     }
 
-    // 9) Prepare response
+    // NOTE: We DO NOT delete or modify existing supporting files that were not listed in deletedFiles.
+    // This satisfies your Case 2: "if no files are provided, do not touch existing supporting files".
+
+    // 11) Compose response
     const responseMessage = existingHeader ? "PQQ answer updated successfully" : "PQQ answer submitted successfully";
 
     return {
@@ -284,15 +278,15 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
           activityXid,
           pqqQuestionXid,
           pqqAnswerXid,
-          comments: comments,
+          comments,
           files: {
-            uploaded: uploadedFiles,
-            total: uploadedFiles.length
+            added: addedResults,
+            deleted: deletedResults,
+            existingKeptCount: (existingSupportingFiles.length - deletedResults.filter(d => d.success).length)
           },
           operation: existingHeader ? 'updated' : 'created',
-          fileOperation: files.length > 0 ?
-            (existingSupportingFiles.length > 0 ? 'replaced' : 'added') :
-            (existingSupportingFiles.length > 0 ? 'removed' : 'unchanged')
+          // summary label for UI convenience:
+          fileOperation: (deletedResults.length > 0 || addedResults.length > 0) ? 'modified' : 'unchanged'
         }
       })
     };

src/modules/host/handlers/Activity_Hub/OnBoarding/updateSuggestionAsReviewed.ts

@@ -1,12 +1,11 @@
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,

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
+        }),
+    };
+});

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',
+        }),
+    };
+});

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',
+        },
+      },
+    }),
+  };
+});

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,
+        }),
+    };
+});

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,
+      }),
+    };
+  },
+);

src/modules/host/handlers/Host_Admin/onboarding/acceptAggrement.ts

@@ -1,12 +1,11 @@
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 /**
  * Add suggestion handler for host applications

src/modules/host/handlers/Host_Admin/onboarding/createPassword.ts

@@ -1,12 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { HostService } from '../../../services/host.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,

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,
+    }),
+  };
+});

src/modules/host/handlers/Host_Admin/onboarding/login.ts

@@ -1,15 +1,13 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { HostService } from '../../../services/host.service';
 import { TokenService } from '../../../services/token.service';
 import { GetHostLoginResponseDTO } from '../../../dto/host.dto';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import * as bcrypt from 'bcryptjs';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
-const tokenService = new TokenService(prismaService);
+const hostService = new HostService(prismaClient);
+const tokenService = new TokenService(prismaClient);
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,
@@ -30,7 +28,9 @@ export const handler = safeHandler(async (
     throw new ApiError(400, 'Email and password are required');
   }
 
-  const loginForHost = await hostService.loginForHost(emailAddress, userPassword);
+  const emailToLowerCase = emailAddress.toLowerCase()
+
+  const loginForHost = await hostService.loginForHost(emailToLowerCase, userPassword);
 
   if (!loginForHost) {
     throw new ApiError(400, 'Failed to login');
@@ -40,15 +40,6 @@ export const handler = safeHandler(async (
     throw new ApiError(401, 'Invalid credentials');
   }
 
-  const matchPassword = await bcrypt.compare(
-    userPassword,
-    loginForHost.userPassword
-  );
-
-  if (!matchPassword) {
-    throw new ApiError(401, 'Invalid credentials');
-  }
-
   const generateTokenForHost = await tokenService.generateAuthToken(
     loginForHost.id
   );

src/modules/host/handlers/Host_Admin/onboarding/showSuggestion.ts

@@ -1,12 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { MinglarService } from '../../../../minglaradmin/services/minglar.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 /**
  * Get suggestions handler

src/modules/host/handlers/Host_Admin/onboarding/signUp.ts

@@ -1,16 +1,15 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import * as bcrypt from 'bcryptjs';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
+import { ROLE } from '../../../../../common/utils/constants/common.constant';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import * as bcrypt from 'bcryptjs';
-import { OtpGeneratorSixDigit } from '../../../../../common/utils/helper/OtpGenerator';
 import { encryptUserId } from '../../../../../common/utils/helper/CodeGenerator';
+import { OtpGeneratorSixDigit } from '../../../../../common/utils/helper/OtpGenerator';
 import { HostService } from '../../../services/host.service';
-import { sendOtpEmailForHost } from '../../../services/sendOTPEmail.service';
-import { ROLE } from '../../../../../common/utils/constants/common.constant';
+import { sendOtpEmailForHost } from '@/modules/host/services/sendOTPEmail.service';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export async function generateHostRefNumber(tx: any) {
   const lastrecord = await tx.user.findFirst({
@@ -24,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 (
@@ -46,10 +45,12 @@ export const handler = safeHandler(async (
     throw new ApiError(400, 'Email is required');
   }
 
+  const emailToLowerCase = email.toLowerCase()
+
   // Use a single transaction for user creation/lookup and OTP storage
-  const transactionResult = await prismaService.$transaction(async (tx) => {
+  const transactionResult = await prismaClient.$transaction(async (tx) => {
     const user = await tx.user.findUnique({
-      where: { emailAddress: email },
+      where: { emailAddress: emailToLowerCase },
       select: { emailAddress: true, id: true, userPassword: true },
     });
 
@@ -67,7 +68,7 @@ export const handler = safeHandler(async (
     } else {
       // create new user record within the transaction
       newUserLocal = await tx.user.create({
-        data: { emailAddress: email, roleXid: ROLE.HOST, userRefNumber: referenceNumber },
+        data: { emailAddress: emailToLowerCase, roleXid: ROLE.HOST, userRefNumber: referenceNumber },
       });
     }
 
@@ -102,7 +103,7 @@ export const handler = safeHandler(async (
   }
 
   // Send OTP email outside the DB transaction
-  // await sendOtpEmailForHost(transactionResult.newUser.emailAddress, transactionResult.otp);
+  await sendOtpEmailForHost(transactionResult.newUser.emailAddress, transactionResult.otp);
 
   return {
     statusCode: 200,

src/modules/host/handlers/Host_Admin/onboarding/submitCompanyDetails.ts

@@ -1,10 +1,10 @@
 // modules/host/handlers/addCompanyDetails.ts
-import config from '@/config/config';
+import config from '../../../../../config/config';
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
 import AWS from 'aws-sdk';
 import Busboy from 'busboy';
-import { PrismaService } from '../../../../../common/database/prisma.service';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
+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 {
@@ -15,8 +15,17 @@ import {
 import { HostService } from '../../../services/host.service';
 import { sendEmailToAM, sendEmailToMinglarAdmin } from '../../../services/sendHostResubmitEmailToAM.service';
 
-const prisma = new PrismaService();
-const hostService = new HostService(prisma);
+const hostService = new HostService(prismaClient);
+
+function getExtensionFromMime(mimeType: string) {
+  const map: Record<string, string> = {
+    'image/jpeg': 'jpg',
+    'image/png': 'png',
+    'application/pdf': 'pdf',
+    'image/webp': 'webp',
+  };
+  return map[mimeType] || 'bin';
+}
 
 const s3 = new AWS.S3({
   region: config.aws.region,
@@ -50,6 +59,25 @@ function cleanEmptyStrings(obj: any) {
   return cleaned;
 }
 
+function getS3KeyFromUrl(url: string): string {
+  const base = `https://${config.aws.bucketName}.s3.${config.aws.region}.amazonaws.com/`;
+  return url.replace(base, "");
+}
+
+async function deleteFromS3(key: string) {
+  try {
+    await s3.deleteObject({
+      Bucket: config.aws.bucketName,
+      Key: key
+    }).promise();
+
+    console.log("✅ Deleted from S3:", key);
+  } catch (err) {
+    console.error("❌ Failed to delete from S3:", key, err);
+  }
+}
+
+
 export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
   try {
 
@@ -112,6 +140,9 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       bb.end();
     });
 
+    const deletedFiles = normalizeJsonField(fields, "deletedFiles") || [];
+    const parentDeletedFiles = normalizeJsonField(fields, "parentDeletedFiles") || [];
+
     /** 4) Extract and clean isDraft flag */
     const isDraft = fields.isDraft === 'true' || fields.isDraft === true;
 
@@ -128,13 +159,22 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       }
     }
 
+    if (
+      companyDetailsRaw.parentCompany &&
+      Object.values(companyDetailsRaw.parentCompany).every(
+        (v) => v === undefined || v === null
+      )
+    ) {
+      companyDetailsRaw.parentCompany = null;
+    }
+
     /** 6) Profile update if provided */
     if (fields.userProfile) {
       const userProfileRaw = normalizeJsonField(fields, 'userProfile');
       if (userProfileRaw) {
         const { firstName, lastName, mobileNumber } = userProfileRaw;
 
-        await prisma.user.update({
+        await prismaClient.user.update({
           where: { id: userInfo.id },
           data: {
             ...(firstName && { firstName }),
@@ -178,13 +218,8 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       const file = files.find((f) => f.fieldName === doc.fieldName);
 
       // In DRAFT mode → allow missing documents
-      if (isDraft && !file) {
-        return { ...doc, file: null };
-      }
-
-      // In FINAL mode → file must exist
       if (!file) {
-        throw new ApiError(400, `File not found for field: ${doc.fieldName}`);
+        return { ...doc, file: null };
       }
 
       return { ...doc, file };
@@ -213,9 +248,65 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
       parsedParentCompany = parsedCompany.parentCompany || null;
     }
 
+    /** 9.5) DELETE DOCUMENTS IF REQUESTED **/
+    if (Array.isArray(deletedFiles) && deletedFiles.length > 0) {
+      console.log(`🗑️ Deleting ${deletedFiles.length} documents...`);
+
+      for (const del of deletedFiles) {
+        const id = Number(del.id);
+        const url = del.url;
+
+        if (!id || !url) {
+          console.log("❌ Invalid delete entry:", del);
+          continue;
+        }
+
+        // Extract S3 key
+        const s3Key = getS3KeyFromUrl(url);
+
+        // Delete from S3
+        await deleteFromS3(s3Key);
+
+        // Delete from DB
+        await prismaClient.hostDocuments.delete({
+          where: { id }
+        });
+
+        console.log(`🗑️ Deleted host document ID ${id}`);
+      }
+    }
+
+    /** 9.6) DELETE PARENT DOCUMENTS **/
+    if (parsedCompany.isSubsidairy && Array.isArray(parentDeletedFiles) && parentDeletedFiles.length > 0) {
+      console.log(`🗑️ Deleting ${parentDeletedFiles.length} PARENT documents...`);
+
+      for (const del of parentDeletedFiles) {
+        const id = Number(del.id);
+        const url = del.url;
+
+        if (!id || !url) {
+          console.log("⚠️ Invalid parent delete entry:", del);
+          continue;
+        }
+
+        const s3Key = getS3KeyFromUrl(url);
+
+        // Delete S3
+        await deleteFromS3(s3Key);
+
+        // Delete DB
+        await prismaClient.hostParenetDocuments.delete({
+          where: { id }
+        });
+
+        console.log(`🗑️ Deleted PARENT document ID ${id}`);
+      }
+    }
+
     /** 11) UPLOAD DOCUMENTS */
     async function uploadToS3(buffer, mimeType, originalName, folderType, documentTypeXid?, fieldName?) {
-      const ext = originalName.split('.').pop() || 'jpg';
+      // const ext = originalName.split('.').pop() || 'jpg';
+      const ext = getExtensionFromMime(mimeType);
 
       let s3Key = '';
 
@@ -249,7 +340,7 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
     /** Upload host docs */
     const uploadedHostDocs: Array<any> = [];
     for (const doc of hostDocs) {
-      if (isDraft && !doc.file) continue;
+      if (!doc.file) continue;
 
       const path = await uploadToS3(
         doc.file.buffer,
@@ -270,7 +361,7 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
     /** Upload parent docs */
     const uploadedParentDocs: Array<any> = [];
     for (const doc of parentDocs) {
-      if (!doc.file && isDraft) continue; // skip missing files in draft mode
+      if (!doc.file) continue; // skip missing files in draft mode
 
       const path = await uploadToS3(
         doc.file.buffer,
@@ -289,31 +380,67 @@ export const handler = safeHandler(async (event: APIGatewayProxyEvent): Promise<
     }
 
     /** UPLOAD LOGO (if provided) */
-    const logoFile = files.find((f) => f.fieldName === 'companyLogo' || f.fieldName === 'companyLogoFile');
-    if (logoFile) {
-      const logoUrl = await uploadToS3(logoFile.buffer, logoFile.mimeType, logoFile.fileName, 'logo');
+    const logoFile = files.find(
+      (f) => f.fieldName === 'companyLogo' || f.fieldName === 'companyLogoFile'
+    );
+
+    if (logoFile && logoFile.buffer && logoFile.fileName) {
+      const logoUrl = await uploadToS3(
+        logoFile.buffer,
+        logoFile.mimeType,
+        logoFile.fileName,
+        'logo'
+      );
       parsedCompany.logoPath = logoUrl;
     }
 
     /** UPLOAD PARENT COMPANY LOGO (if provided) */
-    const parentLogoFile = files.find((f) => f.fieldName === 'parentCompanyLogo');
-    if (parentLogoFile) {
+    const parentLogoFile = files.find(
+      (f) => f.fieldName === 'parentCompanyLogo'
+    );
+
+    if (parentLogoFile && parentLogoFile.buffer && parentLogoFile.mimeType) {
+      // 🔒 Only upload when an actual file is present
       const parentLogoUrl = await uploadToS3(
         parentLogoFile.buffer,
         parentLogoFile.mimeType,
-        parentLogoFile.fileName,
+        parentLogoFile.fileName, // safe here because it's a real file
         'parent_company_logo',
       );
 
       if (parsedParentCompany) {
         parsedParentCompany.logoPath = parentLogoUrl;
       } else {
-        // if no parent object exists yet (drafts or other flows), attach it safely
-        parsedParentCompany = parsedParentCompany || {};
-        parsedParentCompany.logoPath = parentLogoUrl;
+        parsedParentCompany = {
+          logoPath: parentLogoUrl,
+        };
       }
     }
 
+    if (parsedCompany.cityXid) {
+      const city = await prismaClient.cities.findUnique({
+        where: { id: Number(parsedCompany.cityXid) }
+      });
+      if (!city) {
+        throw new ApiError(400, `City with ID ${parsedCompany.cityXid} not found`);
+      }
+    }
+
+    if (!parsedCompany.isSubsidairy) {
+      const parentDocuments = await hostService.getParentDocumentsByHostId(userInfo.id);
+      if (parentDocuments.length > 0) {
+        for (const doc of parentDocuments) {
+          try {
+            const s3Key = getS3KeyFromUrl(doc.filePath);
+            await deleteFromS3(s3Key);
+          } catch (e) {
+            console.error("S3 delete failed:", doc.filePath, e);
+          }
+        }
+      }
+      await hostService.deleteExistingParentRecords(userInfo.id)
+    }
+
     /** 12) SAVE / UPDATE HOST ENTRY */
     const createdOrUpdated = await hostService.addOrUpdateCompanyDetails(
       userInfo.id,

src/modules/host/handlers/Host_Admin/onboarding/updateBankDetails.ts

@@ -1,13 +1,12 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { HostService } from '../../../services/host.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '@/common/middlewares/jwt/authForHost';
-import { hostBankDetailsSchema } from '@/common/utils/validation/host/addPaymentDetails.validation';
+import { verifyHostToken } from '../../../../../common/middlewares/jwt/authForHost';
+import { hostBankDetailsSchema } from '../../../../../common/utils/validation/host/addPaymentDetails.validation';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export const handler = safeHandler(async (
     event: APIGatewayProxyEvent,
@@ -33,7 +32,7 @@ export const handler = safeHandler(async (
     }
 
     // Parse request body
-    let body: { bankXid?: number; bankBranchXid?: number; accountNumber?: string; confirmAccountNumber?: string; accountHolderName?: string; ifscCode?: string; currencyXid?: number };
+    let body: { bankXid?: number; bankBranchXid?: number; accountNumber?: string; confirmAccountNumber?: string; accountHolderName?: string; currencyXid?: number };
 
     try {
         body = event.body ? JSON.parse(event.body) : {};
@@ -44,7 +43,7 @@ export const handler = safeHandler(async (
     // ✅ Validate payload using Zod
     const validationResult = hostBankDetailsSchema.safeParse({
         ...(body as object),
-        hostXid: host.id, // inject hostId from token (not from user input)
+        hostXid: host.host.id, // inject hostId from token (not from user input)
     });
 
     if (!validationResult.success) {
@@ -54,7 +53,16 @@ export const handler = safeHandler(async (
 
     const validatedData = validationResult.data;
 
-    await hostService.addPaymentDetails(validatedData);
+    // Fetch IFSC code from bank branch
+    const bankBranch = await hostService.getBankBranchById(validatedData.bankBranchXid);
+    if (!bankBranch) {
+        throw new ApiError(404, 'Bank branch not found');
+    }
+
+    await hostService.addPaymentDetails({
+        ...validatedData,
+        ifscCode: bankBranch.ifscCode,
+    });
 
     return {
         statusCode: 200,

src/modules/host/handlers/Host_Admin/onboarding/verifyOTP.ts

@@ -1,13 +1,12 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { HostService } from '../../../services/host.service';
 import ApiError from '../../../../../common/utils/helper/ApiError';
 import { TokenService } from '../../../services/token.service';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
-const tokenService = new TokenService(prismaService);
+const hostService = new HostService(prismaClient);
+const tokenService = new TokenService(prismaClient);
 
 export const handler = safeHandler(async (
     event: APIGatewayProxyEvent,
@@ -28,8 +27,10 @@ export const handler = safeHandler(async (
         throw new ApiError(400, 'Email and OTP are required');
     }
 
-    await hostService.verifyHostOtp(email, otp);
-    const user = await hostService.getHostByEmail(email);
+    const emailToLowerCase = email.toLowerCase();
+
+    await hostService.verifyHostOtp(emailToLowerCase, otp);
+    const user = await hostService.getHostByEmail(emailToLowerCase);
     const generateTokenForHost = await tokenService.generateAuthToken(
         user.id
     );

src/modules/host/handlers/getStepper.ts

@@ -1,12 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
 import { safeHandler } from '../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../common/database/prisma.service';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
 import ApiError from '../../../common/utils/helper/ApiError';
 import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
 import { HostService } from '../services/host.service';
 
-const prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,
   context?: Context
@@ -26,11 +25,7 @@ export const handler = safeHandler(async (
   }
 
   // Fetch user with their HostHeader stepper info
-  const host = await hostService.getHostById(userId);
-
-  if (!host) {
-    throw new ApiError(404, 'Host record not found');
-  }
+  const host = await hostService.getHostIdByUserXid(userId);
 
   return {
     statusCode: 200,
@@ -42,7 +37,8 @@ export const handler = safeHandler(async (
       success: true,
       message: 'Stepper information retrieved successfully',
       data: {
-        stepper: host.stepper,
+        stepper: host?.host?.stepper || null,
+        emailAddress: host.user?.emailAddress || null,
       },
     }),
   };

src/modules/host/handlers/getbyidhandler.ts

@@ -1,12 +1,11 @@
-import { verifyMinglarAdminHostToken } from '@/common/middlewares/jwt/authForMinglarAdmin&Host';
+import { verifyMinglarAdminHostToken } from '../../../common/middlewares/jwt/authForMinglarAdminHost';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../common/database/prisma.service';
+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 prismaService = new PrismaService();
-const hostService = new HostService(prismaService);
+const hostService = new HostService(prismaClient);
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,
@@ -14,7 +13,7 @@ export const handler = safeHandler(async (
 ): Promise<APIGatewayProxyResult> => {
   // Get host ID from path parameters
   const token = event.headers['x-auth-token'] || event.headers['X-Auth-Token']
-  if(!token) {
+  if (!token) {
     throw new ApiError(400, 'This is a protected route. Please provide a valid token.');
   }
 

src/modules/host/handlers/host.ts

@@ -1,8 +1,8 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaClient } from '@prisma/client';
 import { safeHandler } from '../../../common/utils/handlers/safeHandler';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
 
-const prisma = new PrismaClient();
+const prisma = prismaClient;
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent
@@ -11,7 +11,6 @@ export const handler = safeHandler(async (
   const result = await prisma.hostHeader.findMany({
     select: {
       hostParent: true,
-      hostRefNumber: true,
       hostStatusDisplay: true,
       accountManager: true,
     },

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),
+  };
+}

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),
+    };
+}

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),
+  };
+}

src/modules/host/handlers/resendOtp.ts

@@ -1,11 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
-import { PrismaService } from "../../../common/database/prisma.service";
+import { prismaClient } from "../../../common/database/prisma.lambda.service";
 import { safeHandler } from "../../../common/utils/handlers/safeHandler";
 import ApiError from "../../../common/utils/helper/ApiError";
 import { resendOtpHelper } from "../../../common/utils/helper/resendOtpHelper";
 import { resendOtpEmail } from "../services/resendOTPEmail.service";
 
-const prisma = new PrismaService();
+const prisma = prismaClient;
 
 // allowed purposes
 const ALLOWED_PURPOSES = ["Register", "Login", "ForgotPassword"] as const;
@@ -41,9 +41,11 @@ export const handler = safeHandler(
     const email = (body.email || "").trim();
     if (!email) throw new ApiError(400, "Email is required");
 
+    const emailToLowerCase = email.toLowerCase();
+
     // find user (you can adapt the isActive / userStatus checks per your rules)
     const user = await prisma.user.findUnique({
-      where: { emailAddress: email, isActive: true },
+      where: { emailAddress: emailToLowerCase, isActive: true },
       select: { id: true, emailAddress: true, role: true },
     });
 
@@ -56,7 +58,6 @@ export const handler = safeHandler(
     const otpResult = await resendOtpHelper(
       prisma,
       user.id,
-      user.emailAddress,
       purpose,
       6, // 6-digit OTP
       5  // expires in 5 minutes

src/modules/host/services/activityScheduling.service.ts

@@ -0,0 +1,740 @@
+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 } }],
+      },
+      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,
+      },
+    });
+  }
+}

src/modules/host/services/resendOTPEmail.service.ts

@@ -15,8 +15,8 @@ export async function resendOtpEmail(
   const htmlContent = `
     <p>Dear ${role},</p>
     <p>Your new OTP is: <strong>${otp}</strong></p>
-    <p>This code is valid for 5 minutes. Please do not share it with anyone.</p>
-    <p>Best regards,<br/>Minglar Team</p>
+    <p>This code will be valid for the next 5 minutes.</p>
+    <p>Warm regards,<br/>Minglar Team</p>
   `;
 
   try {

src/modules/host/services/sendOTPEmail.service.ts

@@ -13,9 +13,10 @@ export async function sendOtpEmailForHost(
 
   const htmlContent = `
     <p>Dear Host,</p>
-    <p>Your OTP for registration is: <strong>${otp}</strong></p>
-    <p>This code is valid for 5 minutes. Please do not share it with anyone.</p>
-    <p>Best regards,<br/>Minglar Team</p>
+    <p>You’re almost all set! 🎉</p>
+    <p>Enter <strong>${otp}</strong> to wrap your registration.</p>
+    <p>This code will be valid for the next 5 minutes.</p>
+    <p>Warm regards,<br/>Minglar Team</p>
   `;
 
   try {

src/modules/host/services/token.service.ts

@@ -1,10 +1,10 @@
-import { PrismaService } from "../../../common/database/prisma.service";
+import { PrismaClient } from '@prisma/client';
 import jwt, { JwtPayload } from "jsonwebtoken";
 import moment from "moment";
 import config from "../../../config/config";
 
 export class TokenService {
-  constructor(private readonly prisma: PrismaService = new PrismaService()) {}
+  constructor(private prisma: PrismaClient) { }
 
   private generateToken(
     user_xid: number,
@@ -53,6 +53,10 @@ export class TokenService {
       config.jwt.secret
     );
 
+    await this.prisma.token.deleteMany({
+      where: { userXid: user_xid }
+    })
+
     await this.prisma.token.create({
       data: {
         token: refreshToken.token,
@@ -100,6 +104,10 @@ export class TokenService {
       config.jwt.secret
     );
 
+    await this.prisma.token.deleteMany({
+      where: { userXid: user_xid }
+    })
+
     await this.prisma.token.create({
       data: {
         token: refreshToken.token,

src/modules/minglaradmin/handlers/createPassword.ts

@@ -1,13 +1,11 @@
+import { verifyMinglarAdminToken } from '../../../common/middlewares/jwt/authForMinglarAdmin';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
+import { prismaClient } from '../../../common/database/prisma.lambda.service';
 import { safeHandler } from '../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../common/database/prisma.service';
-import { MinglarService } from '../services/minglar.service';
 import ApiError from '../../../common/utils/helper/ApiError';
-import { verifyHostToken } from '../../../common/middlewares/jwt/authForHost';
-import { verifyMinglarAdminToken } from '@/common/middlewares/jwt/authForMinglarAdmin';
+import { MinglarService } from '../services/minglar.service';
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 export const handler = safeHandler(async (
   event: APIGatewayProxyEvent,

src/modules/minglaradmin/handlers/getAMDetail_ById.ts

@@ -3,14 +3,13 @@ import {
   APIGatewayProxyResult,
   Context,
 } from 'aws-lambda';
-import { safeHandler } from '../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../common/database/prisma.service';
-import { MinglarService } from '../services/minglar.service';
-import ApiError from '../../../common/utils/helper/ApiError';
+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';
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 /**
  * Get all host applications handler

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,
+        }),
+    };
+});

src/modules/minglaradmin/handlers/hosthub/hosts/acceptHostApplication.ts

@@ -1,13 +1,12 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 { sendEmailToHostForApprovedApplication } from '../../../services/approvalMailtoHost.service';
 import { MinglarService } from '../../../services/minglar.service';
-import { sendEmailToHostForApprovedApplication } from '../../../services/approvalMailtoHost.service'
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 interface AddSuggestionBody {
   hostXid: number;
@@ -47,8 +46,8 @@ export const handler = safeHandler(async (
 
   // Add suggestion using service
   await minglarService.acceptHostApplication(hostXid, userInfo.id);
-  const hostDetails = await minglarService.getUserDetails(userInfo.id)
-  await sendEmailToHostForApprovedApplication(hostDetails.emailAddress)
+  const hostDetails = await minglarService.getUserDetails(hostXid)
+  await sendEmailToHostForApprovedApplication(hostDetails.emailAddress, hostDetails.firstName)
 
   return {
     statusCode: 200,

src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.ts

@@ -0,0 +1,59 @@
+import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
+import { MinglarService } from '../../../services/minglar.service';
+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 { sendAMPQQAcceptanceMailtoHost } from '../../../../minglaradmin/services/approvalMailtoHost.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.acceptPQByAM(
+    Number(activityId),
+    Number(userInfo.id)
+  );
+  const hostXid = await minglarService.getHostXidByActivityId(activityId)
+  const hostDetails = await minglarService.getUserDetails(hostXid)
+  await sendAMPQQAcceptanceMailtoHost(hostDetails.emailAddress, hostDetails.firstName)
+
+  return {
+    statusCode: 201,
+    headers: {
+      'Content-Type': 'application/json',
+      'Access-Control-Allow-Origin': '*',
+    },
+    body: JSON.stringify({
+      success: true,
+      message: 'Approved PQ successfully',
+      data: null,
+    }),
+  };
+});

src/modules/minglaradmin/handlers/hosthub/hosts/addActivtiySuggestion.ts

@@ -1,18 +1,17 @@
-import { verifyOnlyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForOnlyMinglarAdmin';
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { PrismaService } from '../../../../../common/database/prisma.service';
+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 { sendEmailToHostForMinglarApproval } from '../../../services/approvalMailtoHost.service';
 import { MinglarService } from '../../../services/minglar.service';
+// import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 interface AddSuggestionBody {
-  hostXid: number;
   title: string;
   comments: string;
+  activity_xid:number
 }
 
 /**
@@ -31,7 +30,17 @@ export const handler = safeHandler(async (
   }
 
   // Verify token and get user info
-  const userInfo = await verifyOnlyMinglarAdminToken(token);
+  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;
@@ -42,16 +51,28 @@ export const handler = safeHandler(async (
     throw new ApiError(400, 'Invalid JSON in request body');
   }
 
-  const { hostXid } = 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.acceptHostApplicationMinglarAdmin(hostXid, userInfo.id);
-  const hostDetails = await minglarService.getUserDetails(userInfo.id)
-  if (!hostDetails?.emailAddress) {
-    throw new ApiError(404, 'Host details or email address not found');
-  }
-  await sendEmailToHostForMinglarApproval(hostDetails.emailAddress)
+  await minglarService.addActivtiySuggestion(title, comments, activity_xid,user.id);
 
   return {
     statusCode: 200,
@@ -61,7 +82,7 @@ export const handler = safeHandler(async (
     },
     body: JSON.stringify({
       success: true,
-      message: 'Application accepted successfully',
+      message: 'Suggestion added successfully',
       data: null,
     }),
   };

src/modules/minglaradmin/handlers/hosthub/hosts/addPQQSuggestion.ts

@@ -1,13 +1,12 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
-import { MinglarService } from '../../../services/minglar.service';
-import ApiError from '../../../../../common/utils/helper/ApiError';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
-import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
+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 prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 interface AddSuggestionBody {
   title: string;
@@ -34,7 +33,7 @@ export const handler = safeHandler(async (
   const userInfo = await verifyMinglarAdminToken(token);
 
   // Get user details
-  const user = await prismaService.user.findUnique({
+  const user = await prismaClient.user.findUnique({
     where: { id: userInfo.id },
     select: { id: true, roleXid: true }
   });
@@ -67,10 +66,10 @@ export const handler = safeHandler(async (
   }
 
   // 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(', ')}`);
-  }
+  // 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.addPqqSuggestion(title, comments, activity_pqq_header_xid,user.id);

src/modules/minglaradmin/handlers/hosthub/hosts/addSuggestion.ts

@@ -1,18 +1,17 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
-import { PrismaService } from '../../../../../common/database/prisma.service';
-import { MinglarService } from '../../../services/minglar.service';
-import ApiError from '../../../../../common/utils/helper/ApiError';
+import { prismaClient } from '../../../../../common/database/prisma.lambda.service';
 import { verifyMinglarAdminToken } from '../../../../../common/middlewares/jwt/authForMinglarAdmin';
-import { HOST_SUGGESTION_TITLES } from '../../../../../common/utils/constants/minglar.constant';
+import { safeHandler } from '../../../../../common/utils/handlers/safeHandler';
+import ApiError from '../../../../../common/utils/helper/ApiError';
+import { MinglarService } from '../../../services/minglar.service';
 
-const prismaService = new PrismaService();
-const minglarService = new MinglarService(prismaService);
+const minglarService = new MinglarService(prismaClient);
 
 interface AddSuggestionBody {
   hostXid: number;
   title: string;
   comments: string;
+  isParent: boolean;
 }
 
 /**
@@ -34,7 +33,7 @@ export const handler = safeHandler(async (
   const userInfo = await verifyMinglarAdminToken(token);
 
   // Get user details
-  const user = await prismaService.user.findUnique({
+  const user = await prismaClient.user.findUnique({
     where: { id: userInfo.id },
     select: { id: true, roleXid: true }
   });
@@ -52,7 +51,7 @@ export const handler = safeHandler(async (
     throw new ApiError(400, 'Invalid JSON in request body');
   }
 
-  const { hostXid, title, comments } = body;
+  const { hostXid, title, comments, isParent } = body;
 
   // Validate required fields
   if (!hostXid) {
@@ -68,13 +67,13 @@ export const handler = safeHandler(async (
   }
 
   // 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(', ')}`);
-  }
+  // 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.addHostSuggestion(hostXid, title, comments, user.id);
+  await minglarService.addHostSuggestion(hostXid, title, comments, user.id, isParent);
 
   return {
     statusCode: 200,