diff --git a/src/dto/manage-clients/manage-clients.dto.ts b/src/dto/manage-clients/manage-clients.dto.ts index d163bae..15c8e42 100644 --- a/src/dto/manage-clients/manage-clients.dto.ts +++ b/src/dto/manage-clients/manage-clients.dto.ts @@ -60,7 +60,7 @@ export class UpdateClientContactsDTO extends IntersectionType( PartialType(MIDDLE_INITIAL_DTO), PartialType(TITLE_DTO), PHONE_NO_DTO, - FAX_NO_DTO, + PartialType(FAX_NO_DTO), PartialType(MOBILE_NO_DTO), EMAIL_ADDRESS_DTO, USERID_DTO diff --git a/src/dto/uscib-managed-sp/sp-contacts/sp-contacts.dto.ts b/src/dto/uscib-managed-sp/sp-contacts/sp-contacts.dto.ts index 7e6981b..88faf5a 100644 --- a/src/dto/uscib-managed-sp/sp-contacts/sp-contacts.dto.ts +++ b/src/dto/uscib-managed-sp/sp-contacts/sp-contacts.dto.ts @@ -1,4 +1,4 @@ -import { IntersectionType } from '@nestjs/swagger'; +import { IntersectionType, PartialType } from '@nestjs/swagger'; import { DEFAULT_CONTACT_FLAG_DTO, EMAIL_ADDRESS_DTO, FAX_NO_DTO, @@ -10,11 +10,11 @@ import { SPID_DTO } from '../sp/sp-property.dto'; export class InsertSPContactsDTO extends IntersectionType( SPID_DTO, DEFAULT_CONTACT_FLAG_DTO, FIRSTNAME_DTO, LASTNAME_DTO, MIDDLE_INITIAL_DTO, TITLE_DTO, - PHONE_NO_DTO, MOBILE_NO_DTO, FAX_NO_DTO, EMAIL_ADDRESS_DTO, USER_ID_DTO + PHONE_NO_DTO, MOBILE_NO_DTO, PartialType(FAX_NO_DTO), EMAIL_ADDRESS_DTO, USER_ID_DTO ) { } export class UpdateSPContactsDTO extends IntersectionType( SP_CONTACTID_DTO, FIRSTNAME_DTO, LASTNAME_DTO, MIDDLE_INITIAL_DTO, TITLE_DTO, PHONE_NO_DTO, - MOBILE_NO_DTO, FAX_NO_DTO, EMAIL_ADDRESS_DTO, USER_ID_DTO + MOBILE_NO_DTO, PartialType(FAX_NO_DTO), EMAIL_ADDRESS_DTO, USER_ID_DTO ) { } diff --git a/src/oracle/user-maintenance/user-maintenance.service.ts b/src/oracle/user-maintenance/user-maintenance.service.ts index f473c93..e76c728 100644 --- a/src/oracle/user-maintenance/user-maintenance.service.ts +++ b/src/oracle/user-maintenance/user-maintenance.service.ts @@ -9,6 +9,7 @@ import { EMAIL_DTO, USERID_DTO, CreateClientLoginsDTO, CreateSPLoginsDTO, CreateUSCIBLoginsDTO, SPID_CLIENTID_DTO, SPID_EMAIL_DTO } from 'src/dto/property.dto'; +import { BadRequestException } from 'src/exceptions/badRequest.exception'; interface RoleDetail { [key: string]: any; } @@ -172,9 +173,15 @@ export class UserMaintenanceService { throw new InternalServerException("Incomplete data received from the database."); } - return { - data: await fetchCursor(outBinds.P_CURSOR), - }; + const fres: any = await fetchCursor(outBinds.P_CURSOR, UserMaintenanceService.name); + + if (fres.length > 0 && fres[0].ERRORMESG) { + this.logger.warn(fres[0].ERRORMESG); + throw new BadRequestException(fres[0].ERRORMESG) + } + + return { statusCode: 201, message: "Created successfully", ...fres[0] }; + } catch (error) { handleError(error, UserMaintenanceService.name) } finally { @@ -250,7 +257,15 @@ export class UserMaintenanceService { throw new InternalServerException("Incomplete data received from the database."); } - return await fetchCursor(outBinds.P_CURSOR, UserMaintenanceService.name); + const fres: any = await fetchCursor(outBinds.P_CURSOR, UserMaintenanceService.name); + + if (fres.length > 0 && fres[0].ERRORMESG) { + this.logger.warn(fres[0].ERRORMESG); + throw new BadRequestException(fres[0].ERRORMESG) + } + + return { statusCode: 201, message: "Created successfully", ...fres[0] }; + } catch (error) { handleError(error, UserMaintenanceService.name) } finally { @@ -359,7 +374,15 @@ export class UserMaintenanceService { throw new InternalServerException("Incomplete data received from the database."); } - return await fetchCursor(outBinds.P_CURSOR, UserMaintenanceService.name); + const fres: any = await fetchCursor(outBinds.P_CURSOR, UserMaintenanceService.name); + + if (fres.length > 0 && fres[0].ERRORMESG) { + this.logger.warn(fres[0].ERRORMESG); + throw new BadRequestException(fres[0].ERRORMESG) + } + + return { statusCode: 201, message: "Created successfully", ...fres[0] }; + } catch (error) { handleError(error, UserMaintenanceService.name) } finally {