fix: dto controller type

Add workaround to avoid error: Resource of type 'AWS::DynamoDB::Table' with identifier '...' already exists
Extend integration tests timeout

createEnv.mjs

@@ -34,7 +34,9 @@ lambdas.map(async l => {
 const tables = resources.filter(r => r.ResourceType === 'AWS::DynamoDB::Table');
 tables.map(async t => {
  const physicalResourceId = t.PhysicalResourceId;
- const logicalName = physicalResourceId.split('-').pop() + 'Table';
+ const logicalNameArr = physicalResourceId.split('-');
+ logicalNameArr.pop(); // Get rid of suffix
+ const logicalName = logicalNameArr.pop() + 'Table';
  await $`echo ${logicalName}=${physicalResourceId} >> ${envFile}`
 });
 

jest.config.js

@@ -9,7 +9,7 @@ switch (TEST_MODE) {
  break;
  case 'int':
  options.testRegex = '\\.int' + testRegex;
- options.testTimeout = 30000;
+ options.testTimeout = 35000;
  break;
  case 'e2e':
  options.testRegex = '\\.e2e' + testRegex;

src/shared/core/SubscriberController.ts

@@ -8,7 +8,7 @@ export abstract class SubscriberController<Request, Response> {
  protected event!: Request;
 
  protected abstract executeImpl(
- dto: unknown | Request
+ dto: Request
  ): ControllerResult<Response>;
 
  public async execute(event: Request): ExeResponse {

src/shared/infra/appsync/AppSyncController.ts

@@ -8,7 +8,7 @@ export const successfulCodes = [200, 201];
 
 export abstract class AppSyncController<Request, Response> {
  protected abstract executeImpl(
- dto: unknown | Request
+ dto: Request
  ): ControllerResult<Response>;
  public async execute(event: AppSyncResolverEvent<Request>): ExeResponse {
  console.log(`${this.constructor.name}.execute`);

stacks/MyStack.ts

@@ -56,7 +56,8 @@ export async function MyStack({ stack, app }: StackContext) {
  });
  allowSubscribeToDomainEvents(someWork, 'someWork');
 
- const DBretryTable = new Table(stack, 'DBretry', {
+ const tableSuffix = 2; // Create new tables to avoid error: Resource of type 'AWS::DynamoDB::Table' with identifier '...' already exists
+ const DBretryTable = new Table(stack, `DBretry-${tableSuffix}`, {
  fields: {
  retryToken: 'string',
  },
@@ -97,7 +98,7 @@ export async function MyStack({ stack, app }: StackContext) {
  });
  DBretryable(getAccountByUserId);
 
- const notificationsTable = new Table(stack, 'Notifications', {
+ const notificationsTable = new Table(stack, `Notifications-${tableSuffix}`, {
  fields: {
  target: 'string', // e.g. FE
  type: 'string', // e.g. TransactionCreated
@@ -202,7 +203,7 @@ export async function MyStack({ stack, app }: StackContext) {
  });
  allowSubscribeToDomainEvents(notifyFE, 'notifyFE');
 
- const storageTable = new Table(stack, 'Storage', {
+ const storageTable = new Table(stack, `Storage-${tableSuffix}`, {
  fields: {
  // Keys
  type: 'string', // UserCreatedEventStored | TransactionCreatedEventStored