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

package/templates/infra-local/swagger.json

@@ -0,0 +1,396 @@
+{
+  "openapi": "3.0.0",
+  "paths": {
+    "/": {
+      "get": {
+        "operationId": "AppController_getHello",
+        "parameters": [
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "responses": { "200": { "description": "" } },
+        "tags": ["main"]
+      }
+    },
+    "/api/sample": {
+      "post": {
+        "operationId": "SampleController_publishCommand",
+        "parameters": [
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": { "$ref": "#/components/schemas/SampleCommandDto" }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/SampleDataEntity" }
+              }
+            }
+          }
+        },
+        "tags": ["sample"]
+      }
+    },
+    "/api/sample/command/{pk}/{sk}": {
+      "get": {
+        "operationId": "SampleController_getCommand",
+        "parameters": [
+          {
+            "name": "pk",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "sk",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          },
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/SampleCommandEntity" }
+              }
+            }
+          }
+        },
+        "tags": ["sample"]
+      }
+    },
+    "/api/sample/data/{pk}/{sk}": {
+      "get": {
+        "operationId": "SampleController_getData",
+        "parameters": [
+          {
+            "name": "pk",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "sk",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          },
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/SampleDataEntity" }
+              }
+            }
+          }
+        },
+        "tags": ["sample"]
+      }
+    },
+    "/api/sample/data/{pk}": {
+      "get": {
+        "operationId": "SampleController_listDataByPk",
+        "parameters": [
+          {
+            "name": "pk",
+            "required": true,
+            "in": "path",
+            "schema": { "type": "string" }
+          },
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SampleDataListEntity"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["sample"]
+      }
+    },
+    "/api/sample/data": {
+      "get": {
+        "operationId": "SampleController_searchData",
+        "parameters": [
+          {
+            "name": "page",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "number" }
+          },
+          {
+            "name": "pageSize",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "number" }
+          },
+          {
+            "name": "keyword",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "id",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "pk",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "sk",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "string" }
+          },
+          {
+            "name": "orderBys",
+            "required": false,
+            "in": "query",
+            "schema": { "type": "array", "items": { "type": "string" } }
+          },
+          {
+            "in": "header",
+            "required": false,
+            "name": "x-tenant-code",
+            "schema": {}
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SampleDataListEntity"
+                }
+              }
+            }
+          }
+        },
+        "tags": ["sample"]
+      }
+    }
+  },
+  "info": {
+    "title": "serverless",
+    "description": "The serverless API",
+    "version": "1.0.0",
+    "contact": {}
+  },
+  "tags": [],
+  "servers": [{ "url": "http://localhost:3000/", "description": "local" }],
+  "components": {
+    "securitySchemes": {
+      "Api-Key": { "type": "apiKey", "in": "header", "name": "Authorization" }
+    },
+    "schemas": {
+      "SampleAttributes": {
+        "type": "object",
+        "properties": { "value": { "type": "object" } },
+        "required": ["value"]
+      },
+      "SampleCommandDto": {
+        "type": "object",
+        "properties": {
+          "pk": { "type": "string" },
+          "sk": { "type": "string" },
+          "id": { "type": "string" },
+          "code": { "type": "string" },
+          "name": { "type": "string" },
+          "version": { "type": "number" },
+          "tenantCode": { "type": "string" },
+          "type": { "type": "string" },
+          "seq": { "type": "number" },
+          "ttl": { "type": "number" },
+          "isDeleted": { "type": "boolean" },
+          "attributes": { "$ref": "#/components/schemas/SampleAttributes" }
+        },
+        "required": [
+          "pk",
+          "sk",
+          "id",
+          "code",
+          "name",
+          "version",
+          "tenantCode",
+          "type",
+          "attributes"
+        ]
+      },
+      "SampleDataEntity": {
+        "type": "object",
+        "properties": {
+          "cpk": { "type": "string" },
+          "csk": { "type": "string" },
+          "source": { "type": "string" },
+          "requestId": { "type": "string" },
+          "createdAt": { "format": "date-time", "type": "string" },
+          "updatedAt": { "format": "date-time", "type": "string" },
+          "createdBy": { "type": "string" },
+          "updatedBy": { "type": "string" },
+          "createdIp": { "type": "string" },
+          "updatedIp": { "type": "string" },
+          "pk": { "type": "string" },
+          "sk": { "type": "string" },
+          "id": { "type": "string" },
+          "code": { "type": "string" },
+          "name": { "type": "string" },
+          "version": { "type": "number" },
+          "tenantCode": { "type": "string" },
+          "type": { "type": "string" },
+          "seq": { "type": "number" },
+          "ttl": { "type": "number" },
+          "isDeleted": { "type": "boolean" },
+          "attributes": { "$ref": "#/components/schemas/SampleAttributes" }
+        },
+        "required": [
+          "pk",
+          "sk",
+          "id",
+          "code",
+          "name",
+          "version",
+          "tenantCode",
+          "type",
+          "attributes"
+        ]
+      },
+      "SampleCommandEntity": {
+        "type": "object",
+        "properties": {
+          "source": { "type": "string" },
+          "isDeleted": { "type": "boolean" },
+          "status": { "type": "string" },
+          "requestId": { "type": "string" },
+          "createdAt": { "format": "date-time", "type": "string" },
+          "updatedAt": { "format": "date-time", "type": "string" },
+          "createdBy": { "type": "string" },
+          "updatedBy": { "type": "string" },
+          "createdIp": { "type": "string" },
+          "updatedIp": { "type": "string" },
+          "pk": { "type": "string" },
+          "sk": { "type": "string" },
+          "id": { "type": "string" },
+          "code": { "type": "string" },
+          "name": { "type": "string" },
+          "version": { "type": "number" },
+          "tenantCode": { "type": "string" },
+          "type": { "type": "string" },
+          "seq": { "type": "number" },
+          "ttl": { "type": "number" },
+          "attributes": { "$ref": "#/components/schemas/SampleAttributes" }
+        },
+        "required": [
+          "pk",
+          "sk",
+          "id",
+          "code",
+          "name",
+          "version",
+          "tenantCode",
+          "type",
+          "attributes"
+        ]
+      },
+      "DataEntity": {
+        "type": "object",
+        "properties": {
+          "cpk": { "type": "string" },
+          "csk": { "type": "string" },
+          "source": { "type": "string" },
+          "requestId": { "type": "string" },
+          "createdAt": { "format": "date-time", "type": "string" },
+          "updatedAt": { "format": "date-time", "type": "string" },
+          "createdBy": { "type": "string" },
+          "updatedBy": { "type": "string" },
+          "createdIp": { "type": "string" },
+          "updatedIp": { "type": "string" },
+          "pk": { "type": "string" },
+          "sk": { "type": "string" },
+          "id": { "type": "string" },
+          "code": { "type": "string" },
+          "name": { "type": "string" },
+          "version": { "type": "number" },
+          "tenantCode": { "type": "string" },
+          "type": { "type": "string" },
+          "seq": { "type": "number" },
+          "ttl": { "type": "number" },
+          "isDeleted": { "type": "boolean" }
+        },
+        "required": [
+          "pk",
+          "sk",
+          "id",
+          "code",
+          "name",
+          "version",
+          "tenantCode",
+          "type"
+        ]
+      },
+      "SampleDataListEntity": {
+        "type": "object",
+        "properties": {
+          "total": { "type": "number" },
+          "lastSk": { "type": "string" },
+          "items": {
+            "type": "array",
+            "items": { "$ref": "#/components/schemas/DataEntity" }
+          }
+        },
+        "required": ["items"]
+      }
+    }
+  },
+  "security": [{ "Api-Key": [] }]
+}

package/templates/package.json

@@ -45,6 +45,7 @@
     "prisma": "^5.7.1"
   },
   "devDependencies": {
+    "@golevelup/ts-jest": "^0.6.1",
     "@mbc-cqrs-serverless/cli": "",
     "@nestjs/cli": "^10.2.1",
     "@nestjs/common": "^10.3.0",

package/templates/prisma/dynamodbs/cqrs.json

@@ -1 +1 @@
-["master"]
+["sample"]

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,