@mbc-cqrs-serverless/cli 0.1.49-beta.0 → 0.1.51-beta.0

package/templates/prisma/schema.prisma

@@ -13,14 +13,12 @@ datasource db {
   relationMode = "prisma"
 }
 
-model Master {
+model Sample {
   id             String   @id
   cpk            String // コマンド用PK
   csk            String // コマンド用SK
-  pk             String // データ用PK, MASTER#tenantCode (テナントコード)
+  pk             String // データ用PK, SAMPLE#tenantCode (テナントコード)
   sk             String // データ用SK, マスタ種別コード#マスタコード
-  masterTypeCode String   @map("master_type_code") // マスタ種別コード, 【共通マスタ】 or 【テナント固有マスタ】
-  masterCode     String   @map("master_code") // マスタコード
   tenantCode     String   @map("tenant_code") // テナントコード, 【テナントコードマスタ】
   seq            Int      @default(0) // 並び順, 採番機能を使用する
   code           String // レコードのコード, マスタ種別コード#マスタコード
@@ -34,12 +32,11 @@ model Master {
   updatedIp      String   @default("") @map("updated_ip") // 更新IP, IPv6も考慮する
   updatedAt      DateTime @updatedAt @map("updated_at") @db.Timestamp(0) // 更新日時
 
-  atttributesMaster Json? @map("atttributes_master")
+  attributes Json? @map("attributes")
 
   @@unique([cpk, csk])
   @@unique([pk, sk])
   @@unique([tenantCode, code])
-  @@unique([tenantCode, masterTypeCode, masterCode])
   @@index([tenantCode, name])
-  @@map("masters")
+  @@map("samples")
 }

package/templates/src/helpers/id.ts

@@ -0,0 +1,12 @@
+import { KEY_SEPARATOR } from '@mbc-cqrs-serverless/core'
+
+export function parsePk(pk: string): { type: string; tenantCode: string } {
+  if (pk.split(KEY_SEPARATOR).length !== 2) {
+    throw new Error('Invalid PK')
+  }
+  const [type, tenantCode] = pk.split(KEY_SEPARATOR)
+  return {
+    type,
+    tenantCode,
+  }
+}

package/templates/src/helpers/index.ts

@@ -1 +1,2 @@
 export * from './get-order'
+export * from './id'

package/templates/src/main.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common'
 
 import { CustomEventFactory } from './event-factory'
-import { MasterModule } from './master/master.module'
 import { prismaLoggingMiddleware, PrismaModule } from './prisma'
+import { SampleModule } from './sample/sample.module'
 
 @Module({
   imports: [
@@ -19,7 +19,7 @@ import { prismaLoggingMiddleware, PrismaModule } from './prisma'
         explicitConnect: false,
       },
     }),
-    MasterModule,
+    SampleModule,
   ],
   providers: [CustomEventFactory],
 })

package/templates/src/{master/dto/master-attributes.dto.ts → sample/dto/sample-attributes.dto.ts}

@@ -1,6 +1,6 @@
 import { IsObject } from 'class-validator'
 
-export class MasterAttributes {
+export class SampleAttributes {
   @IsObject()
-  master: object
+  value: object
 }

package/templates/src/{master/dto/master-command.dto.ts → sample/dto/sample-command.dto.ts}

@@ -2,11 +2,11 @@ import { CommandDto } from '@mbc-cqrs-serverless/core'
 import { Type } from 'class-transformer'
 import { IsOptional, ValidateNested } from 'class-validator'
 
-import { MasterAttributes } from './master-attributes.dto'
+import { SampleAttributes } from './sample-attributes.dto'
 
-export class MasterCommandDto extends CommandDto {
-  @Type(() => MasterAttributes)
+export class SampleCommandDto extends CommandDto {
+  @Type(() => SampleAttributes)
   @ValidateNested()
   @IsOptional()
-  attributes: MasterAttributes
+  attributes: SampleAttributes
 }

package/templates/src/sample/entity/sample-command.entity.ts

@@ -0,0 +1,13 @@
+import { CommandEntity } from '@mbc-cqrs-serverless/core'
+
+import { SampleAttributes } from '../dto/sample-attributes.dto'
+
+export class SampleCommandEntity extends CommandEntity {
+  attributes: SampleAttributes
+
+  constructor(partial: Partial<SampleCommandEntity>) {
+    super()
+
+    Object.assign(this, partial)
+  }
+}

package/templates/src/sample/entity/sample-data-list.entity.ts

@@ -0,0 +1,13 @@
+import { DataListEntity } from '@mbc-cqrs-serverless/core'
+
+import { SampleDataEntity } from './sample-data.entity'
+
+export class SampleDataListEntity extends DataListEntity {
+  items: SampleDataEntity[]
+
+  constructor(partial: Partial<SampleDataListEntity>) {
+    super(partial)
+
+    Object.assign(this, partial)
+  }
+}

package/templates/src/sample/entity/sample-data.entity.ts

@@ -0,0 +1,13 @@
+import { DataEntity } from '@mbc-cqrs-serverless/core'
+
+import { SampleAttributes } from '../dto/sample-attributes.dto'
+
+export class SampleDataEntity extends DataEntity {
+  attributes: SampleAttributes
+
+  constructor(partial: Partial<SampleDataEntity>) {
+    super(partial)
+
+    Object.assign(this, partial)
+  }
+}

package/templates/src/{master/handler/master-rds.handler.ts → sample/handler/sample-rds.handler.ts}

@@ -7,15 +7,15 @@ import { Injectable, Logger } from '@nestjs/common'
 import { PrismaService } from 'src/prisma'
 
 @Injectable()
-export class MasterDataSyncRdsHandler implements IDataSyncHandler {
-  private readonly logger = new Logger(MasterDataSyncRdsHandler.name)
+export class SampleDataSyncRdsHandler implements IDataSyncHandler {
+  private readonly logger = new Logger(SampleDataSyncRdsHandler.name)
 
   constructor(private readonly prismaService: PrismaService) {}
 
   async up(cmd: CommandModel): Promise<any> {
     this.logger.debug(cmd)
     const sk = removeSortKeyVersion(cmd.sk)
-    await this.prismaService.master.upsert({
+    await this.prismaService.sample.upsert({
       where: {
         id: cmd.id,
       },
@@ -24,7 +24,7 @@ export class MasterDataSyncRdsHandler implements IDataSyncHandler {
         name: cmd.name,
         version: cmd.version,
         seq: cmd.seq,
-        atttributesMaster: cmd.attributes?.master,
+        attributes: cmd.attributes?.value,
         isDeleted: cmd.isDeleted || false,
         updatedAt: cmd.updatedAt,
         updatedBy: cmd.updatedBy,
@@ -36,14 +36,12 @@ export class MasterDataSyncRdsHandler implements IDataSyncHandler {
         csk: cmd.sk,
         pk: cmd.pk,
         sk,
-        masterTypeCode: sk.substring(0, sk.indexOf('#')),
-        masterCode: sk.substring(sk.indexOf('#') + 1),
         code: sk,
         name: cmd.name,
         version: cmd.version,
         tenantCode: cmd.tenantCode,
         seq: cmd.seq,
-        atttributesMaster: cmd.attributes?.master,
+        attributes: cmd.attributes?.value,
         createdAt: cmd.createdAt,
         createdBy: cmd.createdBy,
         createdIp: cmd.createdIp,

package/templates/src/{master/master.controller.ts → sample/sample.controller.ts}

@@ -18,68 +18,68 @@ import {
 } from '@nestjs/common'
 import { ApiTags } from '@nestjs/swagger'
 
-import { MasterCommandDto } from './dto/master-command.dto'
-import { MasterCommandEntity } from './entity/master-command.entity'
-import { MasterDataEntity } from './entity/master-data.entity'
-import { MasterDataListEntity } from './entity/master-data-list.entity'
-import { MasterService } from './master.service'
+import { SampleCommandDto } from './dto/sample-command.dto'
+import { SampleCommandEntity } from './entity/sample-command.entity'
+import { SampleDataEntity } from './entity/sample-data.entity'
+import { SampleDataListEntity } from './entity/sample-data-list.entity'
+import { SampleService } from './sample.service'
 
-@Controller('api/master')
-@ApiTags('master')
-export class MasterController {
-  private readonly logger = new Logger(MasterController.name)
+@Controller('api/sample')
+@ApiTags('sample')
+export class SampleController {
+  private readonly logger = new Logger(SampleController.name)
 
   constructor(
     private readonly commandService: CommandService,
     private readonly dataService: DataService,
-    private readonly masterService: MasterService,
+    private readonly sampleService: SampleService,
   ) {}
 
   @Post('/')
   async publishCommand(
     @INVOKE_CONTEXT() invokeContext: IInvoke,
-    @Body() masterDto: MasterCommandDto,
-  ): Promise<MasterDataEntity> {
-    this.logger.debug('cmd:', masterDto)
+    @Body() sampleDto: SampleCommandDto,
+  ): Promise<SampleDataEntity> {
+    this.logger.debug('cmd:', sampleDto)
     this.logger.debug('commandService:' + this.commandService.tableName)
-    const item = await this.commandService.publishAsync(masterDto, {
+    const item = await this.commandService.publishAsync(sampleDto, {
       invokeContext,
     })
-    return new MasterDataEntity(item as MasterDataEntity)
+    return new SampleDataEntity(item as SampleDataEntity)
   }
 
   @Get('command/:pk/:sk')
   async getCommand(
     @Param() detailDto: DetailDto,
-  ): Promise<MasterCommandEntity> {
+  ): Promise<SampleCommandEntity> {
     this.logger.debug('commandService:' + this.commandService.tableName)
     const item = await this.commandService.getItem(detailDto)
     if (!item) {
       throw new NotFoundException()
     }
     this.logger.debug('item:', item)
-    return new MasterCommandEntity(item as MasterCommandEntity)
+    return new SampleCommandEntity(item as SampleCommandEntity)
   }
 
   @Get('data/:pk/:sk')
-  async getData(@Param() detailDto: DetailDto): Promise<MasterDataEntity> {
+  async getData(@Param() detailDto: DetailDto): Promise<SampleDataEntity> {
     this.logger.debug('dataService:' + this.dataService.tableName)
     const item = await this.dataService.getItem(detailDto)
     if (!item) {
       throw new NotFoundException()
     }
     this.logger.debug('item:', item)
-    return new MasterDataEntity(item as MasterDataEntity)
+    return new SampleDataEntity(item as SampleDataEntity)
   }
 
   @Get('data/:pk')
-  async listDataByPk(@Param('pk') pk: string): Promise<MasterDataListEntity> {
+  async listDataByPk(@Param('pk') pk: string): Promise<SampleDataListEntity> {
     const res = await this.dataService.listItemsByPk(pk)
-    return new MasterDataListEntity(res as MasterDataListEntity)
+    return new SampleDataListEntity(res as SampleDataListEntity)
   }
 
   @Get('data')
   async searchData(@Query() searchDto: SearchDto) {
-    return await this.masterService.searchData(searchDto)
+    return await this.sampleService.searchData(searchDto)
   }
 }

package/templates/src/sample/sample.module.ts

@@ -0,0 +1,19 @@
+import { CommandModule } from '@mbc-cqrs-serverless/core'
+import { Module } from '@nestjs/common'
+
+import { SampleDataSyncRdsHandler } from './handler/sample-rds.handler'
+import { SampleController } from './sample.controller'
+import { SampleService } from './sample.service'
+
+@Module({
+  imports: [
+    CommandModule.register({
+      tableName: 'sample',
+      dataSyncHandlers: [SampleDataSyncRdsHandler],
+    }),
+  ],
+  controllers: [SampleController],
+  providers: [SampleService],
+  exports: [SampleService],
+})
+export class SampleModule {}

package/templates/src/{master/master.service.ts → sample/sample.service.ts}

@@ -4,17 +4,17 @@ import { Prisma } from '@prisma/client'
 import { getOrderBys } from 'src/helpers'
 import { PrismaService } from 'src/prisma'
 
-import { MasterDataEntity } from './entity/master-data.entity'
-import { MasterDataListEntity } from './entity/master-data-list.entity'
+import { SampleDataEntity } from './entity/sample-data.entity'
+import { SampleDataListEntity } from './entity/sample-data-list.entity'
 
 @Injectable()
-export class MasterService {
-  private readonly logger = new Logger(MasterService.name)
+export class SampleService {
+  private readonly logger = new Logger(SampleService.name)
 
   constructor(private readonly prismaService: PrismaService) {}
 
-  async searchData(searchDto: SearchDto): Promise<MasterDataListEntity> {
-    const where: Prisma.MasterWhereInput = {
+  async searchData(searchDto: SearchDto): Promise<SampleDataListEntity> {
+    const where: Prisma.SampleWhereInput = {
       isDeleted: false,
     }
     if (searchDto.keyword?.trim()) {
@@ -33,23 +33,23 @@ export class MasterService {
     const { pageSize = 10, page = 1, orderBys = ['-createdAt'] } = searchDto
 
     const [total, items] = await Promise.all([
-      this.prismaService.master.count({ where }),
-      this.prismaService.master.findMany({
+      this.prismaService.sample.count({ where }),
+      this.prismaService.sample.findMany({
         where,
         take: pageSize,
         skip: pageSize * (page - 1),
-        orderBy: getOrderBys<Prisma.MasterOrderByWithRelationInput>(orderBys),
+        orderBy: getOrderBys<Prisma.SampleOrderByWithRelationInput>(orderBys),
       }),
     ])
 
-    return new MasterDataListEntity({
+    return new SampleDataListEntity({
       total,
       items: items.map(
         (item) =>
-          new MasterDataEntity({
+          new SampleDataEntity({
             ...item,
             attributes: {
-              master: item.atttributesMaster as object,
+              value: item.attributes as object,
             },
           }),
       ),

package/templates/test/api.http

@@ -40,3 +40,28 @@ X-Amz-Target: AWSCognitoIdentityProviderService.InitiateAuth
 GET {{endpoint}}
 Accept: application/json
 Authorization: {{token}}
+
+###
+# sample
+POST {{apiBaseUrl}}/sample
+Accept: application/json
+Content-Type: application/json
+Authorization: {{token}}
+X-Tenant-Code: mbc
+
+{
+  "pk": "SAMPLE#mbc",
+  "sk": "foo#bar",
+  "id": "SAMPLE#mbc#foo#bar",
+  "code": "foo#bar",
+  "name": "Test",
+  "version": 0,
+  "isDeleted": true,
+  "type": "SAMPLE",
+  "tenantCode": "mbc",
+  "attributes": {
+    "value": {
+      "foo": "bar"
+    }
+  }
+}

package/templates/tsconfig.json

@@ -21,5 +21,5 @@
     "noLib": false,
     "noUnusedLocals": false
   },
-  "include": ["src/*", "src/**/*"]
+  "include": ["src/*", "src/**/*", "test/*", "test/**/*"]
 }

package/templates/src/master/entity/master-command.entity.ts

@@ -1,13 +0,0 @@
-import { CommandEntity } from '@mbc-cqrs-serverless/core'
-
-import { MasterAttributes } from '../dto/master-attributes.dto'
-
-export class MasterCommandEntity extends CommandEntity {
-  attributes: MasterAttributes
-
-  constructor(partial: Partial<MasterCommandEntity>) {
-    super()
-
-    Object.assign(this, partial)
-  }
-}

package/templates/src/master/entity/master-data-list.entity.ts

@@ -1,13 +0,0 @@
-import { DataListEntity } from '@mbc-cqrs-serverless/core'
-
-import { MasterDataEntity } from './master-data.entity'
-
-export class MasterDataListEntity extends DataListEntity {
-  items: MasterDataEntity[]
-
-  constructor(partial: Partial<MasterDataListEntity>) {
-    super(partial)
-
-    Object.assign(this, partial)
-  }
-}

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

@@ -1,13 +0,0 @@
-import { DataEntity } from '@mbc-cqrs-serverless/core'
-
-import { MasterAttributes } from '../dto/master-attributes.dto'
-
-export class MasterDataEntity extends DataEntity {
-  attributes: MasterAttributes
-
-  constructor(partial: Partial<MasterDataEntity>) {
-    super(partial)
-
-    Object.assign(this, partial)
-  }
-}

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

@@ -1,19 +0,0 @@
-import { CommandModule } from '@mbc-cqrs-serverless/core'
-import { Module } from '@nestjs/common'
-
-import { MasterDataSyncRdsHandler } from './handler/master-rds.handler'
-import { MasterController } from './master.controller'
-import { MasterService } from './master.service'
-
-@Module({
-  imports: [
-    CommandModule.register({
-      tableName: 'master',
-      dataSyncHandlers: [MasterDataSyncRdsHandler],
-    }),
-  ],
-  controllers: [MasterController],
-  providers: [MasterService],
-  exports: [MasterService],
-})
-export class MasterModule {}