From 47e7018b256f2c03b043bcc766980c7ea8bb397a Mon Sep 17 00:00:00 2001 From: Kallesh B S Date: Tue, 29 Jul 2025 15:14:19 +0530 Subject: [PATCH] create logins API password field removed and p_userid added to searchHolder API --- src/dto/manage-holders/manage-holders.dto.ts | 4 ++-- .../carnet-application.controller.ts | 3 --- src/oracle/manage-holders/manage-holders.controller.ts | 10 +++++++--- src/oracle/manage-holders/manage-holders.service.ts | 5 +++-- .../user-maintenance/user-maintenance.service.ts | 9 +++------ 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/dto/manage-holders/manage-holders.dto.ts b/src/dto/manage-holders/manage-holders.dto.ts index 98b50bf..b7ba305 100644 --- a/src/dto/manage-holders/manage-holders.dto.ts +++ b/src/dto/manage-holders/manage-holders.dto.ts @@ -42,7 +42,6 @@ export class CreateHolderContactsDTO extends IntersectionType( SPID_DTO, HOLDERID_DTO, CONTACTSTABLE_DTO, USERID_DTO ) { } - export class UpdateHolderDTO extends IntersectionType( HOLDERID_DTO, SPID_DTO, @@ -96,5 +95,6 @@ export class HolderContactActivateOrInactivateDTO extends IntersectionType( export class SearchHolderDTO extends IntersectionType( SPID_DTO, - PartialType(HOLDERNAME_DTO) + PartialType(HOLDERNAME_DTO), + USERID_DTO ) { } \ No newline at end of file diff --git a/src/oracle/carnet-application/carnet-application.controller.ts b/src/oracle/carnet-application/carnet-application.controller.ts index 2a05447..c18c393 100644 --- a/src/oracle/carnet-application/carnet-application.controller.ts +++ b/src/oracle/carnet-application/carnet-application.controller.ts @@ -135,9 +135,6 @@ export class CarnetApplicationController { return this.carnetApplicationService.GetCountryDetailstoEdit(body); } - - - @Get('GetShipPaymentDetailstoEdit/:P_SPID/:P_USERID/:P_HEADERID') GetShipPaymentDetailstoEdit(@Param() body: GetCarnetControlCenterDTO) { return this.carnetApplicationService.GetShipPaymentDetailstoEdit(body); diff --git a/src/oracle/manage-holders/manage-holders.controller.ts b/src/oracle/manage-holders/manage-holders.controller.ts index f658cde..d6627d7 100644 --- a/src/oracle/manage-holders/manage-holders.controller.ts +++ b/src/oracle/manage-holders/manage-holders.controller.ts @@ -1,5 +1,4 @@ import { - BadRequestException, Body, Controller, Get, @@ -22,6 +21,7 @@ import { import { Roles } from 'src/decorators/roles.decorator'; import { JwtAuthGuard } from 'src/guards/jwt-auth.guard'; import { RolesGuard } from 'src/guards/roles.guard'; +import { BadRequestException } from 'src/exceptions/badRequest.exception'; @ApiTags('Manage Holders - Oracle') @UseGuards(JwtAuthGuard, RolesGuard) @@ -30,10 +30,11 @@ import { RolesGuard } from 'src/guards/roles.guard'; export class ManageHoldersController { constructor(private readonly manageHoldersService: ManageHoldersService) { } - @Get('SearchHolder/:P_SPID') + @Get('SearchHolder/:P_SPID/:P_USERID') @ApiQuery({ name: "P_HOLDERNAME", type: String, required: false, description: "Optional" }) SearchHolder( @Param('P_SPID') P_SPID: number, + @Param('P_USERID') P_USERID: string, @Query('P_HOLDERNAME') P_HOLDERNAME?: string | null | undefined, ) { let rawHolderName: string | null | undefined = P_HOLDERNAME; @@ -56,7 +57,10 @@ export class ManageHoldersController { } else { rawHolderName = null; } - const body = { P_SPID, P_HOLDERNAME: rawHolderName } + if(!P_USERID){ + return new BadRequestException(); + } + const body = { P_SPID,P_USERID,P_HOLDERNAME: rawHolderName } return this.manageHoldersService.SearchHolder(body) } diff --git a/src/oracle/manage-holders/manage-holders.service.ts b/src/oracle/manage-holders/manage-holders.service.ts index fd5a70c..0415d7d 100644 --- a/src/oracle/manage-holders/manage-holders.service.ts +++ b/src/oracle/manage-holders/manage-holders.service.ts @@ -631,7 +631,7 @@ export class ManageHoldersService { } }; - SearchHolder = async (body: { P_SPID: number, P_HOLDERNAME: string | null }) => { + SearchHolder = async (body: { P_SPID: number, P_USERID: string, P_HOLDERNAME: string | null }) => { let connection; try { @@ -640,12 +640,13 @@ export class ManageHoldersService { const result: Result = await connection.execute( `BEGIN MANAGEHOLDER_PKG.SearchHolder( - :P_SPID, :P_HOLDERNAME, :P_CURSOR + :P_SPID, :P_HOLDERNAME, P_USERID, :P_CURSOR ); END;`, { P_SPID: { val: body.P_SPID, type: oracledb.DB_TYPE_NUMBER }, P_HOLDERNAME: { val: body.P_HOLDERNAME, type: oracledb.DB_TYPE_NVARCHAR }, + P_USERID: { val: body.P_USERID, type: oracledb.DB_TYPE_NVARCHAR }, P_CURSOR: { type: oracledb.CURSOR, dir: oracledb.BIND_OUT } }, { diff --git a/src/oracle/user-maintenance/user-maintenance.service.ts b/src/oracle/user-maintenance/user-maintenance.service.ts index cedafee..e9bd236 100644 --- a/src/oracle/user-maintenance/user-maintenance.service.ts +++ b/src/oracle/user-maintenance/user-maintenance.service.ts @@ -155,14 +155,13 @@ export class UserMaintenanceService { const result = await connection.execute( `BEGIN Userlogin_pkg.CreateUSCIBLogins( - :P_USERID , :P_EMAILADDR , :P_LOOKUPCODE , :P_PASSWORD , :P_ENABLEPASSWORDPOLICY, :P_CURSOR + :P_USERID , :P_EMAILADDR , :P_LOOKUPCODE , :P_ENABLEPASSWORDPOLICY, :P_CURSOR ); END;`, { P_USERID: { val: body.P_USERID, type: oracledb.DB_TYPE_NVARCHAR }, P_EMAILADDR: { val: body.P_EMAILADDR, type: oracledb.DB_TYPE_NVARCHAR }, P_LOOKUPCODE: { val: body.P_LOOKUPCODE, type: oracledb.DB_TYPE_NVARCHAR }, - P_PASSWORD: { val: body.P_PASSWORD, type: oracledb.DB_TYPE_NVARCHAR }, P_ENABLEPASSWORDPOLICY: { val: body.P_ENABLEPASSWORDPOLICY, type: oracledb.DB_TYPE_NVARCHAR }, P_CURSOR: { type: oracledb.CURSOR, dir: oracledb.BIND_OUT } }, @@ -239,7 +238,7 @@ export class UserMaintenanceService { const result = await connection.execute( `BEGIN Userlogin_pkg.CreateSPLogins( - :P_SPID, :P_USERID, :P_DOMAIN, :P_EMAILADDR, :P_LOOKUPCODE, :P_PASSWORD, :P_ENABLEPASSWORDPOLICY, :P_CURSOR + :P_SPID, :P_USERID, :P_DOMAIN, :P_EMAILADDR, :P_LOOKUPCODE, :P_ENABLEPASSWORDPOLICY, :P_CURSOR ); END;`, { @@ -248,7 +247,6 @@ export class UserMaintenanceService { P_DOMAIN: { val: body.P_DOMAIN, type: oracledb.DB_TYPE_NVARCHAR }, P_EMAILADDR: { val: body.P_EMAILADDR, type: oracledb.DB_TYPE_NVARCHAR }, P_LOOKUPCODE: { val: body.P_LOOKUPCODE, type: oracledb.DB_TYPE_NVARCHAR }, - P_PASSWORD: { val: body.P_PASSWORD, type: oracledb.DB_TYPE_NVARCHAR }, P_ENABLEPASSWORDPOLICY: { val: body.P_ENABLEPASSWORDPOLICY, type: oracledb.DB_TYPE_NVARCHAR }, P_CURSOR: { type: oracledb.CURSOR, dir: oracledb.BIND_OUT } }, @@ -360,14 +358,13 @@ export class UserMaintenanceService { const result = await connection.execute( `BEGIN Userlogin_pkg.CreateClientLogins( - :P_SPID, :P_USERID, :P_CLIENTCONTACTID, :P_PASSWORD, :P_ENABLEPASSWORDPOLICY, :P_CURSOR + :P_SPID, :P_USERID, :P_CLIENTCONTACTID, :P_ENABLEPASSWORDPOLICY, :P_CURSOR ); END;`, { P_SPID: { val: body.P_SPID, type: oracledb.DB_TYPE_NUMBER }, P_USERID: { val: body.P_USERID, type: oracledb.DB_TYPE_NVARCHAR }, P_CLIENTCONTACTID: { val: body.P_CLIENTCONTACTID, type: oracledb.DB_TYPE_NUMBER }, - P_PASSWORD: { val: body.P_PASSWORD, type: oracledb.DB_TYPE_NVARCHAR }, P_ENABLEPASSWORDPOLICY: { val: body.P_ENABLEPASSWORDPOLICY, type: oracledb.DB_TYPE_NVARCHAR }, P_CURSOR: { type: oracledb.CURSOR, dir: oracledb.BIND_OUT } },