diff --git a/build/index.html b/build/index.html index beb5e4e..34446a1 100644 --- a/build/index.html +++ b/build/index.html @@ -1,14 +1,14 @@ - - - - - - - Royal Enfield Onboarding + + + + + + + Royal Enfield Onboarding - - -
- - + + +
+ + diff --git a/src/modules/admin/admin.controller.ts b/src/modules/admin/admin.controller.ts index 53f19a9..7d625b1 100644 --- a/src/modules/admin/admin.controller.ts +++ b/src/modules/admin/admin.controller.ts @@ -222,7 +222,7 @@ export const getAllUsers = async (req: Request, res: Response) => { ROLES.CCO, ROLES.CEO ]; - const isNationalRole = finalRoleCodes.some(r => nationalRoles.includes(r)); + const isNationalRole = finalRoleCodes.some(r => (nationalRoles as readonly string[]).includes(r)); if (!isNationalRole && locationId) { const district: any = await db.District.findByPk(locationId as string, { diff --git a/src/modules/prospective-login/prospective-login.controller.ts b/src/modules/prospective-login/prospective-login.controller.ts index 06e6a5d..47ef5f6 100644 --- a/src/modules/prospective-login/prospective-login.controller.ts +++ b/src/modules/prospective-login/prospective-login.controller.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import db from '../../database/models'; +import db from '../../database/models/index.js'; import jwt from 'jsonwebtoken'; // Mock secret for now, should be in env diff --git a/src/modules/self-service/constitutional.controller.ts b/src/modules/self-service/constitutional.controller.ts index d30501f..e087efa 100644 --- a/src/modules/self-service/constitutional.controller.ts +++ b/src/modules/self-service/constitutional.controller.ts @@ -839,11 +839,11 @@ const applyConstitutionalDocumentDecision = async ( ...currentDocuments[documentIndex], status: targetStatus, verifiedOn: new Date().toISOString(), - verifiedBy: req.user.fullName || req.user.name || 'System', + verifiedBy: req.user.fullName || 'System', ...(targetStatus === 'Rejected' ? { rejectedOn: new Date().toISOString(), - rejectedBy: req.user.fullName || req.user.name || 'System', + rejectedBy: req.user.fullName || 'System', rejectionReason: String(remarks).trim(), rejectionRemarks: String(remarks).trim() } @@ -856,7 +856,7 @@ const applyConstitutionalDocumentDecision = async ( { stage: request.currentStage, timestamp: new Date(), - user: req.user.fullName || req.user.name || 'System', + user: req.user.fullName || 'System', action: actionText, remarks: targetStatus === 'Verified' diff --git a/src/modules/self-service/relocation.controller.ts b/src/modules/self-service/relocation.controller.ts index 0f24e02..d9d66e4 100644 --- a/src/modules/self-service/relocation.controller.ts +++ b/src/modules/self-service/relocation.controller.ts @@ -486,7 +486,7 @@ export const getRequests = async (req: AuthRequest, res: Response) => { ROLES.CCO, ROLES.CEO ]; - if (userRoleCode && nationalRoles.includes(userRoleCode)) { + if (userRoleCode && (nationalRoles as readonly string[]).includes(userRoleCode)) { return true; } diff --git a/src/modules/settlement/settlement.controller.ts b/src/modules/settlement/settlement.controller.ts index 5469d2b..6af0096 100644 --- a/src/modules/settlement/settlement.controller.ts +++ b/src/modules/settlement/settlement.controller.ts @@ -374,8 +374,9 @@ export const getFnFSettlements = async (req: Request, res: Response) => { export const getFnFById = async (req: Request, res: Response) => { try { - const { id } = req.params; - + const rawId = req.params.id; + const id = Array.isArray(rawId) ? rawId[0] : rawId; + // Resolve UUID if human-readable ID (FNF-*) is passed const { resolvedId } = await resolveEntityUuidByType(db as any, id, 'fnf'); @@ -700,7 +701,9 @@ const calculateFnFLogic = async (id: string, userId: string | null = null) => { export const updateClearance = async (req: AuthRequest, res: Response) => { try { - const { id, clearanceId } = req.params; + const rawId = req.params.id; + const id = Array.isArray(rawId) ? rawId[0] : rawId; + const { clearanceId } = req.params; const body = (req.body || {}) as Record; const { status, remarks, documentId, supportingDocument, amount, type } = body; const clearance = await FffClearance.findOne({ where: { id: clearanceId, fnfId: id } }); diff --git a/src/modules/termination/termination.controller.ts b/src/modules/termination/termination.controller.ts index ae5f933..8371ef6 100644 --- a/src/modules/termination/termination.controller.ts +++ b/src/modules/termination/termination.controller.ts @@ -561,7 +561,7 @@ export const updateTerminationStatus = async (req: AuthRequest, res: Response, n transaction }); - const approvedRoles = partialLogs.map(log => (log as any).details?.roleCode); + const approvedRoles = partialLogs.map((log: { details?: { roleCode?: string } }) => log.details?.roleCode); const isComplete = requiredRoles.every(role => approvedRoles.includes(role)); if (!isComplete) { @@ -629,7 +629,7 @@ export const updateTerminationStatus = async (req: AuthRequest, res: Response, n transaction }); - const approvedRoles = partialLogs.map(log => (log as any).details?.roleCode); + const approvedRoles = partialLogs.map((log: { details?: { roleCode?: string } }) => log.details?.roleCode); const isComplete = requiredRoles.every(role => approvedRoles.includes(role)); if (!isComplete) { diff --git a/src/services/AutoAssignmentConfigService.ts b/src/services/AutoAssignmentConfigService.ts index 62f12f5..c52bf0c 100644 --- a/src/services/AutoAssignmentConfigService.ts +++ b/src/services/AutoAssignmentConfigService.ts @@ -62,7 +62,7 @@ export async function getAllAutoAssignmentStatuses(): Promise [c.key, c.value])); for (const [module, key] of Object.entries(MODULE_CONFIG_KEYS)) { - const value = configMap.get(key) || {}; + const value = (configMap.get(key) || {}) as { enabled?: boolean }; result[module] = typeof value.enabled === 'boolean' ? value.enabled : true; } } catch (error) { diff --git a/tsconfig.json b/tsconfig.json index f7c1704..1ac211a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,11 +28,13 @@ ] }, "include": [ - "**/*.ts" + "src/**/*.ts" ], "exclude": [ "node_modules", "dist", - "tests" + "tests", + "src/__tests__", + "src/diag_*.ts" ] } \ No newline at end of file