diff --git a/src/modules/transaction/sales-price-formula/data/models/sales-price-formula.model.ts b/src/modules/transaction/sales-price-formula/data/models/sales-price-formula.model.ts index 0781b25..587be30 100644 --- a/src/modules/transaction/sales-price-formula/data/models/sales-price-formula.model.ts +++ b/src/modules/transaction/sales-price-formula/data/models/sales-price-formula.model.ts @@ -6,6 +6,7 @@ import { import { Column, Entity } from 'typeorm'; import { BaseModel } from 'src/core/modules/data/model/base.model'; import { FormulaType } from '../../constants'; +import { EncryptionHelper } from '../../domain/helpers/encryption.helper'; @Entity(TABLE_NAME.PRICE_FORMULA) export class SalesPriceFormulaModel @@ -48,6 +49,7 @@ export class TransactionSettingModel //TODO: add logic to get value from key percentValue(): number { - return this.value ?? 100; + const value = EncryptionHelper.decrypt(this.key); + return Number(value) ?? 100; } } diff --git a/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts b/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts index 23e46cf..df1c8fc 100644 --- a/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts +++ b/src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts @@ -158,4 +158,15 @@ export class TransactionSettingDataService extends BaseDataService +{ + constructor( + private transactionSettingService: TransactionSettingDataService, // private orchestrator: SalesPriceFormulaDataOrchestrator, + ) {} + + async handle(event: ChangeDocEvent) { + const data = event.data.data; + const database = event.data.database; + + if (database !== 'api_configuration') return; + const value = data.value; + + const currentTransactionSetting = + await this.transactionSettingService.getTransactionSetting(); + + if (value === currentTransactionSetting.value) return; + const key = EncryptionHelper.encrypt(`${value}`); + const payload = { + id: currentTransactionSetting.id, + value: 0, + key, + }; + + await this.transactionSettingService.updateTransactionSetting(payload); + } +} diff --git a/src/modules/transaction/sales-price-formula/sales-price-formula.module.ts b/src/modules/transaction/sales-price-formula/sales-price-formula.module.ts index 2b3717f..8183161 100644 --- a/src/modules/transaction/sales-price-formula/sales-price-formula.module.ts +++ b/src/modules/transaction/sales-price-formula/sales-price-formula.module.ts @@ -24,6 +24,7 @@ import { ItemModel } from 'src/modules/item-related/item/data/models/item.model' import { UpdateTransactionSettingManager } from './domain/usecases/managers/update-transaction-setting.manager'; import { TransactionModel } from '../transaction/data/models/transaction.model'; import { CouchModule } from 'src/modules/configuration/couch/couch.module'; +import { TransactionSettingHandler } from './domain/usecases/handlers/transaction-setting.handler'; @Global() @Module({ @@ -58,6 +59,7 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module'; SalesPriceFormulaDataOrchestrator, SalesPriceFormulaReadOrchestrator, + TransactionSettingHandler, ], exports: [SalesPriceFormulaDataService, SalesPriceFormulaReadService], }) diff --git a/src/services/whatsapp/whatsapp.service.ts b/src/services/whatsapp/whatsapp.service.ts index 1f4377f..4360d27 100644 --- a/src/services/whatsapp/whatsapp.service.ts +++ b/src/services/whatsapp/whatsapp.service.ts @@ -97,7 +97,8 @@ export class WhatsappService { { parameter_name: 'queue_time', type: 'text', - text: toTime(data.time), // replace with queue_time variable + // text: toTime(data.time), // replace with queue_time variable + text: '--:--', }, ], },