feat: add response DTOs for various services across modules
- Created response DTOs for ConfigService, AppService, AuthService, CatalogsService, AccountsService, BusinessActivityComplexesService, ComplexPosesService, SalesInvoicesService, BusinessActivitiesService, ConsumerBusinessActivityGoodsService, and others. - Implemented Create, FindAll, FindOne, and Update response types for services in consumer, partners, and POS modules. - Added request DTOs for creating and updating goods in the consumer business activities module. - Introduced filtering DTO for partner licenses. - Enhanced response mapping for partner license activations.
This commit is contained in:
@@ -2,18 +2,19 @@ import { TokenAccount } from '@/common/decorators/tokenInfo.decorator'
|
||||
import { Body, Controller, Get, Param, Patch } from '@nestjs/common'
|
||||
import { BusinessActivitiesService } from './business-activities.service'
|
||||
import { UpdateBusinessActivityDto } from './dto/create-business-activities.dto'
|
||||
import type { BusinessActivitiesServiceFindAllResponseDto, BusinessActivitiesServiceFindOneResponseDto, BusinessActivitiesServiceUpdateResponseDto } from './dto/business-activities-response.dto'
|
||||
|
||||
@Controller('consumer/business_activities')
|
||||
export class BusinessActivitiesController {
|
||||
constructor(private readonly service: BusinessActivitiesService) {}
|
||||
|
||||
@Get()
|
||||
async findAll(@TokenAccount('userId') userId: string) {
|
||||
async findAll(@TokenAccount('userId') userId: string): Promise<BusinessActivitiesServiceFindAllResponseDto> {
|
||||
return this.service.findAll(userId)
|
||||
}
|
||||
|
||||
@Get(':id')
|
||||
async findOne(@TokenAccount('userId') userId: string, @Param('id') id: string) {
|
||||
async findOne(@TokenAccount('userId') userId: string, @Param('id') id: string): Promise<BusinessActivitiesServiceFindOneResponseDto> {
|
||||
return this.service.findOne(userId, id)
|
||||
}
|
||||
|
||||
@@ -22,7 +23,7 @@ export class BusinessActivitiesController {
|
||||
@TokenAccount('userId') userId: string,
|
||||
@Param('id') id: string,
|
||||
@Body() data: UpdateBusinessActivityDto,
|
||||
) {
|
||||
): Promise<BusinessActivitiesServiceUpdateResponseDto> {
|
||||
return this.service.update(userId, id, data)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,14 @@ import { Module } from '@nestjs/common'
|
||||
import { BusinessActivitiesController } from './business-activities.controller'
|
||||
import { BusinessActivitiesService } from './business-activities.service'
|
||||
import { ConsumerBusinessActivityComplexesModule } from './complexes/complexes.module'
|
||||
import { ConsumerBusinessActivityGoodsModule } from './goods/goods.module'
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule, ConsumerBusinessActivityComplexesModule],
|
||||
imports: [
|
||||
PrismaModule,
|
||||
ConsumerBusinessActivityComplexesModule,
|
||||
ConsumerBusinessActivityGoodsModule,
|
||||
],
|
||||
controllers: [BusinessActivitiesController],
|
||||
providers: [BusinessActivitiesService],
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
|
||||
import { ApiTags } from '@nestjs/swagger'
|
||||
import { BusinessActivityComplexesService } from './complexes.service'
|
||||
import { CreateConsumerComplexDto, UpdateConsumerComplexDto } from './dto/complex.dto'
|
||||
import type { BusinessActivityComplexesServiceCreateResponseDto, BusinessActivityComplexesServiceFindAllResponseDto, BusinessActivityComplexesServiceFindOneResponseDto, BusinessActivityComplexesServiceUpdateResponseDto } from './dto/complexes-response.dto'
|
||||
|
||||
@ApiTags('AdminBusinessActivityComplexes')
|
||||
@Controller('consumer/business_activities/:businessActivityId/complexes')
|
||||
@@ -13,7 +14,7 @@ export class BusinessActivityComplexesController {
|
||||
async findAll(
|
||||
@ConsumerInfo('id') consumerId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
) {
|
||||
): Promise<BusinessActivityComplexesServiceFindAllResponseDto> {
|
||||
return this.service.findAll(consumerId, businessActivityId)
|
||||
}
|
||||
|
||||
@@ -22,7 +23,7 @@ export class BusinessActivityComplexesController {
|
||||
@ConsumerInfo('id') consumerId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('id') id: string,
|
||||
) {
|
||||
): Promise<BusinessActivityComplexesServiceFindOneResponseDto> {
|
||||
return this.service.findOne(consumerId, businessActivityId, id)
|
||||
}
|
||||
|
||||
@@ -31,7 +32,7 @@ export class BusinessActivityComplexesController {
|
||||
@ConsumerInfo('id') consumerId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Body() data: CreateConsumerComplexDto,
|
||||
) {
|
||||
): Promise<BusinessActivityComplexesServiceCreateResponseDto> {
|
||||
return this.service.create(consumerId, businessActivityId, data)
|
||||
}
|
||||
|
||||
@@ -41,7 +42,7 @@ export class BusinessActivityComplexesController {
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('id') id: string,
|
||||
@Body() data: UpdateConsumerComplexDto,
|
||||
) {
|
||||
): Promise<BusinessActivityComplexesServiceUpdateResponseDto> {
|
||||
return this.service.update(consumerId, businessActivityId, id, data)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,11 +2,10 @@ import { PrismaModule } from '@/prisma/prisma.module'
|
||||
import { Module } from '@nestjs/common'
|
||||
import { BusinessActivityComplexesController } from './complexes.controller'
|
||||
import { BusinessActivityComplexesService } from './complexes.service'
|
||||
import { ConsumerComplexGoodsModule } from './goods/goods.module'
|
||||
import { ConsumerComplexPosesModule } from './poses/poses.module'
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule, ConsumerComplexPosesModule, ConsumerComplexGoodsModule],
|
||||
imports: [PrismaModule, ConsumerComplexPosesModule],
|
||||
controllers: [BusinessActivityComplexesController],
|
||||
providers: [BusinessActivityComplexesService],
|
||||
})
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import type { BusinessActivityComplexesService } from '../complexes.service'
|
||||
|
||||
export type BusinessActivityComplexesServiceCreateResponseDto = Awaited<ReturnType<BusinessActivityComplexesService['create']>>
|
||||
export type BusinessActivityComplexesServiceFindAllResponseDto = Awaited<ReturnType<BusinessActivityComplexesService['findAll']>>
|
||||
export type BusinessActivityComplexesServiceFindOneResponseDto = Awaited<ReturnType<BusinessActivityComplexesService['findOne']>>
|
||||
export type BusinessActivityComplexesServiceUpdateResponseDto = Awaited<ReturnType<BusinessActivityComplexesService['update']>>
|
||||
@@ -1,51 +0,0 @@
|
||||
import { TokenAccount } from '@/common/decorators/tokenInfo.decorator'
|
||||
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
|
||||
import { ApiTags } from '@nestjs/swagger'
|
||||
import { CreateGoodDto, UpdateGoodDto } from './dto/good.dto'
|
||||
import { ConsumerComplexGoodsService } from './goods.service'
|
||||
|
||||
@ApiTags('ConsumerComplexGoods')
|
||||
@Controller('consumer/business_activities/:businessActivityId/complexes/:complexId/goods')
|
||||
export class ConsumerComplexGoodsController {
|
||||
constructor(private readonly service: ConsumerComplexGoodsService) {}
|
||||
|
||||
@Get()
|
||||
async findAll(
|
||||
@TokenAccount('userId') userId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
) {
|
||||
return this.service.findAll(userId, businessActivityId, complexId)
|
||||
}
|
||||
|
||||
@Get(':id')
|
||||
async findOne(
|
||||
@TokenAccount('userId') userId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
@Param('id') id: string,
|
||||
) {
|
||||
return this.service.findOne(userId, businessActivityId, complexId, id)
|
||||
}
|
||||
|
||||
@Post()
|
||||
async create(@Param('complexId') complexId: string, @Body() data: CreateGoodDto) {
|
||||
return this.service.create(complexId, data)
|
||||
}
|
||||
|
||||
@Patch(':id')
|
||||
async update(
|
||||
@TokenAccount('userId') userId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
@Param('id') id: string,
|
||||
@Body() data: UpdateGoodDto,
|
||||
) {
|
||||
return this.service.update(userId, businessActivityId, complexId, id, data)
|
||||
}
|
||||
|
||||
// @Delete(':id')
|
||||
// async delete(@Param('id') id: string) {
|
||||
// return this.businessActivityAccountsService.delete(id)
|
||||
// }
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import { PrismaModule } from '@/prisma/prisma.module'
|
||||
import { Module } from '@nestjs/common'
|
||||
import { ConsumerComplexGoodsController } from './goods.controller'
|
||||
import { ConsumerComplexGoodsService } from './goods.service'
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule],
|
||||
controllers: [ConsumerComplexGoodsController],
|
||||
providers: [ConsumerComplexGoodsService],
|
||||
exports: [ConsumerComplexGoodsService],
|
||||
})
|
||||
export class ConsumerComplexGoodsModule {}
|
||||
@@ -0,0 +1,6 @@
|
||||
import type { ComplexPosesService } from '../poses.service'
|
||||
|
||||
export type ComplexPosesServiceCreateResponseDto = Awaited<ReturnType<ComplexPosesService['create']>>
|
||||
export type ComplexPosesServiceFindAllResponseDto = Awaited<ReturnType<ComplexPosesService['findAll']>>
|
||||
export type ComplexPosesServiceFindOneResponseDto = Awaited<ReturnType<ComplexPosesService['findOne']>>
|
||||
export type ComplexPosesServiceUpdateResponseDto = Awaited<ReturnType<ComplexPosesService['update']>>
|
||||
@@ -3,6 +3,7 @@ import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
|
||||
import { ApiTags } from '@nestjs/swagger'
|
||||
import { CreatePosDto, UpdatePosDto } from './dto/pos.dto'
|
||||
import { ComplexPosesService } from './poses.service'
|
||||
import type { ComplexPosesServiceCreateResponseDto, ComplexPosesServiceFindAllResponseDto, ComplexPosesServiceFindOneResponseDto, ComplexPosesServiceUpdateResponseDto } from './dto/poses-response.dto'
|
||||
|
||||
@ApiTags('ConsumerComplexPoses')
|
||||
@Controller('consumer/business_activities/:businessActivityId/complexes/:complexId/poses')
|
||||
@@ -14,7 +15,7 @@ export class ComplexPosesController {
|
||||
@ConsumerInfo('id') consumerId: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
) {
|
||||
): Promise<ComplexPosesServiceFindAllResponseDto> {
|
||||
return this.service.findAll(consumerId, businessActivityId, complexId)
|
||||
}
|
||||
|
||||
@@ -24,7 +25,7 @@ export class ComplexPosesController {
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
@Param('id') id: string,
|
||||
) {
|
||||
): Promise<ComplexPosesServiceFindOneResponseDto> {
|
||||
return this.service.findOne(consumerId, businessActivityId, complexId, id)
|
||||
}
|
||||
|
||||
@@ -34,7 +35,7 @@ export class ComplexPosesController {
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Param('complexId') complexId: string,
|
||||
@Body() data: CreatePosDto,
|
||||
) {
|
||||
): Promise<ComplexPosesServiceCreateResponseDto> {
|
||||
return this.service.create(consumerId, businessActivityId, complexId, data)
|
||||
}
|
||||
|
||||
@@ -45,7 +46,7 @@ export class ComplexPosesController {
|
||||
@Param('complexId') complexId: string,
|
||||
@Param('id') id: string,
|
||||
@Body() data: UpdatePosDto,
|
||||
) {
|
||||
): Promise<ComplexPosesServiceUpdateResponseDto> {
|
||||
return this.service.update(consumerId, businessActivityId, complexId, id, data)
|
||||
}
|
||||
|
||||
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
import type { SalesInvoicesService } from '../sales-invoices.service'
|
||||
|
||||
export type SalesInvoicesServiceFindAllResponseDto = Awaited<ReturnType<SalesInvoicesService['findAll']>>
|
||||
export type SalesInvoicesServiceFindOneResponseDto = Awaited<ReturnType<SalesInvoicesService['findOne']>>
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
import type { SalesInvoiceItemsService } from '../sales-invoice-items.service'
|
||||
|
||||
export type SalesInvoiceItemsServiceCreateResponseDto = Awaited<ReturnType<SalesInvoiceItemsService['create']>>
|
||||
export type SalesInvoiceItemsServiceFindAllResponseDto = Awaited<ReturnType<SalesInvoiceItemsService['findAll']>>
|
||||
export type SalesInvoiceItemsServiceFindOneResponseDto = Awaited<ReturnType<SalesInvoiceItemsService['findOne']>>
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
import type { SalesInvoicePaymentsService } from '../sales-invoice-payments.service'
|
||||
|
||||
export type SalesInvoicePaymentsServiceCreateResponseDto = Awaited<ReturnType<SalesInvoicePaymentsService['create']>>
|
||||
export type SalesInvoicePaymentsServiceFindAllResponseDto = Awaited<ReturnType<SalesInvoicePaymentsService['findAll']>>
|
||||
export type SalesInvoicePaymentsServiceFindOneResponseDto = Awaited<ReturnType<SalesInvoicePaymentsService['findOne']>>
|
||||
+2
-2
@@ -71,7 +71,7 @@ export class SalesInvoicesService {
|
||||
customer: {
|
||||
select: {
|
||||
type: true,
|
||||
customer_individual: {
|
||||
individual: {
|
||||
select: {
|
||||
economic_code: true,
|
||||
first_name: true,
|
||||
@@ -80,7 +80,7 @@ export class SalesInvoicesService {
|
||||
national_id: true,
|
||||
},
|
||||
},
|
||||
customer_legal: {
|
||||
legal: {
|
||||
select: {
|
||||
economic_code: true,
|
||||
postal_code: true,
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
import type { BusinessActivitiesService } from '../business-activities.service'
|
||||
|
||||
export type BusinessActivitiesServiceFindAllResponseDto = Awaited<ReturnType<BusinessActivitiesService['findAll']>>
|
||||
export type BusinessActivitiesServiceFindOneResponseDto = Awaited<ReturnType<BusinessActivitiesService['findOne']>>
|
||||
export type BusinessActivitiesServiceUpdateResponseDto = Awaited<ReturnType<BusinessActivitiesService['update']>>
|
||||
@@ -0,0 +1,6 @@
|
||||
import type { ConsumerBusinessActivityGoodsService } from '../goods.service'
|
||||
|
||||
export type ConsumerBusinessActivityGoodsServiceCreateResponseDto = Awaited<ReturnType<ConsumerBusinessActivityGoodsService['create']>>
|
||||
export type ConsumerBusinessActivityGoodsServiceFindAllResponseDto = Awaited<ReturnType<ConsumerBusinessActivityGoodsService['findAll']>>
|
||||
export type ConsumerBusinessActivityGoodsServiceFindOneResponseDto = Awaited<ReturnType<ConsumerBusinessActivityGoodsService['findOne']>>
|
||||
export type ConsumerBusinessActivityGoodsServiceUpdateResponseDto = Awaited<ReturnType<ConsumerBusinessActivityGoodsService['update']>>
|
||||
@@ -0,0 +1,54 @@
|
||||
import { TokenAccount } from '@/common/decorators/tokenInfo.decorator'
|
||||
import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common'
|
||||
import { ApiTags } from '@nestjs/swagger'
|
||||
import { CreateGoodDto, UpdateGoodDto } from './dto/good.dto'
|
||||
import { ConsumerBusinessActivityGoodsService } from './goods.service'
|
||||
import type { ConsumerBusinessActivityGoodsServiceCreateResponseDto, ConsumerBusinessActivityGoodsServiceFindAllResponseDto, ConsumerBusinessActivityGoodsServiceFindOneResponseDto, ConsumerBusinessActivityGoodsServiceUpdateResponseDto } from './dto/goods-response.dto'
|
||||
|
||||
@ApiTags('ConsumerBusinessActivityGoods')
|
||||
@Controller('consumer/business_activities/:businessActivityId/goods')
|
||||
export class ConsumerBusinessActivityGoodsController {
|
||||
constructor(private readonly service: ConsumerBusinessActivityGoodsService) {}
|
||||
|
||||
@Get()
|
||||
async findAll(
|
||||
@TokenAccount('userId') consumer_id: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
): Promise<ConsumerBusinessActivityGoodsServiceFindAllResponseDto> {
|
||||
return this.service.findAll(consumer_id, businessActivityId)
|
||||
}
|
||||
|
||||
@Get(':id')
|
||||
async findOne(
|
||||
@TokenAccount('userId') consumer_id: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
|
||||
@Param('id') id: string,
|
||||
): Promise<ConsumerBusinessActivityGoodsServiceFindOneResponseDto> {
|
||||
return this.service.findOne(consumer_id, businessActivityId, id)
|
||||
}
|
||||
|
||||
@Post()
|
||||
async create(
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
@Body() data: CreateGoodDto,
|
||||
): Promise<ConsumerBusinessActivityGoodsServiceCreateResponseDto> {
|
||||
return this.service.create(businessActivityId, data)
|
||||
}
|
||||
|
||||
@Patch(':id')
|
||||
async update(
|
||||
@TokenAccount('userId') consumer_id: string,
|
||||
@Param('businessActivityId') businessActivityId: string,
|
||||
|
||||
@Param('id') id: string,
|
||||
@Body() data: UpdateGoodDto,
|
||||
): Promise<ConsumerBusinessActivityGoodsServiceUpdateResponseDto> {
|
||||
return this.service.update(consumer_id, businessActivityId, id, data)
|
||||
}
|
||||
|
||||
// @Delete(':id')
|
||||
// async delete(@Param('id') id: string) {
|
||||
// return this.businessActivityAccountsService.delete(id)
|
||||
// }
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
import { PrismaModule } from '@/prisma/prisma.module'
|
||||
import { Module } from '@nestjs/common'
|
||||
import { ConsumerBusinessActivityGoodsController } from './goods.controller'
|
||||
import { ConsumerBusinessActivityGoodsService } from './goods.service'
|
||||
|
||||
@Module({
|
||||
imports: [PrismaModule],
|
||||
controllers: [ConsumerBusinessActivityGoodsController],
|
||||
providers: [ConsumerBusinessActivityGoodsService],
|
||||
exports: [ConsumerBusinessActivityGoodsService],
|
||||
})
|
||||
export class ConsumerBusinessActivityGoodsModule {}
|
||||
+17
-33
@@ -5,7 +5,7 @@ import { ResponseMapper } from 'common/response/response-mapper'
|
||||
import { CreateGoodDto, UpdateGoodDto } from './dto/good.dto'
|
||||
|
||||
@Injectable()
|
||||
export class ConsumerComplexGoodsService {
|
||||
export class ConsumerBusinessActivityGoodsService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
defaultSelect: GoodSelect = {
|
||||
@@ -26,16 +26,12 @@ export class ConsumerComplexGoodsService {
|
||||
created_at: true,
|
||||
}
|
||||
|
||||
async findAll(consumer_id: string, business_activity_id: string, complex_id: string) {
|
||||
async findAll(consumer_id: string, business_activity_id: string) {
|
||||
const goods = await this.prisma.good.findMany({
|
||||
where: {
|
||||
complex_id,
|
||||
complex: {
|
||||
id: complex_id,
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
},
|
||||
select: this.defaultSelect,
|
||||
@@ -44,20 +40,12 @@ export class ConsumerComplexGoodsService {
|
||||
return ResponseMapper.list(goods)
|
||||
}
|
||||
|
||||
async findOne(
|
||||
consumer_id: string,
|
||||
business_activity_id: string,
|
||||
complex_id: string,
|
||||
id: string,
|
||||
) {
|
||||
async findOne(consumer_id: string, business_activity_id: string, id: string) {
|
||||
const good = await this.prisma.good.findUnique({
|
||||
where: {
|
||||
complex: {
|
||||
id: complex_id,
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
id,
|
||||
},
|
||||
@@ -66,15 +54,15 @@ export class ConsumerComplexGoodsService {
|
||||
return ResponseMapper.single(good)
|
||||
}
|
||||
|
||||
async create(complex_id: string, data: CreateGoodDto) {
|
||||
async create(business_activity_id: string, data: CreateGoodDto) {
|
||||
const { category_id, ...rest } = data
|
||||
|
||||
const good = await this.prisma.good.create({
|
||||
data: {
|
||||
...rest,
|
||||
complex: {
|
||||
business_activity: {
|
||||
connect: {
|
||||
id: complex_id,
|
||||
id: business_activity_id,
|
||||
},
|
||||
},
|
||||
category: {
|
||||
@@ -90,26 +78,22 @@ export class ConsumerComplexGoodsService {
|
||||
async update(
|
||||
consumer_id: string,
|
||||
business_activity_id: string,
|
||||
complex_id: string,
|
||||
id: string,
|
||||
data: UpdateGoodDto,
|
||||
) {
|
||||
const { category_id, ...rest } = data
|
||||
const good = await this.prisma.good.update({
|
||||
where: {
|
||||
complex: {
|
||||
id: complex_id,
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
business_activity: {
|
||||
id: business_activity_id,
|
||||
consumer_id,
|
||||
},
|
||||
id,
|
||||
},
|
||||
data: {
|
||||
complex: {
|
||||
business_activity: {
|
||||
connect: {
|
||||
id: complex_id,
|
||||
id: business_activity_id,
|
||||
},
|
||||
},
|
||||
category: {
|
||||
Reference in New Issue
Block a user