From 99261f37cd297c4bb293b69cc2eb23813cd8596d Mon Sep 17 00:00:00 2001 From: shancheas Date: Tue, 9 Jul 2024 17:20:10 +0700 Subject: [PATCH 1/6] fix: change String type data to string --- .../orchestrators/base-data-transaction.orchestrator.ts | 6 +++--- .../usecase/orchestrators/base-data.orchestrator.ts | 2 +- .../base-status/{{dashCase name}}-data.controller.ts.hbs | 8 ++++---- .../base/{{dashCase name}}-data.controller.ts.hbs | 2 +- .../{{dashCase name}}-data.orchestrator.ts.hbs | 8 ++++---- .../base/{{dashCase name}}-data.orchestrator.ts.hbs | 2 +- .../domain/usecases/item-category-data.orchestrator.ts | 8 ++++---- .../infrastructure/item-category-data.controller.ts | 8 ++++---- .../domain/usecases/item-rate-data.orchestrator.ts | 2 +- .../item-rate/infrastructure/item-rate-data.controller.ts | 2 +- .../item/domain/usecases/item-data.orchestrator.ts | 8 ++++---- .../item/infrastructure/item-data.controller.ts | 8 ++++---- .../domain/usecases/season-period-data.orchestrator.ts | 8 ++++---- .../infrastructure/season-period-data.controller.ts | 8 ++++---- .../domain/usecases/season-type-data.orchestrator.ts | 8 ++++---- .../infrastructure/season-type-data.controller.ts | 8 ++++---- .../domain/usecases/payment-method-data.orchestrator.ts | 8 ++++---- .../infrastructure/payment-method-data.controller.ts | 8 ++++---- .../domain/usecases/reconciliation-data.orchestrator.ts | 4 ++-- .../infrastructure/reconciliation-data.controller.ts | 4 ++-- .../tax/domain/usecases/tax-data.orchestrator.ts | 8 ++++---- .../transaction/tax/infrastructure/tax-data.controller.ts | 8 ++++---- .../domain/usecases/transaction-data.orchestrator.ts | 8 ++++---- .../infrastructure/transaction-data.controller.ts | 8 ++++---- .../domain/usecases/vip-category-data.orchestrator.ts | 8 ++++---- .../infrastructure/vip-category-data.controller.ts | 8 ++++---- .../domain/usecases/vip-code-data.orchestrator.ts | 2 +- .../vip-code/infrastructure/vip-code-data.controller.ts | 4 ++-- .../tenant/domain/usecases/tenant-data.orchestrator.ts | 8 ++++---- .../tenant/infrastructure/tenant-data.controller.ts | 8 ++++---- .../tenant/infrastructure/tenant-item-data.controller.ts | 8 ++++---- .../user-privilege/user-privilege-data.orchestrator.ts | 8 ++++---- .../infrastructure/user-privilege-data.controller.ts | 8 ++++---- .../user/domain/usecases/user-data.orchestrator.ts | 8 ++++---- .../user/infrastructure/user-data.controller.ts | 8 ++++---- 35 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/core/modules/domain/usecase/orchestrators/base-data-transaction.orchestrator.ts b/src/core/modules/domain/usecase/orchestrators/base-data-transaction.orchestrator.ts index a3e844f..efecc88 100644 --- a/src/core/modules/domain/usecase/orchestrators/base-data-transaction.orchestrator.ts +++ b/src/core/modules/domain/usecase/orchestrators/base-data-transaction.orchestrator.ts @@ -4,9 +4,9 @@ import { BaseDataOrchestrator } from './base-data.orchestrator'; export abstract class BaseDataTransactionOrchestrator< Entity, > extends BaseDataOrchestrator { - abstract active(dataId: string): Promise; - abstract confirm(dataId: string): Promise; - abstract inactive(dataId: string): Promise; + abstract active(dataId: string): Promise; + abstract confirm(dataId: string): Promise; + abstract inactive(dataId: string): Promise; abstract batchConfirm(dataIds: string[]): Promise; abstract batchActive(dataIds: string[]): Promise; abstract batchInactive(dataIds: string[]): Promise; diff --git a/src/core/modules/domain/usecase/orchestrators/base-data.orchestrator.ts b/src/core/modules/domain/usecase/orchestrators/base-data.orchestrator.ts index 0d61ece..4d4699d 100644 --- a/src/core/modules/domain/usecase/orchestrators/base-data.orchestrator.ts +++ b/src/core/modules/domain/usecase/orchestrators/base-data.orchestrator.ts @@ -3,6 +3,6 @@ import { BatchResult } from 'src/core/response/domain/ok-response.interface'; export abstract class BaseDataOrchestrator { abstract create(data: Entity): Promise; abstract update(dataId: string, data: Entity): Promise; - abstract delete(dataId: string): Promise; + abstract delete(dataId: string): Promise; abstract batchDelete(dataIds: string[]): Promise; } diff --git a/src/core/templates/controllers/base-status/{{dashCase name}}-data.controller.ts.hbs b/src/core/templates/controllers/base-status/{{dashCase name}}-data.controller.ts.hbs index 8cd174e..229c14d 100644 --- a/src/core/templates/controllers/base-status/{{dashCase name}}-data.controller.ts.hbs +++ b/src/core/templates/controllers/base-status/{{dashCase name}}-data.controller.ts.hbs @@ -36,7 +36,7 @@ export class {{pascalCase name}}DataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -46,7 +46,7 @@ export class {{pascalCase name}}DataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -56,7 +56,7 @@ export class {{pascalCase name}}DataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -74,7 +74,7 @@ export class {{pascalCase name}}DataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/core/templates/controllers/base/{{dashCase name}}-data.controller.ts.hbs b/src/core/templates/controllers/base/{{dashCase name}}-data.controller.ts.hbs index c725776..cf4487d 100644 --- a/src/core/templates/controllers/base/{{dashCase name}}-data.controller.ts.hbs +++ b/src/core/templates/controllers/base/{{dashCase name}}-data.controller.ts.hbs @@ -43,7 +43,7 @@ import { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/core/templates/orchestrators/base-status/{{dashCase name}}-data.orchestrator.ts.hbs b/src/core/templates/orchestrators/base-status/{{dashCase name}}-data.orchestrator.ts.hbs index 02e4a49..12f0cc0 100644 --- a/src/core/templates/orchestrators/base-status/{{dashCase name}}-data.orchestrator.ts.hbs +++ b/src/core/templates/orchestrators/base-status/{{dashCase name}}-data.orchestrator.ts.hbs @@ -48,7 +48,7 @@ export class {{pascalCase name}}DataOrchestrator extends Base{{pascalCase orches return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.{{constantCase name}}); await this.deleteManager.execute(); @@ -65,7 +65,7 @@ export class {{pascalCase name}}DataOrchestrator extends Base{{pascalCase orches return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.{{constantCase name}}); await this.activeManager.execute(); @@ -82,7 +82,7 @@ export class {{pascalCase name}}DataOrchestrator extends Base{{pascalCase orches return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.{{constantCase name}}); await this.confirmManager.execute(); @@ -99,7 +99,7 @@ export class {{pascalCase name}}DataOrchestrator extends Base{{pascalCase orches return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService( this.serviceData, diff --git a/src/core/templates/orchestrators/base/{{dashCase name}}-data.orchestrator.ts.hbs b/src/core/templates/orchestrators/base/{{dashCase name}}-data.orchestrator.ts.hbs index c34c40b..89e7008 100644 --- a/src/core/templates/orchestrators/base/{{dashCase name}}-data.orchestrator.ts.hbs +++ b/src/core/templates/orchestrators/base/{{dashCase name}}-data.orchestrator.ts.hbs @@ -36,7 +36,7 @@ export class {{pascalCase name}}DataOrchestrator extends Base{{pascalCase orches return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.{{constantCase name}}); await this.deleteManager.execute(); diff --git a/src/modules/item-related/item-category/domain/usecases/item-category-data.orchestrator.ts b/src/modules/item-related/item-category/domain/usecases/item-category-data.orchestrator.ts index 7d356c0..916c8e5 100644 --- a/src/modules/item-related/item-category/domain/usecases/item-category-data.orchestrator.ts +++ b/src/modules/item-related/item-category/domain/usecases/item-category-data.orchestrator.ts @@ -49,7 +49,7 @@ export class ItemCategoryDataOrchestrator extends BaseDataTransactionOrchestrato return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.ITEM_CATEGORY); await this.deleteManager.execute(); @@ -66,7 +66,7 @@ export class ItemCategoryDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.ITEM_CATEGORY); await this.activeManager.execute(); @@ -83,7 +83,7 @@ export class ItemCategoryDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.ITEM_CATEGORY); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class ItemCategoryDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.ITEM_CATEGORY); await this.inactiveManager.execute(); diff --git a/src/modules/item-related/item-category/infrastructure/item-category-data.controller.ts b/src/modules/item-related/item-category/infrastructure/item-category-data.controller.ts index 47c06bb..f8847dd 100644 --- a/src/modules/item-related/item-category/infrastructure/item-category-data.controller.ts +++ b/src/modules/item-related/item-category/infrastructure/item-category-data.controller.ts @@ -34,7 +34,7 @@ export class ItemCategoryDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class ItemCategoryDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class ItemCategoryDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class ItemCategoryDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/item-related/item-rate/domain/usecases/item-rate-data.orchestrator.ts b/src/modules/item-related/item-rate/domain/usecases/item-rate-data.orchestrator.ts index 0745326..f383d6f 100644 --- a/src/modules/item-related/item-rate/domain/usecases/item-rate-data.orchestrator.ts +++ b/src/modules/item-related/item-rate/domain/usecases/item-rate-data.orchestrator.ts @@ -36,7 +36,7 @@ export class ItemRateDataOrchestrator extends BaseDataOrchestrator { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.ITEM_RATE); await this.deleteManager.execute(); diff --git a/src/modules/item-related/item-rate/infrastructure/item-rate-data.controller.ts b/src/modules/item-related/item-rate/infrastructure/item-rate-data.controller.ts index 6a789db..82dfa2b 100644 --- a/src/modules/item-related/item-rate/infrastructure/item-rate-data.controller.ts +++ b/src/modules/item-related/item-rate/infrastructure/item-rate-data.controller.ts @@ -38,7 +38,7 @@ export class ItemRateDataController { } // @Delete(':id') - // async delete(@Param('id') dataId: string): Promise { + // async delete(@Param('id') dataId: string): Promise { // return await this.orchestrator.delete(dataId); // } } diff --git a/src/modules/item-related/item/domain/usecases/item-data.orchestrator.ts b/src/modules/item-related/item/domain/usecases/item-data.orchestrator.ts index d7efe8b..69a2463 100644 --- a/src/modules/item-related/item/domain/usecases/item-data.orchestrator.ts +++ b/src/modules/item-related/item/domain/usecases/item-data.orchestrator.ts @@ -60,7 +60,7 @@ export class ItemDataOrchestrator extends BaseDataTransactionOrchestrator { + async delete(dataId, tenantId?: string): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.ITEM); await this.deleteManager.execute(); @@ -77,7 +77,7 @@ export class ItemDataOrchestrator extends BaseDataTransactionOrchestrator { + async active(dataId, tenantId?: string): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.ITEM); await this.activeManager.execute(); @@ -94,7 +94,7 @@ export class ItemDataOrchestrator extends BaseDataTransactionOrchestrator { + async confirm(dataId, tenantId?: string): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.ITEM); await this.confirmManager.execute(); @@ -111,7 +111,7 @@ export class ItemDataOrchestrator extends BaseDataTransactionOrchestrator { + async inactive(dataId, tenantId?: string): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.ITEM); await this.inactiveManager.execute(); diff --git a/src/modules/item-related/item/infrastructure/item-data.controller.ts b/src/modules/item-related/item/infrastructure/item-data.controller.ts index a347dfa..44a855d 100644 --- a/src/modules/item-related/item/infrastructure/item-data.controller.ts +++ b/src/modules/item-related/item/infrastructure/item-data.controller.ts @@ -34,7 +34,7 @@ export class ItemDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class ItemDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class ItemDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class ItemDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/season-related/season-period/domain/usecases/season-period-data.orchestrator.ts b/src/modules/season-related/season-period/domain/usecases/season-period-data.orchestrator.ts index afedcc4..8db3a3c 100644 --- a/src/modules/season-related/season-period/domain/usecases/season-period-data.orchestrator.ts +++ b/src/modules/season-related/season-period/domain/usecases/season-period-data.orchestrator.ts @@ -60,7 +60,7 @@ export class SeasonPeriodDataOrchestrator extends BaseDataTransactionOrchestrato return this.updatePriceManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.SEASON_PERIOD); await this.deleteManager.execute(); @@ -77,7 +77,7 @@ export class SeasonPeriodDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.SEASON_PERIOD); await this.activeManager.execute(); @@ -94,7 +94,7 @@ export class SeasonPeriodDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.SEASON_PERIOD); await this.confirmManager.execute(); @@ -111,7 +111,7 @@ export class SeasonPeriodDataOrchestrator extends BaseDataTransactionOrchestrato return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.SEASON_PERIOD); await this.inactiveManager.execute(); diff --git a/src/modules/season-related/season-period/infrastructure/season-period-data.controller.ts b/src/modules/season-related/season-period/infrastructure/season-period-data.controller.ts index 23f19a5..8d941cb 100644 --- a/src/modules/season-related/season-period/infrastructure/season-period-data.controller.ts +++ b/src/modules/season-related/season-period/infrastructure/season-period-data.controller.ts @@ -44,7 +44,7 @@ export class SeasonPeriodDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -54,7 +54,7 @@ export class SeasonPeriodDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -64,7 +64,7 @@ export class SeasonPeriodDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -91,7 +91,7 @@ export class SeasonPeriodDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/season-related/season-type/domain/usecases/season-type-data.orchestrator.ts b/src/modules/season-related/season-type/domain/usecases/season-type-data.orchestrator.ts index dd5a032..52a07fa 100644 --- a/src/modules/season-related/season-type/domain/usecases/season-type-data.orchestrator.ts +++ b/src/modules/season-related/season-type/domain/usecases/season-type-data.orchestrator.ts @@ -48,7 +48,7 @@ export class SeasonTypeDataOrchestrator extends BaseDataTransactionOrchestrator< return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.SEASON_TYPE); await this.deleteManager.execute(); @@ -65,7 +65,7 @@ export class SeasonTypeDataOrchestrator extends BaseDataTransactionOrchestrator< return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.SEASON_TYPE); await this.activeManager.execute(); @@ -82,7 +82,7 @@ export class SeasonTypeDataOrchestrator extends BaseDataTransactionOrchestrator< return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.SEASON_TYPE); await this.confirmManager.execute(); @@ -99,7 +99,7 @@ export class SeasonTypeDataOrchestrator extends BaseDataTransactionOrchestrator< return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.SEASON_TYPE); await this.inactiveManager.execute(); diff --git a/src/modules/season-related/season-type/infrastructure/season-type-data.controller.ts b/src/modules/season-related/season-type/infrastructure/season-type-data.controller.ts index 60230da..cda08ba 100644 --- a/src/modules/season-related/season-type/infrastructure/season-type-data.controller.ts +++ b/src/modules/season-related/season-type/infrastructure/season-type-data.controller.ts @@ -34,7 +34,7 @@ export class SeasonTypeDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class SeasonTypeDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class SeasonTypeDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class SeasonTypeDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/transaction/payment-method/domain/usecases/payment-method-data.orchestrator.ts b/src/modules/transaction/payment-method/domain/usecases/payment-method-data.orchestrator.ts index bd132c1..fe3454d 100644 --- a/src/modules/transaction/payment-method/domain/usecases/payment-method-data.orchestrator.ts +++ b/src/modules/transaction/payment-method/domain/usecases/payment-method-data.orchestrator.ts @@ -48,7 +48,7 @@ export class PaymentMethodDataOrchestrator extends BaseDataTransactionOrchestrat return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.PAYMENT_METHOD); await this.deleteManager.execute(); @@ -65,7 +65,7 @@ export class PaymentMethodDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.PAYMENT_METHOD); await this.activeManager.execute(); @@ -82,7 +82,7 @@ export class PaymentMethodDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.PAYMENT_METHOD); await this.confirmManager.execute(); @@ -99,7 +99,7 @@ export class PaymentMethodDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService( this.serviceData, diff --git a/src/modules/transaction/payment-method/infrastructure/payment-method-data.controller.ts b/src/modules/transaction/payment-method/infrastructure/payment-method-data.controller.ts index ec50991..c708c2d 100644 --- a/src/modules/transaction/payment-method/infrastructure/payment-method-data.controller.ts +++ b/src/modules/transaction/payment-method/infrastructure/payment-method-data.controller.ts @@ -34,7 +34,7 @@ export class PaymentMethodDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class PaymentMethodDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class PaymentMethodDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class PaymentMethodDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/transaction/reconciliation/domain/usecases/reconciliation-data.orchestrator.ts b/src/modules/transaction/reconciliation/domain/usecases/reconciliation-data.orchestrator.ts index 7086980..62b229d 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/reconciliation-data.orchestrator.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/reconciliation-data.orchestrator.ts @@ -39,7 +39,7 @@ export class ReconciliationDataOrchestrator { return this.recapManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.CONFIRMED); this.confirmManager.setService(this.serviceData, TABLE_NAME.TRANSACTION); await this.confirmManager.execute(); @@ -56,7 +56,7 @@ export class ReconciliationDataOrchestrator { return this.batchConfirmManager.getResult(); } - async cancel(dataId): Promise { + async cancel(dataId): Promise { this.cancelManager.setData(dataId, STATUS.REJECTED); this.cancelManager.setService(this.serviceData, TABLE_NAME.TRANSACTION); await this.cancelManager.execute(); diff --git a/src/modules/transaction/reconciliation/infrastructure/reconciliation-data.controller.ts b/src/modules/transaction/reconciliation/infrastructure/reconciliation-data.controller.ts index 324ac13..15e7f1e 100644 --- a/src/modules/transaction/reconciliation/infrastructure/reconciliation-data.controller.ts +++ b/src/modules/transaction/reconciliation/infrastructure/reconciliation-data.controller.ts @@ -34,12 +34,12 @@ export class ReconciliationDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @Patch(':id/cancel') - async cancel(@Param('id') dataId: string): Promise { + async cancel(@Param('id') dataId: string): Promise { return await this.orchestrator.cancel(dataId); } diff --git a/src/modules/transaction/tax/domain/usecases/tax-data.orchestrator.ts b/src/modules/transaction/tax/domain/usecases/tax-data.orchestrator.ts index c94cffb..d37d615 100644 --- a/src/modules/transaction/tax/domain/usecases/tax-data.orchestrator.ts +++ b/src/modules/transaction/tax/domain/usecases/tax-data.orchestrator.ts @@ -50,7 +50,7 @@ export class TaxDataOrchestrator extends BaseDataTransactionOrchestrator { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService( this.serviceData, @@ -72,7 +72,7 @@ export class TaxDataOrchestrator extends BaseDataTransactionOrchestrator { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.TAX); await this.activeManager.execute(); @@ -86,7 +86,7 @@ export class TaxDataOrchestrator extends BaseDataTransactionOrchestrator { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.TAX); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class TaxDataOrchestrator extends BaseDataTransactionOrchestrator { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService( this.serviceData, diff --git a/src/modules/transaction/tax/infrastructure/tax-data.controller.ts b/src/modules/transaction/tax/infrastructure/tax-data.controller.ts index ff6e2d0..283c9da 100644 --- a/src/modules/transaction/tax/infrastructure/tax-data.controller.ts +++ b/src/modules/transaction/tax/infrastructure/tax-data.controller.ts @@ -34,7 +34,7 @@ export class TaxDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class TaxDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class TaxDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class TaxDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/transaction/transaction/domain/usecases/transaction-data.orchestrator.ts b/src/modules/transaction/transaction/domain/usecases/transaction-data.orchestrator.ts index fbb992e..477fd1e 100644 --- a/src/modules/transaction/transaction/domain/usecases/transaction-data.orchestrator.ts +++ b/src/modules/transaction/transaction/domain/usecases/transaction-data.orchestrator.ts @@ -45,7 +45,7 @@ export class TransactionDataOrchestrator { return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.TRANSACTION); await this.deleteManager.execute(); @@ -62,7 +62,7 @@ export class TransactionDataOrchestrator { return this.batchDeleteManager.getResult(); } - async cancel(dataId): Promise { + async cancel(dataId): Promise { this.cancelManager.setData(dataId, STATUS.CANCEL); this.cancelManager.setService(this.serviceData, TABLE_NAME.TRANSACTION); await this.cancelManager.execute(); @@ -79,7 +79,7 @@ export class TransactionDataOrchestrator { return this.batchCancelManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.TRANSACTION); await this.confirmManager.execute(); @@ -96,7 +96,7 @@ export class TransactionDataOrchestrator { return this.batchConfirmManager.getResult(); } - async confirmData(dataId): Promise { + async confirmData(dataId): Promise { this.confirmDataManager.setData(dataId, STATUS.ACTIVE); this.confirmDataManager.setService( this.serviceData, diff --git a/src/modules/transaction/transaction/infrastructure/transaction-data.controller.ts b/src/modules/transaction/transaction/infrastructure/transaction-data.controller.ts index 07b1364..8866cde 100644 --- a/src/modules/transaction/transaction/infrastructure/transaction-data.controller.ts +++ b/src/modules/transaction/transaction/infrastructure/transaction-data.controller.ts @@ -34,7 +34,7 @@ export class TransactionDataController { } @Patch(':id/confirm-data') - async confirmData(@Param('id') dataId: string): Promise { + async confirmData(@Param('id') dataId: string): Promise { return await this.orchestrator.confirmData(dataId); } @@ -44,7 +44,7 @@ export class TransactionDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class TransactionDataController { } @Patch(':id/cancel') - async cancel(@Param('id') dataId: string): Promise { + async cancel(@Param('id') dataId: string): Promise { return await this.orchestrator.cancel(dataId); } @@ -72,7 +72,7 @@ export class TransactionDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/transaction/vip-category/domain/usecases/vip-category-data.orchestrator.ts b/src/modules/transaction/vip-category/domain/usecases/vip-category-data.orchestrator.ts index 92b6c8a..f5102a5 100644 --- a/src/modules/transaction/vip-category/domain/usecases/vip-category-data.orchestrator.ts +++ b/src/modules/transaction/vip-category/domain/usecases/vip-category-data.orchestrator.ts @@ -49,7 +49,7 @@ export class VipCategoryDataOrchestrator extends BaseDataTransactionOrchestrator return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.VIP_CATEGORY); await this.deleteManager.execute(); @@ -66,7 +66,7 @@ export class VipCategoryDataOrchestrator extends BaseDataTransactionOrchestrator return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.VIP_CATEGORY); await this.activeManager.execute(); @@ -83,7 +83,7 @@ export class VipCategoryDataOrchestrator extends BaseDataTransactionOrchestrator return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.VIP_CATEGORY); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class VipCategoryDataOrchestrator extends BaseDataTransactionOrchestrator return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.VIP_CATEGORY); await this.inactiveManager.execute(); diff --git a/src/modules/transaction/vip-category/infrastructure/vip-category-data.controller.ts b/src/modules/transaction/vip-category/infrastructure/vip-category-data.controller.ts index 173f9b4..64feb30 100644 --- a/src/modules/transaction/vip-category/infrastructure/vip-category-data.controller.ts +++ b/src/modules/transaction/vip-category/infrastructure/vip-category-data.controller.ts @@ -34,7 +34,7 @@ export class VipCategoryDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -44,7 +44,7 @@ export class VipCategoryDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -54,7 +54,7 @@ export class VipCategoryDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -72,7 +72,7 @@ export class VipCategoryDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/transaction/vip-code/domain/usecases/vip-code-data.orchestrator.ts b/src/modules/transaction/vip-code/domain/usecases/vip-code-data.orchestrator.ts index c04977e..85d9242 100644 --- a/src/modules/transaction/vip-code/domain/usecases/vip-code-data.orchestrator.ts +++ b/src/modules/transaction/vip-code/domain/usecases/vip-code-data.orchestrator.ts @@ -21,7 +21,7 @@ export class VipCodeDataOrchestrator extends BaseDataOrchestrator update(dataId: string, data: VipCodeEntity): Promise { throw new Error('Method not implemented.'); } - delete(dataId: string): Promise { + delete(dataId: string): Promise { throw new Error('Method not implemented.'); } batchDelete(dataIds: string[]): Promise { diff --git a/src/modules/transaction/vip-code/infrastructure/vip-code-data.controller.ts b/src/modules/transaction/vip-code/infrastructure/vip-code-data.controller.ts index 3ae91ee..a3f89b5 100644 --- a/src/modules/transaction/vip-code/infrastructure/vip-code-data.controller.ts +++ b/src/modules/transaction/vip-code/infrastructure/vip-code-data.controller.ts @@ -19,7 +19,7 @@ export class VipCodeDataController { } @Post('generate-code') - async generateCOde(): Promise { + async generateCOde(): Promise { return await this.orchestrator.generateCode(); } @@ -29,7 +29,7 @@ export class VipCodeDataController { // } // @Delete(':id') - // async delete(@Param('id') dataId: string): Promise { + // async delete(@Param('id') dataId: string): Promise { // return await this.orchestrator.delete(dataId); // } } diff --git a/src/modules/user-related/tenant/domain/usecases/tenant-data.orchestrator.ts b/src/modules/user-related/tenant/domain/usecases/tenant-data.orchestrator.ts index 23942e6..7b11ae7 100644 --- a/src/modules/user-related/tenant/domain/usecases/tenant-data.orchestrator.ts +++ b/src/modules/user-related/tenant/domain/usecases/tenant-data.orchestrator.ts @@ -58,7 +58,7 @@ export class TenantDataOrchestrator extends BaseDataTransactionOrchestrator { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.TENANT); await this.deleteManager.execute(); @@ -72,7 +72,7 @@ export class TenantDataOrchestrator extends BaseDataTransactionOrchestrator { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.TENANT); await this.activeManager.execute(); @@ -86,7 +86,7 @@ export class TenantDataOrchestrator extends BaseDataTransactionOrchestrator { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.TENANT); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class TenantDataOrchestrator extends BaseDataTransactionOrchestrator { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.TENANT); await this.inactiveManager.execute(); diff --git a/src/modules/user-related/tenant/infrastructure/tenant-data.controller.ts b/src/modules/user-related/tenant/infrastructure/tenant-data.controller.ts index b9fc12a..afe7961 100644 --- a/src/modules/user-related/tenant/infrastructure/tenant-data.controller.ts +++ b/src/modules/user-related/tenant/infrastructure/tenant-data.controller.ts @@ -36,7 +36,7 @@ export class TenantDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -46,7 +46,7 @@ export class TenantDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -56,7 +56,7 @@ export class TenantDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -82,7 +82,7 @@ export class TenantDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/user-related/tenant/infrastructure/tenant-item-data.controller.ts b/src/modules/user-related/tenant/infrastructure/tenant-item-data.controller.ts index 24bb7a6..778dc75 100644 --- a/src/modules/user-related/tenant/infrastructure/tenant-item-data.controller.ts +++ b/src/modules/user-related/tenant/infrastructure/tenant-item-data.controller.ts @@ -43,7 +43,7 @@ export class TenantItemDataController { async active( @Param('tenant_id') tenant_id: string, @Param('id') dataId: string, - ): Promise { + ): Promise { return await this.orchestrator.active(dataId); } @@ -59,7 +59,7 @@ export class TenantItemDataController { async confirm( @Param('tenant_id') tenant_id: string, @Param('id') dataId: string, - ): Promise { + ): Promise { return await this.orchestrator.confirm(dataId); } @@ -75,7 +75,7 @@ export class TenantItemDataController { async inactive( @Param('tenant_id') tenant_id: string, @Param('id') dataId: string, - ): Promise { + ): Promise { return await this.orchestrator.inactive(dataId); } @@ -100,7 +100,7 @@ export class TenantItemDataController { async delete( @Param('tenant_id') tenant_id: string, @Param('id') dataId: string, - ): Promise { + ): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/user-related/user-privilege/domain/usecases/user-privilege/user-privilege-data.orchestrator.ts b/src/modules/user-related/user-privilege/domain/usecases/user-privilege/user-privilege-data.orchestrator.ts index 9099073..31b7c67 100644 --- a/src/modules/user-related/user-privilege/domain/usecases/user-privilege/user-privilege-data.orchestrator.ts +++ b/src/modules/user-related/user-privilege/domain/usecases/user-privilege/user-privilege-data.orchestrator.ts @@ -49,7 +49,7 @@ export class UserPrivilegeDataOrchestrator extends BaseDataTransactionOrchestrat return this.updateManager.getResult(); } - async delete(dataId): Promise { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.USER_PRIVILEGE); await this.deleteManager.execute(); @@ -66,7 +66,7 @@ export class UserPrivilegeDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchDeleteManager.getResult(); } - async active(dataId): Promise { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.USER_PRIVILEGE); await this.activeManager.execute(); @@ -83,7 +83,7 @@ export class UserPrivilegeDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchActiveManager.getResult(); } - async confirm(dataId): Promise { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.USER_PRIVILEGE); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class UserPrivilegeDataOrchestrator extends BaseDataTransactionOrchestrat return this.batchConfirmManager.getResult(); } - async inactive(dataId): Promise { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService( this.serviceData, diff --git a/src/modules/user-related/user-privilege/infrastructure/user-privilege-data.controller.ts b/src/modules/user-related/user-privilege/infrastructure/user-privilege-data.controller.ts index 4f8089a..0efb974 100644 --- a/src/modules/user-related/user-privilege/infrastructure/user-privilege-data.controller.ts +++ b/src/modules/user-related/user-privilege/infrastructure/user-privilege-data.controller.ts @@ -36,7 +36,7 @@ export class UserPrivilegeDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -46,7 +46,7 @@ export class UserPrivilegeDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -56,7 +56,7 @@ export class UserPrivilegeDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -74,7 +74,7 @@ export class UserPrivilegeDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } diff --git a/src/modules/user-related/user/domain/usecases/user-data.orchestrator.ts b/src/modules/user-related/user/domain/usecases/user-data.orchestrator.ts index dec4731..b77e469 100644 --- a/src/modules/user-related/user/domain/usecases/user-data.orchestrator.ts +++ b/src/modules/user-related/user/domain/usecases/user-data.orchestrator.ts @@ -58,7 +58,7 @@ export class UserDataOrchestrator extends BaseDataTransactionOrchestrator { + async delete(dataId): Promise { this.deleteManager.setData(dataId); this.deleteManager.setService(this.serviceData, TABLE_NAME.USER); await this.deleteManager.execute(); @@ -72,7 +72,7 @@ export class UserDataOrchestrator extends BaseDataTransactionOrchestrator { + async active(dataId): Promise { this.activeManager.setData(dataId, STATUS.ACTIVE); this.activeManager.setService(this.serviceData, TABLE_NAME.USER); await this.activeManager.execute(); @@ -86,7 +86,7 @@ export class UserDataOrchestrator extends BaseDataTransactionOrchestrator { + async confirm(dataId): Promise { this.confirmManager.setData(dataId, STATUS.ACTIVE); this.confirmManager.setService(this.serviceData, TABLE_NAME.USER); await this.confirmManager.execute(); @@ -100,7 +100,7 @@ export class UserDataOrchestrator extends BaseDataTransactionOrchestrator { + async inactive(dataId): Promise { this.inactiveManager.setData(dataId, STATUS.INACTIVE); this.inactiveManager.setService(this.serviceData, TABLE_NAME.USER); await this.inactiveManager.execute(); diff --git a/src/modules/user-related/user/infrastructure/user-data.controller.ts b/src/modules/user-related/user/infrastructure/user-data.controller.ts index 5f322e7..6377695 100644 --- a/src/modules/user-related/user/infrastructure/user-data.controller.ts +++ b/src/modules/user-related/user/infrastructure/user-data.controller.ts @@ -36,7 +36,7 @@ export class UserDataController { } @Patch(':id/active') - async active(@Param('id') dataId: string): Promise { + async active(@Param('id') dataId: string): Promise { return await this.orchestrator.active(dataId); } @@ -46,7 +46,7 @@ export class UserDataController { } @Patch(':id/confirm') - async confirm(@Param('id') dataId: string): Promise { + async confirm(@Param('id') dataId: string): Promise { return await this.orchestrator.confirm(dataId); } @@ -56,7 +56,7 @@ export class UserDataController { } @Patch(':id/inactive') - async inactive(@Param('id') dataId: string): Promise { + async inactive(@Param('id') dataId: string): Promise { return await this.orchestrator.inactive(dataId); } @@ -82,7 +82,7 @@ export class UserDataController { } @Delete(':id') - async delete(@Param('id') dataId: string): Promise { + async delete(@Param('id') dataId: string): Promise { return await this.orchestrator.delete(dataId); } } From c87c8525092a81168607d29f6edb3f2b7ccf9545 Mon Sep 17 00:00:00 2001 From: shancheas Date: Tue, 9 Jul 2024 17:37:22 +0700 Subject: [PATCH 2/6] fix: update nano db configuration --- .../couch/data/services/couch.service.ts | 25 ++++++++---- .../couch/infrastructure/couch.controller.ts | 38 ++++++++++++------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/modules/configuration/couch/data/services/couch.service.ts b/src/modules/configuration/couch/data/services/couch.service.ts index 721736d..59cc403 100644 --- a/src/modules/configuration/couch/data/services/couch.service.ts +++ b/src/modules/configuration/couch/data/services/couch.service.ts @@ -1,21 +1,32 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, Logger } from '@nestjs/common'; import { DatabaseListen } from '../../constants'; import { EventBus } from '@nestjs/cqrs'; import { ChangeDocEvent } from '../../domain/events/change-doc.event'; +import { ConfigService } from '@nestjs/config'; + +import * as Nano from 'nano'; @Injectable() export class CouchService { - constructor(private eventBus: EventBus) {} + constructor( + private eventBus: EventBus, + private configService: ConfigService, + ) {} + + get nanoInstance() { + const couchConfiguration = this.configService.get('COUCHDB_CONFIG'); + return Nano(couchConfiguration); + } async onModuleInit() { - const nano = require('nano')('http://root:password@172.10.10.2:5970'); + const nano = this.nanoInstance; for (const database of DatabaseListen) { const db = nano.db.use(database); db.changesReader.start({ includeDocs: true }).on('change', (change) => { this.changeDoc(change, database); }); - console.log(`start listen database ${database}`); + Logger.log(`start listen database ${database}`, 'CouchService'); } } @@ -31,7 +42,7 @@ export class CouchService { public async createDoc(data, database) { try { - const nano = require('nano')('http://root:password@172.10.10.2:5970'); + const nano = this.nanoInstance; const db = nano.use(database); return await db.insert(data); } catch (error) {} @@ -39,7 +50,7 @@ export class CouchService { public async deleteDoc(data, database) { try { - const nano = require('nano')('http://root:password@172.10.10.2:5970'); + const nano = this.nanoInstance; const db = nano.use(database); const result = await db.get(data.id); await db.destroy(data.id, result._rev); @@ -48,7 +59,7 @@ export class CouchService { public async updateDoc(data, database) { try { - const nano = require('nano')('http://root:password@172.10.10.2:5970'); + const nano = this.nanoInstance; const db = nano.use(database); const result = await db.get(data.id); console.log(result, 'dsa'); diff --git a/src/modules/configuration/couch/infrastructure/couch.controller.ts b/src/modules/configuration/couch/infrastructure/couch.controller.ts index 0e3704e..195f8e4 100644 --- a/src/modules/configuration/couch/infrastructure/couch.controller.ts +++ b/src/modules/configuration/couch/infrastructure/couch.controller.ts @@ -1,19 +1,28 @@ -import { Body, Controller, Get, Post } from '@nestjs/common'; +import { Body, Controller, Get, Injectable, Post } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Unprotected } from 'src/core/guards'; +import { Public } from 'src/core/guards'; import * as Nano from 'nano'; import { CreateUserPrivilegeDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/create-user-privilege.dto'; +import { ConfigService } from '@nestjs/config'; @ApiTags(`couch`) @Controller('v1/couch') -@Unprotected() +@Public() +@Injectable() export class CouchDataController { + constructor(private configService: ConfigService) {} + + get nanoInstance() { + const couchConfiguration = this.configService.get('COUCHDB_CONFIG'); + return Nano(couchConfiguration); + } + @Post() async createDoc(@Body() entity: CreateUserPrivilegeDto) { try { - let n = Nano('http://admin:secret@127.0.0.1:5984'); - let db = await n.db.create(entity.name); + const n = this.nanoInstance; + await n.db.create(entity.name); } catch (error) { console.log(error, 'dsa'); } @@ -22,17 +31,17 @@ export class CouchDataController { @Post('doc') async createDocs(@Body() entity: CreateUserPrivilegeDto) { try { - const nano = require('nano')('http://admin:secret@127.0.0.1:5984'); + const nano = this.nanoInstance; const people = nano.db.use('string'); - console.log(await people.info()); - const data = { - id: '1212', - name: 'dsadas', - }; + console.log(await people.info(), entity); + // const data = { + // id: '1212', + // name: 'dsadas', + // }; // await people.insert(data) people.changesReader - .start() + .start({}) .on('change', (change) => { console.log(change); }) @@ -53,9 +62,10 @@ export class CouchDataController { @Get() async getDoc() { try { - let n = Nano('http://admin:secret@127.0.0.1:5984'); - const people = n.use('string'); + const n = this.nanoInstance; + const people = n.db.get('user'); + return people; // return people.get(); } catch (error) { console.log(error, 'dsa'); From 6261592339cffd1d533716e638ea4f17c670f5d7 Mon Sep 17 00:00:00 2001 From: shancheas Date: Tue, 9 Jul 2024 17:47:15 +0700 Subject: [PATCH 3/6] lint: update type data and lint --- .../domain/services/privilege.service.ts | 2 +- .../managers/base-batch-delete.manager.ts | 2 +- .../base-batch-update-status.manager.ts | 2 +- .../strings/constants/interface.constants.ts | 2 +- .../1720436852936-update-table-transaction.ts | 37 ++++++++++++------- .../infrastructure/constant.controller.ts | 2 - .../domain/entities/cron-midnight.event.ts | 2 +- .../domain/managers/midnight-cron.manager.ts | 2 +- .../log/domain/handlers/error-log.handler.ts | 4 +- .../log/domain/handlers/log.handler.ts | 4 +- .../managers/create-item-category.manager.ts | 4 +- .../managers/index-item-rate.manager.ts | 2 +- .../managers/helpers/validate.helper.ts | 2 +- .../entities/filter-season-type.entity.ts | 2 +- .../entities/filter-vip-category.entity.ts | 2 +- .../managers/create-vip-category.manager.ts | 4 +- .../domain/entities/filter-vip-code.entity.ts | 2 +- .../managers/create-tenant.manager.ts | 4 +- .../entities/filter-user-privilege.entity.ts | 2 +- .../managers/create-user-privilege.manager.ts | 4 +- .../usecases/managers/create-user.manager.ts | 4 +- 21 files changed, 57 insertions(+), 34 deletions(-) diff --git a/src/core/guards/domain/services/privilege.service.ts b/src/core/guards/domain/services/privilege.service.ts index 27f6809..6cb2917 100644 --- a/src/core/guards/domain/services/privilege.service.ts +++ b/src/core/guards/domain/services/privilege.service.ts @@ -61,7 +61,7 @@ export class PrivilegeService { } async privilegeConfiguration(): Promise { - const { module, menu, sub_menu, section } = this.moduleKey(); + const { module, menu } = this.moduleKey(); return await this.repository.findOne({ select: ['id', 'view', 'create', 'edit', 'delete', 'cancel', 'confirm'], where: { diff --git a/src/core/modules/domain/usecase/managers/base-batch-delete.manager.ts b/src/core/modules/domain/usecase/managers/base-batch-delete.manager.ts index 374adcb..292c45d 100644 --- a/src/core/modules/domain/usecase/managers/base-batch-delete.manager.ts +++ b/src/core/modules/domain/usecase/managers/base-batch-delete.manager.ts @@ -25,7 +25,7 @@ export abstract class BaseBatchDeleteManager extends BaseManager { async process(): Promise { let totalFailed = 0; let totalSuccess = 0; - let messages = []; + const messages = []; for (const id of this.dataIds) { try { diff --git a/src/core/modules/domain/usecase/managers/base-batch-update-status.manager.ts b/src/core/modules/domain/usecase/managers/base-batch-update-status.manager.ts index 670e398..afc2680 100644 --- a/src/core/modules/domain/usecase/managers/base-batch-update-status.manager.ts +++ b/src/core/modules/domain/usecase/managers/base-batch-update-status.manager.ts @@ -29,7 +29,7 @@ export abstract class BaseBatchUpdateStatusManager extends BaseManager { async process(): Promise { let totalFailed = 0; let totalSuccess = 0; - let messages = []; + const messages = []; for (const id of this.dataIds) { try { diff --git a/src/core/strings/constants/interface.constants.ts b/src/core/strings/constants/interface.constants.ts index 4c092eb..c5ed49d 100644 --- a/src/core/strings/constants/interface.constants.ts +++ b/src/core/strings/constants/interface.constants.ts @@ -24,7 +24,7 @@ export interface validateRelations { export interface columnUniques { column: string; - query?: Object; + query?: any; } export interface IEvent { diff --git a/src/database/migrations/1720436852936-update-table-transaction.ts b/src/database/migrations/1720436852936-update-table-transaction.ts index f33630e..05e41b1 100644 --- a/src/database/migrations/1720436852936-update-table-transaction.ts +++ b/src/database/migrations/1720436852936-update-table-transaction.ts @@ -1,18 +1,29 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; +import { MigrationInterface, QueryRunner } from 'typeorm'; export class UpdateTableTransaction1720436852936 implements MigrationInterface { - name = 'UpdateTableTransaction1720436852936' + name = 'UpdateTableTransaction1720436852936'; - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "transaction_taxes" ADD "tax_total_value" numeric`); - await queryRunner.query(`ALTER TABLE "transaction_taxes" DROP COLUMN "taxt_value"`); - await queryRunner.query(`ALTER TABLE "transaction_taxes" ADD "taxt_value" numeric`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "transaction_taxes" DROP COLUMN "taxt_value"`); - await queryRunner.query(`ALTER TABLE "transaction_taxes" ADD "taxt_value" character varying`); - await queryRunner.query(`ALTER TABLE "transaction_taxes" DROP COLUMN "tax_total_value"`); - } + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "transaction_taxes" ADD "tax_total_value" numeric`, + ); + await queryRunner.query( + `ALTER TABLE "transaction_taxes" DROP COLUMN "taxt_value"`, + ); + await queryRunner.query( + `ALTER TABLE "transaction_taxes" ADD "taxt_value" numeric`, + ); + } + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "transaction_taxes" DROP COLUMN "taxt_value"`, + ); + await queryRunner.query( + `ALTER TABLE "transaction_taxes" ADD "taxt_value" character varying`, + ); + await queryRunner.query( + `ALTER TABLE "transaction_taxes" DROP COLUMN "tax_total_value"`, + ); + } } diff --git a/src/modules/configuration/constant/infrastructure/constant.controller.ts b/src/modules/configuration/constant/infrastructure/constant.controller.ts index 6c9e681..61bba1f 100644 --- a/src/modules/configuration/constant/infrastructure/constant.controller.ts +++ b/src/modules/configuration/constant/infrastructure/constant.controller.ts @@ -10,8 +10,6 @@ import { PaymentMethodType } from 'src/modules/transaction/payment-method/consta @Controller('v1/constant') @Public(true) export class ConstantController { - constructor() {} - @Get('master-data-status') async masterDataStatus(): Promise { return [STATUS.ACTIVE, STATUS.DRAFT, STATUS.INACTIVE]; diff --git a/src/modules/configuration/cron/domain/entities/cron-midnight.event.ts b/src/modules/configuration/cron/domain/entities/cron-midnight.event.ts index 17db760..c50b5b7 100644 --- a/src/modules/configuration/cron/domain/entities/cron-midnight.event.ts +++ b/src/modules/configuration/cron/domain/entities/cron-midnight.event.ts @@ -1,3 +1,3 @@ export class CronMidnightEvent { - constructor(public readonly data: {}) {} + // constructor(public readonly data: {}) {} } diff --git a/src/modules/configuration/cron/domain/managers/midnight-cron.manager.ts b/src/modules/configuration/cron/domain/managers/midnight-cron.manager.ts index cfdd044..3136421 100644 --- a/src/modules/configuration/cron/domain/managers/midnight-cron.manager.ts +++ b/src/modules/configuration/cron/domain/managers/midnight-cron.manager.ts @@ -16,6 +16,6 @@ export class MidnightCronManager { console.log('Cron Event executed every 00:00 minutes.', now); - this.eventBus.publishAll([new CronMidnightEvent({})]); + this.eventBus.publishAll([new CronMidnightEvent()]); } } diff --git a/src/modules/configuration/log/domain/handlers/error-log.handler.ts b/src/modules/configuration/log/domain/handlers/error-log.handler.ts index 906b0b3..f1e3c58 100644 --- a/src/modules/configuration/log/domain/handlers/error-log.handler.ts +++ b/src/modules/configuration/log/domain/handlers/error-log.handler.ts @@ -6,5 +6,7 @@ import { ErrorLogService } from '../../data/services/error-log.service'; export class RecordErrorLogHandler implements IEventHandler { constructor(private dataservice: ErrorLogService) {} - async handle(event: RecordErrorLog) {} + async handle(event: RecordErrorLog) { + // TODO: Implement logic here + } } diff --git a/src/modules/configuration/log/domain/handlers/log.handler.ts b/src/modules/configuration/log/domain/handlers/log.handler.ts index 54cb92e..1e4fafb 100644 --- a/src/modules/configuration/log/domain/handlers/log.handler.ts +++ b/src/modules/configuration/log/domain/handlers/log.handler.ts @@ -3,5 +3,7 @@ import { RecordLog } from '../entities/log.event'; @EventsHandler(RecordLog) export class RecordLogHandler implements IEventHandler { - async handle(event: RecordLog) {} + async handle(event: RecordLog) { + // TODO: Implement logic here + } } diff --git a/src/modules/item-related/item-category/domain/usecases/managers/create-item-category.manager.ts b/src/modules/item-related/item-category/domain/usecases/managers/create-item-category.manager.ts index 9007f3d..30725a3 100644 --- a/src/modules/item-related/item-category/domain/usecases/managers/create-item-category.manager.ts +++ b/src/modules/item-related/item-category/domain/usecases/managers/create-item-category.manager.ts @@ -22,7 +22,9 @@ export class CreateItemCategoryManager extends BaseCreateManager {} + async generateConfig(): Promise { + // TODO: Implement logic here + } get validateRelations(): validateRelations[] { return []; diff --git a/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts b/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts index 8d1559c..4f34708 100644 --- a/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts +++ b/src/modules/item-related/item-rate/domain/usecases/managers/index-item-rate.manager.ts @@ -19,7 +19,7 @@ export class IndexItemRateManager extends BaseIndexManager { async afterProcess(): Promise { this.result.data?.map((item) => { - let prices = []; + const prices = []; for ( let d = new Date(this.filterParam.start_date); d <= new Date(this.filterParam.end_date); diff --git a/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts b/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts index 643c425..199c78b 100644 --- a/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts +++ b/src/modules/season-related/season-period/domain/usecases/managers/helpers/validate.helper.ts @@ -21,7 +21,7 @@ export async function ValidateSeasonPeriodHelper(dataService, data) { => akan tetapi dapat ditindih oleh season period 2024-08-15, 2024-08-28 days [Sabtu, Senin] (karena ini naik prio menjadi priority 2) */ const query = dataService.getRepository().createQueryBuilder('data'); - let priority: number = 3; + let priority = 3; // libur / specific date if ( data.holidays?.length > 0 || diff --git a/src/modules/season-related/season-type/domain/entities/filter-season-type.entity.ts b/src/modules/season-related/season-type/domain/entities/filter-season-type.entity.ts index bbdfd80..8ceaa32 100644 --- a/src/modules/season-related/season-type/domain/entities/filter-season-type.entity.ts +++ b/src/modules/season-related/season-type/domain/entities/filter-season-type.entity.ts @@ -1,3 +1,3 @@ import { BaseFilterEntity } from 'src/core/modules/domain/entities/base-filter.entity'; -export interface FilterSeasonTypeEntity extends BaseFilterEntity {} +export type FilterSeasonTypeEntity = BaseFilterEntity; diff --git a/src/modules/transaction/vip-category/domain/entities/filter-vip-category.entity.ts b/src/modules/transaction/vip-category/domain/entities/filter-vip-category.entity.ts index bb53a73..e23eaaa 100644 --- a/src/modules/transaction/vip-category/domain/entities/filter-vip-category.entity.ts +++ b/src/modules/transaction/vip-category/domain/entities/filter-vip-category.entity.ts @@ -1,3 +1,3 @@ import { BaseFilterEntity } from 'src/core/modules/domain/entities/base-filter.entity'; -export interface FilterVipCategoryEntity extends BaseFilterEntity {} +export type FilterVipCategoryEntity = BaseFilterEntity; diff --git a/src/modules/transaction/vip-category/domain/usecases/managers/create-vip-category.manager.ts b/src/modules/transaction/vip-category/domain/usecases/managers/create-vip-category.manager.ts index d2f77ac..83a2421 100644 --- a/src/modules/transaction/vip-category/domain/usecases/managers/create-vip-category.manager.ts +++ b/src/modules/transaction/vip-category/domain/usecases/managers/create-vip-category.manager.ts @@ -19,7 +19,9 @@ export class CreateVipCategoryManager extends BaseCreateManager {} + async generateConfig(): Promise { + // TODO: Implement logic here + } get validateRelations(): validateRelations[] { return []; diff --git a/src/modules/transaction/vip-code/domain/entities/filter-vip-code.entity.ts b/src/modules/transaction/vip-code/domain/entities/filter-vip-code.entity.ts index e971665..bb7ec07 100644 --- a/src/modules/transaction/vip-code/domain/entities/filter-vip-code.entity.ts +++ b/src/modules/transaction/vip-code/domain/entities/filter-vip-code.entity.ts @@ -1,3 +1,3 @@ import { BaseFilterEntity } from 'src/core/modules/domain/entities/base-filter.entity'; -export interface FilterVipCodeEntity extends BaseFilterEntity {} +export type FilterVipCodeEntity = BaseFilterEntity; diff --git a/src/modules/user-related/tenant/domain/usecases/managers/create-tenant.manager.ts b/src/modules/user-related/tenant/domain/usecases/managers/create-tenant.manager.ts index 65b4736..3067935 100644 --- a/src/modules/user-related/tenant/domain/usecases/managers/create-tenant.manager.ts +++ b/src/modules/user-related/tenant/domain/usecases/managers/create-tenant.manager.ts @@ -30,7 +30,9 @@ export class CreateTenantManager extends BaseCreateManager { return; } - async generateConfig(): Promise {} + async generateConfig(): Promise { + // TODO: Implement logic here + } get uniqueColumns(): columnUniques[] { return [ diff --git a/src/modules/user-related/user-privilege/domain/entities/filter-user-privilege.entity.ts b/src/modules/user-related/user-privilege/domain/entities/filter-user-privilege.entity.ts index cb66f26..eb95688 100644 --- a/src/modules/user-related/user-privilege/domain/entities/filter-user-privilege.entity.ts +++ b/src/modules/user-related/user-privilege/domain/entities/filter-user-privilege.entity.ts @@ -1,3 +1,3 @@ import { BaseFilterEntity } from 'src/core/modules/domain/entities/base-filter.entity'; -export interface FilterUserPrivilegeEntity extends BaseFilterEntity {} +export type FilterUserPrivilegeEntity = BaseFilterEntity; diff --git a/src/modules/user-related/user-privilege/domain/usecases/user-privilege/managers/create-user-privilege.manager.ts b/src/modules/user-related/user-privilege/domain/usecases/user-privilege/managers/create-user-privilege.manager.ts index 7fc5836..f0b8d1b 100644 --- a/src/modules/user-related/user-privilege/domain/usecases/user-privilege/managers/create-user-privilege.manager.ts +++ b/src/modules/user-related/user-privilege/domain/usecases/user-privilege/managers/create-user-privilege.manager.ts @@ -24,7 +24,9 @@ export class CreateUserPrivilegeManager extends BaseCreateManager {} + async generateConfig(): Promise { + // TODO: Implement logic here + } get uniqueColumns(): columnUniques[] { return [{ column: 'name' }]; diff --git a/src/modules/user-related/user/domain/usecases/managers/create-user.manager.ts b/src/modules/user-related/user/domain/usecases/managers/create-user.manager.ts index 8251a31..ba2c477 100644 --- a/src/modules/user-related/user/domain/usecases/managers/create-user.manager.ts +++ b/src/modules/user-related/user/domain/usecases/managers/create-user.manager.ts @@ -31,7 +31,9 @@ export class CreateUserManager extends BaseCreateManager { return; } - async generateConfig(): Promise {} + async generateConfig(): Promise { + // TODO: Implement logic here + } get validateRelations(): validateRelations[] { return []; From 28dcac39f07b9a73e4b10ad9be36af9c8b9af136 Mon Sep 17 00:00:00 2001 From: Aswin Ashar Abdullah Date: Tue, 9 Jul 2024 17:52:04 +0700 Subject: [PATCH 4/6] feat(SPG-405) DB Kode Diskon VIP --- .../usecase/managers/base-create.manager.ts | 14 ++++++- src/modules/configuration/couch/constants.ts | 2 +- .../configuration/couch/couch.module.ts | 2 + .../couch/domain/managers/vip-code.handler.ts | 22 ++++++++++ .../managers/index-reconciliation.manager.ts | 1 + .../handlers/create-vip-code.handler.ts | 40 +++++++++++++++++++ .../managers/create-vip-code.manager.ts | 2 +- .../transaction/vip-code/vip-code.module.ts | 5 +++ 8 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 src/modules/configuration/couch/domain/managers/vip-code.handler.ts create mode 100644 src/modules/transaction/vip-code/domain/usecases/handlers/create-vip-code.handler.ts diff --git a/src/core/modules/domain/usecase/managers/base-create.manager.ts b/src/core/modules/domain/usecase/managers/base-create.manager.ts index fdfb694..c30052d 100644 --- a/src/core/modules/domain/usecase/managers/base-create.manager.ts +++ b/src/core/modules/domain/usecase/managers/base-create.manager.ts @@ -75,11 +75,21 @@ export abstract class BaseCreateManager extends BaseManager { if (!this.eventTopics.length) return; for (const topic of this.eventTopics) { + let data; + if (!topic.data) { + data = await this.dataService.getOneByOptions({ + where: { + id: this.result['id'], + }, + relations: topic.relations, + }); + } + this.eventBus.publishAll([ new topic.topic({ - id: this.result['id'], + id: data?.['id'] ?? topic?.data?.['id'], old: null, - data: topic.data, + data: data ?? topic.data, user: this.user, description: '', module: this.tableName, diff --git a/src/modules/configuration/couch/constants.ts b/src/modules/configuration/couch/constants.ts index c3045f2..031c3c4 100644 --- a/src/modules/configuration/couch/constants.ts +++ b/src/modules/configuration/couch/constants.ts @@ -1 +1 @@ -export const DatabaseListen = ['transaction']; +export const DatabaseListen = ['transaction', 'vip_code']; diff --git a/src/modules/configuration/couch/couch.module.ts b/src/modules/configuration/couch/couch.module.ts index 18e2cea..e3a4b95 100644 --- a/src/modules/configuration/couch/couch.module.ts +++ b/src/modules/configuration/couch/couch.module.ts @@ -37,6 +37,7 @@ import { TransactionDataService } from 'src/modules/transaction/transaction/data import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model'; import { TransactionTaxModel } from 'src/modules/transaction/transaction/data/models/transaction-tax.model'; import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model'; +import { VipCodeCreatedHandler } from './domain/managers/vip-code.handler'; @Module({ imports: [ @@ -59,6 +60,7 @@ import { TransactionItemModel } from 'src/modules/transaction/transaction/data/m BookingDeletedEvent, PaymentMethodDeletedHandler, PaymentMethodUpdatedHandler, + VipCodeCreatedHandler, VipCategoryDeletedHandler, VipCategoryUpdatedHandler, SeasonPeriodDeletedHandler, diff --git a/src/modules/configuration/couch/domain/managers/vip-code.handler.ts b/src/modules/configuration/couch/domain/managers/vip-code.handler.ts new file mode 100644 index 0000000..7efef35 --- /dev/null +++ b/src/modules/configuration/couch/domain/managers/vip-code.handler.ts @@ -0,0 +1,22 @@ +import { EventsHandler, IEventHandler } from '@nestjs/cqrs'; +import { CouchService } from '../../data/services/couch.service'; +import { VipCodeCreatedEvent } from 'src/modules/transaction/vip-code/domain/entities/event/vip-code-created.event'; + +@EventsHandler(VipCodeCreatedEvent) +export class VipCodeCreatedHandler + implements IEventHandler +{ + constructor(private couchService: CouchService) {} + + async handle(event: VipCodeCreatedEvent) { + const data = event.data.data; + + await this.couchService.createDoc( + { + _id: data.id, + ...data, + }, + 'vip_code', + ); + } +} diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts index 6fc6ec5..6eba3a6 100644 --- a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts +++ b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts @@ -45,6 +45,7 @@ export class IndexReconciliationManager extends BaseIndexManager { + constructor( + private dataService: VipCodeDataService, + private couchService: CouchService, + ) {} + + async handle(event: ChangeDocEvent) { + const database = event.data.database; + const data = event.data.data; + + if (database != 'vip_code') return; + + const queryRunner = this.dataService + .getRepository() + .manager.connection.createQueryRunner(); + + // jika delete + if (data._deleted ?? false) { + } else { + const dataMapped = { + ...data, + id: data._id ?? data.id, + vip_category_id: data.vip_category?._id ?? data.vip_category?.id, + }; + + try { + await this.dataService.create(queryRunner, VipCodeModel, dataMapped); + } catch (error) { + await this.couchService.createDoc(data, 'error_vip_code'); + } + } + } +} diff --git a/src/modules/transaction/vip-code/domain/usecases/managers/create-vip-code.manager.ts b/src/modules/transaction/vip-code/domain/usecases/managers/create-vip-code.manager.ts index 947e65c..e235821 100644 --- a/src/modules/transaction/vip-code/domain/usecases/managers/create-vip-code.manager.ts +++ b/src/modules/transaction/vip-code/domain/usecases/managers/create-vip-code.manager.ts @@ -35,7 +35,7 @@ export class CreateVipCodeManager extends BaseCreateManager { return [ { topic: VipCodeCreatedEvent, - data: this.data, + relations: ['vip_category'], }, ]; } diff --git a/src/modules/transaction/vip-code/vip-code.module.ts b/src/modules/transaction/vip-code/vip-code.module.ts index 68f7dd1..e3b98ca 100644 --- a/src/modules/transaction/vip-code/vip-code.module.ts +++ b/src/modules/transaction/vip-code/vip-code.module.ts @@ -13,6 +13,8 @@ import { CqrsModule } from '@nestjs/cqrs'; import { IndexVipCodeManager } from './domain/usecases/managers/index-vip-code.manager'; import { VipCodeModel } from './data/models/vip-code.model'; import { GenerateVipCodeManager } from './domain/usecases/managers/geneate-vip-code.manager'; +import { CreateVipCodeHandler } from './domain/usecases/handlers/create-vip-code.handler'; +import { CouchService } from 'src/modules/configuration/couch/data/services/couch.service'; @Module({ imports: [ @@ -22,10 +24,13 @@ import { GenerateVipCodeManager } from './domain/usecases/managers/geneate-vip-c ], controllers: [VipCodeDataController, VipCodeReadController], providers: [ + CreateVipCodeHandler, + IndexVipCodeManager, CreateVipCodeManager, GenerateVipCodeManager, + CouchService, VipCodeDataService, VipCodeReadService, From 99847ce85b3e2329d56d8045ed8804c7713bd60e Mon Sep 17 00:00:00 2001 From: Aswin Ashar Abdullah Date: Tue, 9 Jul 2024 17:52:46 +0700 Subject: [PATCH 5/6] fix(SPG-593) Pemesanan - Update Pembayaran Pending - Tambahkan informasi pembayaran via dan no rekening --- .../usecases/managers/helpers/mapping-transaction.helper.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts index 258cf72..bc2bab6 100644 --- a/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts +++ b/src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper.ts @@ -99,6 +99,10 @@ export function mappingRevertTransaction(data, type) { season_period_name: data.season_period?.holiday_name ?? null, season_period_type_id: data.season_period?.season_type?.id ?? null, season_period_type_name: data.season_period?.season_type?.name ?? null, + payment_type_method_id: data.payment_type_method?.id, + payment_type_method_number: data.payment_type_method?.account_number, + payment_type_method_name: data.payment_type_method?.issuer_name, + payment_type_method_qr: data.payment_type_method?.qr_image, }); data.items?.map((item) => { From 0d7951d5f0d59a7075aef644dc8d56f9953c60d1 Mon Sep 17 00:00:00 2001 From: shancheas Date: Tue, 9 Jul 2024 18:13:38 +0700 Subject: [PATCH 6/6] ci: update env COUCHDB_CONFIG --- env/env.development | 2 ++ 1 file changed, 2 insertions(+) diff --git a/env/env.development b/env/env.development index bd26af1..f3ca788 100644 --- a/env/env.development +++ b/env/env.development @@ -6,6 +6,8 @@ JWT_REFRESH_EXPIRES="7d" ENC_KEY="921c83f3b90c92dca4ba9b947f99b4c9" IV="a671a96159e97a4f" +COUCHDB_CONFIG="http://root:password@172.10.10.2:5970" + DEFAULT_DB_HOST="postgres" DEFAULT_DB_PORT="5432" DEFAULT_DB_USER="root"