From 4a1373023179a00acd458829300c5ecf7103d871 Mon Sep 17 00:00:00 2001 From: Supan Adit Pratama Date: Fri, 23 Aug 2024 10:06:24 +0700 Subject: [PATCH 1/3] ci: fix production env --- .drone.yml | 19 ++++++++++++++++--- Dockerfile | 8 ++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6eda51d..f9fa9bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,22 @@ steps: script: - cd /home/eigen/PROJECT/POS/POS.DEV/BE - sh build.sh + when: + ref: + - refs/tags/devel_* + - refs/tags/*-alpha.* + - name: build-production + image: plugins/docker + settings: + registry: registry.eigen.co.id + repo: registry.eigen.co.id/eigen/${DRONE_REPO_NAME} + build_args: + - env_target=env.production + tags: ${DRONE_TAG} + custom_dns: 172.10.10.16 + when: + ref: + - refs/tags/*-production.* - name: send-message image: plugins/webhook settings: @@ -27,9 +43,6 @@ steps: "message": "Build {{repo.name}} sudah selesai" } trigger: - ref: - - refs/tags/devel_* - - refs/tags/*-alpha.* event: exclude: - promote diff --git a/Dockerfile b/Dockerfile index 9b354f4..0b4ded3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ COPY . . RUN yarn install RUN yarn build FROM node:18.17-alpine -ARG env_target +# ARG env_target WORKDIR /app -RUN echo ${env_target} -COPY env/$env_target /app/.env -COPY --from=builder /app/env/$env_target .env +# RUN echo ${env_target} +# COPY env/$env_target /app/.env +# COPY --from=builder /app/env/$env_target .env COPY --from=builder /app/node_modules ./node_modules COPY --from=builder /app/dist ./dist COPY --from=builder /app/assets ./assets From 539676aa30d9507a23d3eda50bdf5d5e132ae7b8 Mon Sep 17 00:00:00 2001 From: irfan Date: Tue, 3 Sep 2024 11:45:30 +0000 Subject: [PATCH 2/3] chore: add label to apm --- .../domain/usecases/handlers/pos-transaction.handler.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts b/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts index e9cbb14..1df1f2b 100644 --- a/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts +++ b/src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts @@ -86,7 +86,9 @@ export class PosTransactionHandler implements IEventHandler { sales_price_formula: sales_formula.formula_string, }); + apmTransactions.setLabel('Id', data?.id); apmTransactions.setLabel('Code', data?.code); + apmTransactions.setLabel('Status', data?.status); await this.dataService.create(queryRunner, TransactionModel, data); From 45306dde5713400f1b95c30fafb5ddd8bdf3d134 Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:22:42 +0700 Subject: [PATCH 3/3] feat: update import couch module --- src/modules/configuration/couch/couch.module.ts | 1 + .../configuration/couch/data/services/couch.service.ts | 3 ++- src/modules/transaction/vip-code/vip-code.module.ts | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/configuration/couch/couch.module.ts b/src/modules/configuration/couch/couch.module.ts index a258817..c1fd388 100644 --- a/src/modules/configuration/couch/couch.module.ts +++ b/src/modules/configuration/couch/couch.module.ts @@ -100,5 +100,6 @@ import { TransactionDemographyModel } from 'src/modules/transaction/transaction/ ItemDataService, CouchService, ], + exports: [CouchService], }) export class CouchModule {} diff --git a/src/modules/configuration/couch/data/services/couch.service.ts b/src/modules/configuration/couch/data/services/couch.service.ts index 3054cd8..60f031d 100644 --- a/src/modules/configuration/couch/data/services/couch.service.ts +++ b/src/modules/configuration/couch/data/services/couch.service.ts @@ -23,13 +23,14 @@ export class CouchService { for (const database of DatabaseListen) { const db = nano.db.use(database); db.changesReader.start({ includeDocs: true }).on('change', (change) => { - Logger.log( + Logger.verbose( `Receive Data from ${database}: ${change?.id}`, 'CouchService', ); this.changeDoc(change, database); }); + // transaction Logger.log(`start listen database ${database}`, 'CouchService'); } } diff --git a/src/modules/transaction/vip-code/vip-code.module.ts b/src/modules/transaction/vip-code/vip-code.module.ts index e3b98ca..bc756d5 100644 --- a/src/modules/transaction/vip-code/vip-code.module.ts +++ b/src/modules/transaction/vip-code/vip-code.module.ts @@ -14,13 +14,14 @@ import { IndexVipCodeManager } from './domain/usecases/managers/index-vip-code.m 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'; +import { CouchModule } from 'src/modules/configuration/couch/couch.module'; @Module({ imports: [ ConfigModule.forRoot(), TypeOrmModule.forFeature([VipCodeModel], CONNECTION_NAME.DEFAULT), CqrsModule, + CouchModule, ], controllers: [VipCodeDataController, VipCodeReadController], providers: [ @@ -30,7 +31,6 @@ import { CouchService } from 'src/modules/configuration/couch/data/services/couc CreateVipCodeManager, GenerateVipCodeManager, - CouchService, VipCodeDataService, VipCodeReadService,