diff --git a/apps/hcdc-access-service/src/presentation/http/v1/bio-product/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/bio-product/dto/response-dto.ts index 49165b76..1b9b9023 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/bio-product/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/bio-product/dto/response-dto.ts @@ -4,7 +4,7 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { BioProductCreateRequestDto } from './create.request-dto' -import { Branch, exampleBioProduct } from 'src/domain' +import { exampleBioProduct } from 'src/domain' import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class BioProductUnpopulatedResponseDto extends IntersectionType( @@ -20,5 +20,5 @@ export class BioProductResponseDto extends BioProductUnpopulatedResponseDto { }) @ValidateNested({ each: true }) @Type(() => BranchUnpopulatedResponseDto) - branch?: Branch + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/bio-product/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/bio-product/routes.ts index a6b51ce2..faa7d061 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/bio-product/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/bio-product/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { BioProductSearchResponseDto } from './dto/search.response-dto' -import { BioProductResponseDto } from './dto/response-dto' +import { + BioProductResponseDto, + BioProductUnpopulatedResponseDto, +} from './dto/response-dto' export const bioProductRoutes = { search: { @@ -21,11 +24,11 @@ export const bioProductRoutes = { create: { method: RequestMethod.POST, - serialize: BioProductResponseDto, + serialize: BioProductUnpopulatedResponseDto, openApi: { responses: [ { - type: BioProductResponseDto, + type: BioProductUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const bioProductRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: BioProductResponseDto, + serialize: BioProductUnpopulatedResponseDto, openApi: { responses: [ { - type: BioProductResponseDto, + type: BioProductUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const bioProductRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: BioProductResponseDto, + serialize: BioProductUnpopulatedResponseDto, openApi: { responses: [ { - type: BioProductResponseDto, + type: BioProductUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/branch/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/branch/dto/response-dto.ts index 2278d4a5..fd8a4bbf 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/branch/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/branch/dto/response-dto.ts @@ -4,7 +4,7 @@ import { Expose, Type } from 'class-transformer' import { IsArray, ValidateNested } from 'class-validator' import { BranchCreateRequestDto } from './create.request-dto' -import { Branch, exampleBranch } from 'src/domain' +import { exampleBranch } from 'src/domain' export class BranchUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -15,13 +15,10 @@ export class BranchResponseDto extends BranchUnpopulatedResponseDto { @Expose() @ApiProperty({ ...exampleBranch.sampleOrigins, - type: () => - class OmittedBranchResponseDto extends OmitType(BranchResponseDto, [ - 'sampleOrigins', - ]) {}, + type: () => BranchUnpopulatedResponseDto, }) @IsArray() @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - sampleOrigins?: (Branch | null)[] + @Type(() => BranchUnpopulatedResponseDto) + sampleOrigins?: BranchUnpopulatedResponseDto[] } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/branch/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/branch/routes.ts index 6dc91df0..0a26e2e0 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/branch/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/branch/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { BranchSearchResponseDto } from './dto/search.response-dto' -import { BranchResponseDto } from './dto/response-dto' +import { + BranchResponseDto, + BranchUnpopulatedResponseDto, +} from './dto/response-dto' export const branchRoutes = { search: { @@ -21,11 +24,11 @@ export const branchRoutes = { create: { method: RequestMethod.POST, - serialize: BranchResponseDto, + serialize: BranchUnpopulatedResponseDto, openApi: { responses: [ { - type: BranchResponseDto, + type: BranchUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const branchRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: BranchResponseDto, + serialize: BranchUnpopulatedResponseDto, openApi: { responses: [ { - type: BranchResponseDto, + type: BranchUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const branchRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: BranchResponseDto, + serialize: BranchUnpopulatedResponseDto, openApi: { responses: [ { - type: BranchResponseDto, + type: BranchUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/dto/response-dto.ts index 8af5f709..75137a43 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { DiagnosisCreateRequestDto } from './create.request-dto' -import { Branch, exampleDiagnosis } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleDiagnosis } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class DiagnosisUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class DiagnosisUnpopulatedResponseDto extends IntersectionType( export class DiagnosisResponseDto extends DiagnosisUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleDiagnosis.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleDiagnosis.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/routes.ts index 1ded5e86..2a327219 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/diagnosis/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { DiagnosisSearchResponseDto } from './dto/search.response-dto' -import { DiagnosisResponseDto } from './dto/response-dto' +import { + DiagnosisResponseDto, + DiagnosisUnpopulatedResponseDto, +} from './dto/response-dto' export const diagnosisRoutes = { search: { @@ -21,11 +24,11 @@ export const diagnosisRoutes = { create: { method: RequestMethod.POST, - serialize: DiagnosisResponseDto, + serialize: DiagnosisUnpopulatedResponseDto, openApi: { responses: [ { - type: DiagnosisResponseDto, + type: DiagnosisUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const diagnosisRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: DiagnosisResponseDto, + serialize: DiagnosisUnpopulatedResponseDto, openApi: { responses: [ { - type: DiagnosisResponseDto, + type: DiagnosisUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const diagnosisRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: DiagnosisResponseDto, + serialize: DiagnosisUnpopulatedResponseDto, openApi: { responses: [ { - type: DiagnosisResponseDto, + type: DiagnosisUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/doctor/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/doctor/dto/response-dto.ts index 940f999e..7ac1864b 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/doctor/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/doctor/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { DoctorCreateRequestDto } from './create.request-dto' -import { Branch, exampleDoctor } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleDoctor } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class DoctorUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class DoctorUnpopulatedResponseDto extends IntersectionType( export class DoctorResponseDto extends DoctorUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleDoctor.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleDoctor.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/doctor/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/doctor/routes.ts index 15acb445..43657f97 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/doctor/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/doctor/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { DoctorSearchResponseDto } from './dto/search.response-dto' -import { DoctorResponseDto } from './dto/response-dto' +import { + DoctorResponseDto, + DoctorUnpopulatedResponseDto, +} from './dto/response-dto' export const doctorRoutes = { search: { @@ -21,11 +24,11 @@ export const doctorRoutes = { create: { method: RequestMethod.POST, - serialize: DoctorResponseDto, + serialize: DoctorUnpopulatedResponseDto, openApi: { responses: [ { - type: DoctorResponseDto, + type: DoctorUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const doctorRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: DoctorResponseDto, + serialize: DoctorUnpopulatedResponseDto, openApi: { responses: [ { - type: DoctorResponseDto, + type: DoctorUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const doctorRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: DoctorResponseDto, + serialize: DoctorUnpopulatedResponseDto, openApi: { responses: [ { - type: DoctorResponseDto, + type: DoctorUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/instrument/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/instrument/dto/response-dto.ts index c6255634..55061131 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/instrument/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/instrument/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { InstrumentCreateRequestDto } from './create.request-dto' -import { Branch, exampleInstrument } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleInstrument } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class InstrumentUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class InstrumentUnpopulatedResponseDto extends IntersectionType( export class InstrumentResponseDto extends InstrumentUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleInstrument.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleInstrument.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/instrument/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/instrument/routes.ts index 9f60f015..fb700a53 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/instrument/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/instrument/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { InstrumentSearchResponseDto } from './dto/search.response-dto' -import { InstrumentResponseDto } from './dto/response-dto' +import { + InstrumentResponseDto, + InstrumentUnpopulatedResponseDto, +} from './dto/response-dto' export const instrumentRoutes = { search: { @@ -21,11 +24,11 @@ export const instrumentRoutes = { create: { method: RequestMethod.POST, - serialize: InstrumentResponseDto, + serialize: InstrumentUnpopulatedResponseDto, openApi: { responses: [ { - type: InstrumentResponseDto, + type: InstrumentUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const instrumentRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: InstrumentResponseDto, + serialize: InstrumentUnpopulatedResponseDto, openApi: { responses: [ { - type: InstrumentResponseDto, + type: InstrumentUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const instrumentRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: InstrumentResponseDto, + serialize: InstrumentUnpopulatedResponseDto, openApi: { responses: [ { - type: InstrumentResponseDto, + type: InstrumentUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/patient-type/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/patient-type/dto/response-dto.ts index 4857ea49..065d8c1b 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/patient-type/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/patient-type/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { PatientTypeCreateRequestDto } from './create.request-dto' -import { Branch, examplePatientType } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { examplePatientType } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class PatientTypeUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class PatientTypeUnpopulatedResponseDto extends IntersectionType( export class PatientTypeResponseDto extends PatientTypeUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...examplePatientType.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...examplePatientType.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/patient-type/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/patient-type/routes.ts index 9548bb1b..e9e73823 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/patient-type/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/patient-type/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { PatientTypeSearchResponseDto } from './dto/search.response-dto' -import { PatientTypeResponseDto } from './dto/response-dto' +import { + PatientTypeResponseDto, + PatientTypeUnpopulatedResponseDto, +} from './dto/response-dto' export const patientTypeRoutes = { search: { @@ -21,11 +24,11 @@ export const patientTypeRoutes = { create: { method: RequestMethod.POST, - serialize: PatientTypeResponseDto, + serialize: PatientTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientTypeResponseDto, + type: PatientTypeUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const patientTypeRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: PatientTypeResponseDto, + serialize: PatientTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientTypeResponseDto, + type: PatientTypeUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const patientTypeRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: PatientTypeResponseDto, + serialize: PatientTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientTypeResponseDto, + type: PatientTypeUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/patient/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/patient/dto/response-dto.ts index ff4749c0..5f90443f 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/patient/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/patient/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { PatientCreateRequestDto } from './create.request-dto' -import { Branch, examplePatient } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { examplePatient } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class PatientUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class PatientUnpopulatedResponseDto extends IntersectionType( export class PatientResponseDto extends PatientUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...examplePatient.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...examplePatient.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/patient/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/patient/routes.ts index b7f2d6ea..b9cda4e5 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/patient/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/patient/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { PatientSearchResponseDto } from './dto/search.response-dto' -import { PatientResponseDto } from './dto/response-dto' +import { + PatientResponseDto, + PatientUnpopulatedResponseDto, +} from './dto/response-dto' export const patientRoutes = { search: { @@ -21,11 +24,11 @@ export const patientRoutes = { create: { method: RequestMethod.POST, - serialize: PatientResponseDto, + serialize: PatientUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientResponseDto, + type: PatientUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const patientRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: PatientResponseDto, + serialize: PatientUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientResponseDto, + type: PatientUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const patientRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: PatientResponseDto, + serialize: PatientUnpopulatedResponseDto, openApi: { responses: [ { - type: PatientResponseDto, + type: PatientUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/print-form/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/print-form/dto/response-dto.ts index df22da43..1a16eba7 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/print-form/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/print-form/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { PrintFormCreateRequestDto } from './create.request-dto' -import { Branch, examplePrintForm } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { examplePrintForm } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class PrintFormUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class PrintFormUnpopulatedResponseDto extends IntersectionType( export class PrintFormResponseDto extends PrintFormUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...examplePrintForm.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...examplePrintForm.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/print-form/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/print-form/routes.ts index d1cdbfe5..769afa15 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/print-form/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/print-form/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { PrintFormSearchResponseDto } from './dto/search.response-dto' -import { PrintFormResponseDto } from './dto/response-dto' +import { + PrintFormResponseDto, + PrintFormUnpopulatedResponseDto, +} from './dto/response-dto' export const printFormRoutes = { search: { @@ -21,11 +24,11 @@ export const printFormRoutes = { create: { method: RequestMethod.POST, - serialize: PrintFormResponseDto, + serialize: PrintFormUnpopulatedResponseDto, openApi: { responses: [ { - type: PrintFormResponseDto, + type: PrintFormUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const printFormRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: PrintFormResponseDto, + serialize: PrintFormUnpopulatedResponseDto, openApi: { responses: [ { - type: PrintFormResponseDto, + type: PrintFormUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const printFormRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: PrintFormResponseDto, + serialize: PrintFormUnpopulatedResponseDto, openApi: { responses: [ { - type: PrintFormResponseDto, + type: PrintFormUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/role/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/role/dto/response-dto.ts index 632965d1..3a1d775b 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/role/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/role/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { IsArray, ValidateNested } from 'class-validator' import { RoleCreateRequestDto } from './create.request-dto' -import { Branch, exampleRole } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleRole } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class RoleUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class RoleUnpopulatedResponseDto extends IntersectionType( export class RoleResponseDto extends RoleUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleRole.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleRole.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/role/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/role/routes.ts index c9bebab4..5ec22ad9 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/role/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/role/routes.ts @@ -2,7 +2,7 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { RoleSearchResponseDto } from './dto/search.response-dto' -import { RoleResponseDto } from './dto/response-dto' +import { RoleResponseDto, RoleUnpopulatedResponseDto } from './dto/response-dto' export const roleRoutes = { search: { @@ -21,11 +21,11 @@ export const roleRoutes = { create: { method: RequestMethod.POST, - serialize: RoleResponseDto, + serialize: RoleUnpopulatedResponseDto, openApi: { responses: [ { - type: RoleResponseDto, + type: RoleUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +35,11 @@ export const roleRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: RoleResponseDto, + serialize: RoleUnpopulatedResponseDto, openApi: { responses: [ { - type: RoleResponseDto, + type: RoleUnpopulatedResponseDto, }, ], }, @@ -61,11 +61,11 @@ export const roleRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: RoleResponseDto, + serialize: RoleUnpopulatedResponseDto, openApi: { responses: [ { - type: RoleResponseDto, + type: RoleUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/sample-type/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/sample-type/dto/response-dto.ts index bca41d01..0541da38 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/sample-type/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/sample-type/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { SampleTypeCreateRequestDto } from './create.request-dto' -import { Branch, exampleSampleType } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleSampleType } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class SampleTypeUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class SampleTypeUnpopulatedResponseDto extends IntersectionType( export class SampleTypeResponseDto extends SampleTypeUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleSampleType.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleSampleType.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/sample-type/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/sample-type/routes.ts index b24771cf..4409b3f4 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/sample-type/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/sample-type/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { SampleTypeSearchResponseDto } from './dto/search.response-dto' -import { SampleTypeResponseDto } from './dto/response-dto' +import { + SampleTypeResponseDto, + SampleTypeUnpopulatedResponseDto, +} from './dto/response-dto' export const sampleTypeRoutes = { search: { @@ -21,11 +24,11 @@ export const sampleTypeRoutes = { create: { method: RequestMethod.POST, - serialize: SampleTypeResponseDto, + serialize: SampleTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: SampleTypeResponseDto, + type: SampleTypeUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const sampleTypeRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: SampleTypeResponseDto, + serialize: SampleTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: SampleTypeResponseDto, + type: SampleTypeUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const sampleTypeRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: SampleTypeResponseDto, + serialize: SampleTypeUnpopulatedResponseDto, openApi: { responses: [ { - type: SampleTypeResponseDto, + type: SampleTypeUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-category/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-category/dto/response-dto.ts index 2d3e8a9f..71b49cc8 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-category/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-category/dto/response-dto.ts @@ -4,8 +4,8 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { TestCategoryCreateRequestDto } from './create.request-dto' -import { Branch, exampleTestCategory } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' +import { exampleTestCategory } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' export class TestCategoryUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -14,8 +14,11 @@ export class TestCategoryUnpopulatedResponseDto extends IntersectionType( export class TestCategoryResponseDto extends TestCategoryUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleTestCategory.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleTestCategory.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-category/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-category/routes.ts index 2f8b09ea..38af69b4 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-category/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-category/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { TestCategorySearchResponseDto } from './dto/search.response-dto' -import { TestCategoryResponseDto } from './dto/response-dto' +import { + TestCategoryResponseDto, + TestCategoryUnpopulatedResponseDto, +} from './dto/response-dto' export const testCategoryRoutes = { search: { @@ -21,11 +24,11 @@ export const testCategoryRoutes = { create: { method: RequestMethod.POST, - serialize: TestCategoryResponseDto, + serialize: TestCategoryUnpopulatedResponseDto, openApi: { responses: [ { - type: TestCategoryResponseDto, + type: TestCategoryUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const testCategoryRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: TestCategoryResponseDto, + serialize: TestCategoryUnpopulatedResponseDto, openApi: { responses: [ { - type: TestCategoryResponseDto, + type: TestCategoryUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const testCategoryRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: TestCategoryResponseDto, + serialize: TestCategoryUnpopulatedResponseDto, openApi: { responses: [ { - type: TestCategoryResponseDto, + type: TestCategoryUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-combo/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-combo/dto/response-dto.ts index a790ea67..d827d3e0 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-combo/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-combo/dto/response-dto.ts @@ -4,9 +4,9 @@ import { Expose, Type } from 'class-transformer' import { IsArray, ValidateNested } from 'class-validator' import { TestComboCreateRequestDto } from './create.request-dto' -import { Branch, Test, exampleTestCombo } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' -import { TestResponseDto } from '../../test/dto/response-dto' +import { exampleTestCombo } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' +import { TestUnpopulatedResponseDto } from '../../test/dto/response-dto' export class TestComboUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -17,16 +17,19 @@ export class TestComboResponseDto extends TestComboUnpopulatedResponseDto { @Expose() @ApiProperty({ ...exampleTestCombo.tests, - type: () => TestResponseDto, + type: () => TestUnpopulatedResponseDto, }) @IsArray() @ValidateNested({ each: true }) - @Type(() => TestResponseDto) - tests?: TestResponseDto[] + @Type(() => TestUnpopulatedResponseDto) + tests?: TestUnpopulatedResponseDto[] @Expose() - @ApiProperty({ ...exampleTestCombo.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleTestCombo.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-combo/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-combo/routes.ts index a26f62d3..07aef95f 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-combo/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-combo/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { TestComboSearchResponseDto } from './dto/search.response-dto' -import { TestComboResponseDto } from './dto/response-dto' +import { + TestComboResponseDto, + TestComboUnpopulatedResponseDto, +} from './dto/response-dto' export const testComboRoutes = { search: { @@ -21,11 +24,11 @@ export const testComboRoutes = { create: { method: RequestMethod.POST, - serialize: TestComboResponseDto, + serialize: TestComboUnpopulatedResponseDto, openApi: { responses: [ { - type: TestComboResponseDto, + type: TestComboUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const testComboRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: TestComboResponseDto, + serialize: TestComboUnpopulatedResponseDto, openApi: { responses: [ { - type: TestComboResponseDto, + type: TestComboUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const testComboRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: TestComboResponseDto, + serialize: TestComboUnpopulatedResponseDto, openApi: { responses: [ { - type: TestComboResponseDto, + type: TestComboUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-element/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-element/dto/response-dto.ts index baff72c3..7e459fae 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-element/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-element/dto/response-dto.ts @@ -5,8 +5,8 @@ import { ValidateNested } from 'class-validator' import { TestElementCreateRequestDto } from './create.request-dto' import { exampleTestElement } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' -import { TestResponseDto } from '../../test/dto/response-dto' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' +import { TestUnpopulatedResponseDto } from '../../test/dto/response-dto' export class TestElementUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -15,14 +15,20 @@ export class TestElementUnpopulatedResponseDto extends IntersectionType( export class TestElementResponseDto extends TestElementUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleTestElement.test, type: () => TestResponseDto }) + @ApiProperty({ + ...exampleTestElement.test, + type: () => TestUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => TestResponseDto) - test?: TestResponseDto + @Type(() => TestUnpopulatedResponseDto) + test?: TestUnpopulatedResponseDto @Expose() - @ApiProperty({ ...exampleTestElement.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleTestElement.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: BranchResponseDto + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test-element/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/test-element/routes.ts index 0fb25880..5f60bc41 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test-element/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test-element/routes.ts @@ -2,7 +2,10 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { TestElementSearchResponseDto } from './dto/search.response-dto' -import { TestElementResponseDto } from './dto/response-dto' +import { + TestElementResponseDto, + TestElementUnpopulatedResponseDto, +} from './dto/response-dto' export const testElementRoutes = { search: { @@ -21,11 +24,11 @@ export const testElementRoutes = { create: { method: RequestMethod.POST, - serialize: TestElementResponseDto, + serialize: TestElementUnpopulatedResponseDto, openApi: { responses: [ { - type: TestElementResponseDto, + type: TestElementUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +38,11 @@ export const testElementRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: TestElementResponseDto, + serialize: TestElementUnpopulatedResponseDto, openApi: { responses: [ { - type: TestElementResponseDto, + type: TestElementUnpopulatedResponseDto, }, ], }, @@ -61,11 +64,11 @@ export const testElementRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: TestElementResponseDto, + serialize: TestElementUnpopulatedResponseDto, openApi: { responses: [ { - type: TestElementResponseDto, + type: TestElementUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/test/dto/response-dto.ts index ea37626f..3ec5ce52 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test/dto/response-dto.ts @@ -4,21 +4,13 @@ import { Expose, Type } from 'class-transformer' import { ValidateNested } from 'class-validator' import { TestCreateRequestDto } from './create.request-dto' -import { - BioProduct, - Branch, - Instrument, - PrintForm, - SampleType, - TestCategory, - exampleTest, -} from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' -import { BioProductResponseDto } from '../../bio-product/dto/response-dto' -import { InstrumentResponseDto } from '../../instrument/dto/response-dto' -import { SampleTypeResponseDto } from '../../sample-type/dto/response-dto' -import { TestCategoryResponseDto } from '../../test-category/dto/response-dto' -import { PrintFormResponseDto } from '../../print-form/dto/response-dto' +import { exampleTest } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' +import { BioProductUnpopulatedResponseDto } from '../../bio-product/dto/response-dto' +import { InstrumentUnpopulatedResponseDto } from '../../instrument/dto/response-dto' +import { SampleTypeUnpopulatedResponseDto } from '../../sample-type/dto/response-dto' +import { TestCategoryUnpopulatedResponseDto } from '../../test-category/dto/response-dto' +import { PrintFormUnpopulatedResponseDto } from '../../print-form/dto/response-dto' export class TestUnpopulatedResponseDto extends IntersectionType( BaseResourceResponseDto, @@ -27,41 +19,56 @@ export class TestUnpopulatedResponseDto extends IntersectionType( export class TestResponseDto extends TestUnpopulatedResponseDto { @Expose() - @ApiProperty({ ...exampleTest.bioProduct, type: () => BioProductResponseDto }) + @ApiProperty({ + ...exampleTest.bioProduct, + type: () => BioProductUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BioProductResponseDto) - bioProduct?: BioProduct + @Type(() => BioProductUnpopulatedResponseDto) + bioProduct?: BioProductUnpopulatedResponseDto @Expose() - @ApiProperty({ ...exampleTest.instrument, type: () => InstrumentResponseDto }) + @ApiProperty({ + ...exampleTest.instrument, + type: () => InstrumentUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => InstrumentResponseDto) - instrument?: Instrument + @Type(() => InstrumentUnpopulatedResponseDto) + instrument?: InstrumentUnpopulatedResponseDto @Expose() - @ApiProperty({ ...exampleTest.sampleType, type: () => SampleTypeResponseDto }) + @ApiProperty({ + ...exampleTest.sampleType, + type: () => SampleTypeUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => SampleTypeResponseDto) - sampleType?: SampleType + @Type(() => SampleTypeUnpopulatedResponseDto) + sampleType?: SampleTypeUnpopulatedResponseDto @Expose() @ApiProperty({ ...exampleTest.testCategory, - type: () => TestCategoryResponseDto, + type: () => TestCategoryUnpopulatedResponseDto, }) @ValidateNested({ each: true }) - @Type(() => TestCategoryResponseDto) - testCategory?: TestCategory + @Type(() => TestCategoryUnpopulatedResponseDto) + testCategory?: TestCategoryUnpopulatedResponseDto @Expose() - @ApiProperty({ ...exampleTest.printForm, type: () => PrintFormResponseDto }) + @ApiProperty({ + ...exampleTest.printForm, + type: () => PrintFormUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => PrintFormResponseDto) - printForm?: PrintForm + @Type(() => PrintFormUnpopulatedResponseDto) + printForm?: PrintFormUnpopulatedResponseDto @Expose() - @ApiProperty({ ...exampleTest.branch, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleTest.branch, + type: () => BranchUnpopulatedResponseDto, + }) @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branch?: Branch + @Type(() => BranchUnpopulatedResponseDto) + branch?: BranchUnpopulatedResponseDto } diff --git a/apps/hcdc-access-service/src/presentation/http/v1/test/routes.ts b/apps/hcdc-access-service/src/presentation/http/v1/test/routes.ts index 9177a18a..620326e0 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/test/routes.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/test/routes.ts @@ -2,7 +2,7 @@ import { HttpStatus, RequestMethod } from '@nestjs/common' import { CustomHttpRouteOptions } from '@diut/nest-core' import { TestSearchResponseDto } from './dto/search.response-dto' -import { TestResponseDto } from './dto/response-dto' +import { TestResponseDto, TestUnpopulatedResponseDto } from './dto/response-dto' export const testRoutes = { search: { @@ -21,11 +21,11 @@ export const testRoutes = { create: { method: RequestMethod.POST, - serialize: TestResponseDto, + serialize: TestUnpopulatedResponseDto, openApi: { responses: [ { - type: TestResponseDto, + type: TestUnpopulatedResponseDto, status: HttpStatus.CREATED, }, ], @@ -35,11 +35,11 @@ export const testRoutes = { updateById: { path: ':id', method: RequestMethod.PATCH, - serialize: TestResponseDto, + serialize: TestUnpopulatedResponseDto, openApi: { responses: [ { - type: TestResponseDto, + type: TestUnpopulatedResponseDto, }, ], }, @@ -61,11 +61,11 @@ export const testRoutes = { deleteById: { path: ':id', method: RequestMethod.DELETE, - serialize: TestResponseDto, + serialize: TestUnpopulatedResponseDto, openApi: { responses: [ { - type: TestResponseDto, + type: TestUnpopulatedResponseDto, }, ], }, diff --git a/apps/hcdc-access-service/src/presentation/http/v1/user/dto/response-dto.ts b/apps/hcdc-access-service/src/presentation/http/v1/user/dto/response-dto.ts index a5d0ddab..a0d15abf 100644 --- a/apps/hcdc-access-service/src/presentation/http/v1/user/dto/response-dto.ts +++ b/apps/hcdc-access-service/src/presentation/http/v1/user/dto/response-dto.ts @@ -4,25 +4,28 @@ import { Expose, Type } from 'class-transformer' import { IsArray, ValidateNested } from 'class-validator' import { UserCreateRequestDto } from './create.request-dto' -import { Branch, Role, exampleUser } from 'src/domain' -import { BranchResponseDto } from '../../branch/dto/response-dto' -import { RoleResponseDto } from '../../role/dto/response-dto' +import { exampleUser } from 'src/domain' +import { BranchUnpopulatedResponseDto } from '../../branch/dto/response-dto' +import { RoleUnpopulatedResponseDto } from '../../role/dto/response-dto' export class UserResponseDto extends IntersectionType( BaseResourceResponseDto, OmitType(UserCreateRequestDto, ['password']), ) { @Expose() - @ApiProperty({ ...exampleUser.branches, type: () => BranchResponseDto }) + @ApiProperty({ + ...exampleUser.branches, + type: () => BranchUnpopulatedResponseDto, + }) @IsArray() @ValidateNested({ each: true }) - @Type(() => BranchResponseDto) - branches?: (Branch | null)[] + @Type(() => BranchUnpopulatedResponseDto) + branches?: BranchUnpopulatedResponseDto[] @Expose() - @ApiProperty({ ...exampleUser.roles, type: () => RoleResponseDto }) + @ApiProperty({ ...exampleUser.roles, type: () => RoleUnpopulatedResponseDto }) @IsArray() @ValidateNested({ each: true }) - @Type(() => RoleResponseDto) - roles?: (Role | null)[] + @Type(() => RoleUnpopulatedResponseDto) + roles?: RoleUnpopulatedResponseDto[] } diff --git a/libs/nest-core/src/transport/http/dtos/paginated-response.ts b/libs/nest-core/src/transport/http/dtos/paginated-response.ts index a3335755..e009f891 100644 --- a/libs/nest-core/src/transport/http/dtos/paginated-response.ts +++ b/libs/nest-core/src/transport/http/dtos/paginated-response.ts @@ -23,7 +23,7 @@ export function PaginatedResponse>( isArray: true, }) @Type(() => ItemClass) - items: ItemType[] + items: (typeof ItemClass)[] } return PaginationDtoClass