@mbc-cqrs-serverless/master 0.1.68-beta.0 → 0.1.69-beta.0

package/src/templates/master/master-setting.controller.ts

@@ -1,98 +1,18 @@
-import {
-  DetailDto,
-  getUserContext,
-  IInvoke,
-  INVOKE_CONTEXT,
-} from '@mbc-cqrs-serverless/core'
-import { CommonSettingDto } from '@mbc-cqrs-serverless/master/dist/dto'
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Injectable,
-  Param,
-  Post,
-  Put,
-  Query,
-} from '@nestjs/common'
+import { IInvoke, INVOKE_CONTEXT } from '@mbc-cqrs-serverless/core'
+import { MasterCopyDto } from '@mbc-cqrs-serverless/master'
+import { Body, Controller, Injectable, Post } from '@nestjs/common'
 import { ApiTags } from '@nestjs/swagger'
 
-import { MasterCopyDto } from './dto/master-copy.dto'
-import { MasterSettingSearchDto } from './dto/master-setting-search.dto'
-import { MasterSettingUpdateDto } from './dto/master-setting-update.dto'
-import { parsePk } from './helpers'
 import { CustomMasterSettingService } from './master-setting.service'
 
 @ApiTags('master-setting')
 @Controller('api/master-setting')
 @Injectable()
-export class MasterSettingController {
+export class CustomMasterSettingController {
   constructor(
     private readonly masterSettingService: CustomMasterSettingService,
   ) {}
 
-  @Get('/')
-  async list(
-    @Query() searchDto: MasterSettingSearchDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterSettingService.list(searchDto, invokeContext)
-  }
-
-  @Get('/:pk/:sk')
-  async getDetail(@Param() key: DetailDto) {
-    return this.masterSettingService.getDetail(key)
-  }
-
-  @Post('/')
-  async create(
-    @Body() createDto: CommonSettingDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterSettingService.create(createDto, invokeContext)
-  }
-
-  @Put('/:pk/:sk')
-  async update(
-    @Param() key: DetailDto,
-    @Body() updateDto: MasterSettingUpdateDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    const userContext = getUserContext(invokeContext)
-
-    const { tenantCode } = parsePk(key.pk)
-
-    if (userContext.tenantCode !== tenantCode) {
-      throw new BadRequestException('Invalid tenant code')
-    }
-    return this.masterSettingService.update(key, updateDto, invokeContext)
-  }
-
-  @Delete('/:pk/:sk')
-  async delete(
-    @Param() key: DetailDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    const userContext = getUserContext(invokeContext)
-
-    const { tenantCode } = parsePk(key.pk)
-
-    if (userContext.tenantCode !== tenantCode) {
-      throw new BadRequestException('Invalid tenant code')
-    }
-    return this.masterSettingService.delete(key, invokeContext)
-  }
-
-  @Post('/check-exist/:code')
-  async checkExistCode(
-    @Param('code') code: string,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterSettingService.checkExistCode(code, invokeContext)
-  }
-
   @Post('/copy')
   async copyMaster(
     @INVOKE_CONTEXT() invokeContext: IInvoke,

package/src/templates/master/master-setting.service.ts

@@ -1,161 +1,19 @@
-import {
-  DataService,
-  DetailDto,
-  getUserContext,
-  IInvoke,
-  UserContext,
-} from '@mbc-cqrs-serverless/core'
-import { MasterSettingService } from '@mbc-cqrs-serverless/master'
-import { CommonSettingDto } from '@mbc-cqrs-serverless/master/dist/dto'
+import { DataService, getUserContext, IInvoke } from '@mbc-cqrs-serverless/core'
+import { DataCopyMode, MasterCopyDto } from '@mbc-cqrs-serverless/master'
 import { TaskService } from '@mbc-cqrs-serverless/task'
-import {
-  BadRequestException,
-  Injectable,
-  Logger,
-  NotFoundException,
-} from '@nestjs/common'
-import { Prisma } from '@prisma/client'
-import { PrismaService } from 'src/prisma'
+import { BadRequestException, Injectable, Logger } from '@nestjs/common'
 
-import { DataCopyMode, MasterCopyDto } from './dto/master-copy.dto'
-import { MasterRdsEntity } from './dto/master-rds.entity'
-import { MasterRdsListEntity } from './dto/master-rds-list.entity'
-import { MasterSettingSearchDto } from './dto/master-setting-search.dto'
-import { MasterSettingUpdateDto } from './dto/master-setting-update.dto'
-import {
-  getOrderBys,
-  MASTER_COPY_SK_PREFIX,
-  parseId,
-  SETTING_SK_PREFIX,
-} from './helpers'
+import { MASTER_COPY_SK_PREFIX, parseId } from './helpers'
 
 @Injectable()
 export class CustomMasterSettingService {
   private readonly logger = new Logger(CustomMasterSettingService.name)
 
   constructor(
-    private readonly masterSettingService: MasterSettingService,
-    private readonly prismaService: PrismaService,
     private readonly dataService: DataService,
     private readonly taskService: TaskService,
   ) {}
 
-  async list(searchDto: MasterSettingSearchDto, invokeContext: IInvoke) {
-    const userContext = getUserContext(invokeContext)
-
-    const where: Prisma.MasterWhereInput = {
-      tenantCode: this.getUserTenantCode(userContext),
-      masterType: SETTING_SK_PREFIX,
-    }
-
-    if (searchDto.isDeleted === false || searchDto.isDeleted === undefined) {
-      where.isDeleted = false
-    }
-
-    const andConditions: Prisma.MasterWhereInput[] = []
-
-    if (searchDto.name?.trim()) {
-      andConditions.push({
-        name: { contains: searchDto.name.trim() },
-      })
-    }
-
-    if (searchDto.keyword?.trim()) {
-      andConditions.push({
-        attributes: {
-          path: 'description',
-          string_contains: searchDto.keyword.trim(),
-        },
-      })
-    }
-
-    if (searchDto.code?.trim()) {
-      andConditions.push({
-        masterCode: { contains: searchDto.code.trim() },
-      })
-    }
-
-    if (andConditions.length) {
-      where.AND = andConditions
-    }
-
-    const { pageSize = 10, page = 1, orderBys = ['-createdAt'] } = searchDto
-
-    const [total, items] = await Promise.all([
-      this.prismaService.master.count({ where }),
-      this.prismaService.master.findMany({
-        where,
-        take: pageSize,
-        skip: pageSize * (page - 1),
-        orderBy: getOrderBys<Prisma.MasterOrderByWithRelationInput>(orderBys),
-      }),
-    ])
-
-    return new MasterRdsListEntity({
-      total,
-      items: items.map((item) => new MasterRdsEntity(item)),
-    })
-  }
-
-  async getDetail(key: DetailDto) {
-    const data = await this.dataService.getItem(key)
-
-    if (!data) throw new NotFoundException()
-
-    return new MasterRdsEntity(data)
-  }
-
-  async create(createDto: CommonSettingDto, invokeContext: IInvoke) {
-    const userContext = getUserContext(invokeContext)
-    return await this.masterSettingService.createTenantSetting(
-      {
-        ...createDto,
-        tenantCode: userContext.tenantCode,
-      },
-      { invokeContext },
-    )
-  }
-
-  async update(
-    key: DetailDto,
-    updateDto: MasterSettingUpdateDto,
-    invokeContext: IInvoke,
-  ) {
-    const code = key.sk.split('#')[1]
-    const userContext = getUserContext(invokeContext)
-
-    return await this.masterSettingService.updateSetting(
-      key,
-      {
-        code,
-        tenantCode: userContext.tenantCode,
-        name: updateDto.name,
-        settingValue: updateDto.attributes,
-      },
-      {
-        invokeContext,
-      },
-    )
-  }
-
-  async delete(key: DetailDto, invokeContext: IInvoke) {
-    return this.masterSettingService.deleteSetting(key, { invokeContext })
-  }
-
-  async checkExistCode(code: string, invokeContext: IInvoke) {
-    const userContext = getUserContext(invokeContext)
-
-    const item = await this.prismaService.master.findFirst({
-      where: {
-        tenantCode: userContext.tenantCode,
-        masterType: SETTING_SK_PREFIX,
-        masterCode: code,
-      },
-    })
-
-    return !!item && !item.isDeleted
-  }
-
   async copy(
     masterCopyDto: MasterCopyDto,
     opts: { invokeContext: IInvoke },
@@ -194,8 +52,4 @@ export class CustomMasterSettingService {
 
     return taskItem
   }
-
-  private getUserTenantCode(userContext: UserContext): string {
-    return userContext.tenantCode
-  }
 }

package/src/templates/master/master.module.ts

@@ -3,12 +3,11 @@ import { MasterModule as CoreMasterModule } from '@mbc-cqrs-serverless/master'
 import { SequencesModule } from '@mbc-cqrs-serverless/sequence'
 import { Module } from '@nestjs/common'
 import { CustomTaskModule } from 'src/custom-task/custom-task.module'
+import { PrismaService } from 'src/prisma'
 
 import { MasterDataSyncRdsHandler } from './handler/master-rds.handler'
 import { MasterSfnTaskEventHandler } from './handler/master-sfn-task.handler'
-import { MasterDataController } from './master-data.controller'
-import { CustomMasterDataService } from './master-data.service'
-import { MasterSettingController } from './master-setting.controller'
+import { CustomMasterSettingController } from './master-setting.controller'
 import { CustomMasterSettingService } from './master-setting.service'
 
 @Module({
@@ -17,20 +16,16 @@ import { CustomMasterSettingService } from './master-setting.service'
       tableName: 'master',
       dataSyncHandlers: [MasterDataSyncRdsHandler],
     }),
-
     CoreMasterModule.register({
-      enableController: false,
+      enableController: true,
+      prismaService: PrismaService,
       dataSyncHandlers: [MasterDataSyncRdsHandler],
     }),
     CustomTaskModule,
     SequencesModule,
   ],
-  controllers: [MasterDataController, MasterSettingController],
-  providers: [
-    CustomMasterDataService,
-    CustomMasterSettingService,
-    MasterSfnTaskEventHandler,
-  ],
-  exports: [CustomMasterSettingService, CoreMasterModule],
+  controllers: [CustomMasterSettingController],
+  providers: [CustomMasterSettingService, MasterSfnTaskEventHandler],
+  exports: [],
 })
 export class MasterModule {}

package/src/templates/master/dto/master-copy.dto.ts

@@ -1,73 +0,0 @@
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'
-import { Type } from 'class-transformer'
-import {
-  IsArray,
-  IsEnum,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  ValidateNested,
-} from 'class-validator'
-
-export enum CopyType {
-  SETTING_ONLY = 'SETTING_ONLY',
-  DATA_ONLY = 'DATA_ONLY',
-  BOTH = 'BOTH',
-}
-
-export enum DataCopyMode {
-  ALL = 'ALL',
-  PARTIAL = 'PARTIAL',
-}
-
-export class DataCopyOptionDto {
-  @ApiProperty({
-    enum: DataCopyMode,
-    description: 'Whether to copy all master_data or only specific ones',
-  })
-  @IsEnum(DataCopyMode)
-  mode: DataCopyMode
-
-  @ApiPropertyOptional({
-    description:
-      'Required only if mode is PARTIAL. List of master_data IDs to copy.',
-    type: [String],
-  })
-  @IsOptional()
-  @IsArray()
-  @IsString({ each: true })
-  id?: string[]
-}
-
-export class MasterCopyDto {
-  @ApiProperty({
-    description: 'The ID of the master_setting to copy from',
-  })
-  @IsString()
-  @IsNotEmpty()
-  masterSettingId: string
-
-  @ApiProperty({
-    description: 'Target tenants as an array of tenant codes',
-    example: ['tenant_b', 'tenant_c'],
-  })
-  @IsNotEmpty()
-  targetTenants: string[]
-
-  @ApiProperty({
-    enum: CopyType,
-    description: 'What to copy: only setting, only data, or both',
-  })
-  @IsEnum(CopyType)
-  copyType: CopyType
-
-  @ApiPropertyOptional({
-    type: DataCopyOptionDto,
-    description:
-      'Options for data copy (required when copyType is DATA_ONLY or BOTH)',
-  })
-  @IsOptional()
-  @ValidateNested()
-  @Type(() => DataCopyOptionDto)
-  dataCopyOption?: DataCopyOptionDto
-}

package/src/templates/master/dto/master-data-create.dto.ts

@@ -1,20 +0,0 @@
-import { IsNumber, IsObject, IsOptional, IsString } from 'class-validator'
-
-export class MasterDataCreateDto {
-  @IsString()
-  settingCode: string
-
-  @IsString()
-  name: string
-
-  @IsOptional()
-  @IsString()
-  code?: string
-
-  @IsNumber()
-  @IsOptional()
-  seq?: number
-
-  @IsObject()
-  attributes: object
-}

package/src/templates/master/dto/master-data-search.dto.ts

@@ -1,20 +0,0 @@
-import { SearchDto } from '@mbc-cqrs-serverless/core'
-import { Transform } from 'class-transformer'
-import { IsBoolean, IsOptional, IsString } from 'class-validator'
-
-export class MasterDataSearchDto extends SearchDto {
-  @IsOptional()
-  @IsString()
-  settingCode?: string
-
-  @IsOptional()
-  @IsString()
-  code?: string
-
-  @IsBoolean()
-  @Transform(({ value }) =>
-    value === 'true' ? true : value === 'false' ? false : value,
-  )
-  @IsOptional()
-  isDeleted?: boolean
-}

package/src/templates/master/dto/master-data-update.dto.ts

@@ -1,25 +0,0 @@
-import {
-  IsBoolean,
-  IsNumber,
-  IsObject,
-  IsOptional,
-  IsString,
-} from 'class-validator'
-
-export class MasterDataUpdateDto {
-  @IsString()
-  @IsOptional()
-  name?: string
-
-  @IsBoolean()
-  @IsOptional()
-  isDeleted?: boolean
-
-  @IsNumber()
-  @IsOptional()
-  seq?: number
-
-  @IsObject()
-  @IsOptional()
-  attributes?: object
-}

package/src/templates/master/dto/master-rds-list.entity.ts

@@ -1,15 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger'
-
-import { MasterRdsEntity } from './master-rds.entity'
-
-export class MasterRdsListEntity {
-  @ApiProperty({ type: Number })
-  total?: number
-
-  @ApiProperty({ type: MasterRdsEntity, isArray: true })
-  items: MasterRdsEntity[]
-
-  constructor(data: Partial<MasterRdsListEntity>) {
-    Object.assign(this, data)
-  }
-}

package/src/templates/master/dto/master-rds.entity.ts

@@ -1,77 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger'
-import { Master } from '@prisma/client'
-
-export class MasterRdsEntity {
-  @ApiProperty()
-  id: string
-
-  @ApiProperty()
-  cpk: string
-
-  @ApiProperty()
-  csk: string
-
-  @ApiProperty()
-  pk: string
-
-  @ApiProperty()
-  sk: string
-
-  @ApiProperty()
-  masterType: string
-
-  @ApiProperty()
-  masterTypeCode: string
-
-  @ApiProperty()
-  masterCode: string
-
-  @ApiProperty()
-  tenantCode: string
-
-  @ApiProperty()
-  seq: number
-
-  @ApiProperty()
-  code: string
-
-  @ApiProperty()
-  name: string
-
-  @ApiProperty()
-  version: number
-
-  @ApiProperty()
-  isDeleted: boolean
-
-  @ApiProperty()
-  createdBy: string
-
-  @ApiProperty()
-  createdIp: string
-
-  @ApiProperty()
-  createdAt: Date
-
-  @ApiProperty()
-  updatedBy: string
-
-  @ApiProperty()
-  updatedIp: string
-
-  @ApiProperty()
-  updatedAt: Date
-
-  @ApiProperty({ required: false })
-  syncFrom?: string
-
-  @ApiProperty({ required: false })
-  syncDate?: Date
-
-  @ApiProperty({ type: 'object', required: false })
-  attributes?: Record<string, any>
-
-  constructor(data: Partial<Master>) {
-    Object.assign(this, data)
-  }
-}

package/src/templates/master/dto/master-setting-search.dto.ts

@@ -1,20 +0,0 @@
-import { SearchDto } from '@mbc-cqrs-serverless/core'
-import { Transform } from 'class-transformer'
-import { IsBoolean, IsOptional, IsString } from 'class-validator'
-
-export class MasterSettingSearchDto extends SearchDto {
-  @IsOptional()
-  @IsString()
-  code?: string
-
-  @IsOptional()
-  @IsString()
-  name?: string
-
-  @IsBoolean()
-  @Transform(({ value }) =>
-    value === 'true' ? true : value === 'false' ? false : value,
-  )
-  @IsOptional()
-  isDeleted?: boolean
-}

package/src/templates/master/dto/master-setting-update.dto.ts

@@ -1,11 +0,0 @@
-import { IsObject, IsOptional, IsString } from 'class-validator'
-
-export class MasterSettingUpdateDto {
-  @IsString()
-  @IsOptional()
-  name?: string
-
-  @IsObject()
-  @IsOptional()
-  attributes?: object
-}

package/src/templates/master/master-data.controller.ts

@@ -1,98 +0,0 @@
-import {
-  DetailDto,
-  getUserContext,
-  IInvoke,
-  INVOKE_CONTEXT,
-} from '@mbc-cqrs-serverless/core'
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Injectable,
-  Param,
-  Post,
-  Put,
-  Query,
-} from '@nestjs/common'
-import { ApiTags } from '@nestjs/swagger'
-
-import { MasterDataCreateDto } from './dto/master-data-create.dto'
-import { MasterDataSearchDto } from './dto/master-data-search.dto'
-import { MasterDataUpdateDto } from './dto/master-data-update.dto'
-import { parsePk } from './helpers'
-import { CustomMasterDataService } from './master-data.service'
-
-@ApiTags('master-data')
-@Controller('api/master-data')
-@Injectable()
-export class MasterDataController {
-  constructor(private readonly masterDataService: CustomMasterDataService) {}
-
-  @Get('/')
-  async list(
-    @Query() searchDto: MasterDataSearchDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterDataService.list(searchDto, invokeContext)
-  }
-
-  @Get('/:pk/:sk')
-  async getDetail(@Param() key: DetailDto) {
-    return this.masterDataService.getDetail(key)
-  }
-
-  @Post('/')
-  async create(
-    @Body() createDto: MasterDataCreateDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterDataService.create(createDto, invokeContext)
-  }
-
-  @Put('/:pk/:sk')
-  async update(
-    @Param() key: DetailDto,
-    @Body() updateDto: MasterDataUpdateDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    const userContext = getUserContext(invokeContext)
-
-    const { tenantCode } = parsePk(key.pk)
-
-    if (userContext.tenantCode !== tenantCode) {
-      throw new BadRequestException('Invalid tenant code')
-    }
-    return this.masterDataService.update(key, updateDto, invokeContext)
-  }
-
-  @Delete('/:pk/:sk')
-  async delete(
-    @Param() key: DetailDto,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    const userContext = getUserContext(invokeContext)
-
-    const { tenantCode } = parsePk(key.pk)
-
-    if (userContext.tenantCode !== tenantCode) {
-      throw new BadRequestException('Invalid tenant code')
-    }
-
-    return this.masterDataService.delete(key, invokeContext)
-  }
-
-  @Post('/check-exist/:settingCode/:code')
-  async checkExistCode(
-    @Param('settingCode') settingCode: string,
-    @Param('code') code: string,
-    @INVOKE_CONTEXT() invokeContext: IInvoke,
-  ) {
-    return this.masterDataService.checkExistCode(
-      settingCode,
-      code,
-      invokeContext,
-    )
-  }
-}