Compare commits
2 Commits
developmen
...
fix/report
Author | SHA1 | Date |
---|---|---|
|
0d75cbb5a9 | |
|
d9b0b4ec85 |
89
.drone.yml
89
.drone.yml
|
@ -2,37 +2,29 @@ kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: server
|
name: server
|
||||||
steps:
|
steps:
|
||||||
# - name: build
|
- name: build
|
||||||
# image: appleboy/drone-ssh
|
image: appleboy/drone-ssh
|
||||||
# settings:
|
|
||||||
# host:
|
|
||||||
# - 172.10.10.10
|
|
||||||
# username: eigen
|
|
||||||
# key:
|
|
||||||
# from_secret: DEVOPS_SSH_PRIVATE_OPEN
|
|
||||||
# port: 22
|
|
||||||
# script:
|
|
||||||
# - cd /home/eigen/PROJECT/POS/POS.DEV/BE
|
|
||||||
# - sh build.sh
|
|
||||||
# when:
|
|
||||||
# ref:
|
|
||||||
# - refs/tags/devel_*
|
|
||||||
# - refs/tags/*-alpha.*
|
|
||||||
- name: build-testing
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
settings:
|
||||||
registry: registry.eigen.co.id
|
host:
|
||||||
repo: registry.eigen.co.id/eigen/${DRONE_REPO_NAME}
|
- 172.10.10.10
|
||||||
tags: ${DRONE_TAG}
|
username: eigen
|
||||||
custom_dns: 172.10.10.16
|
key:
|
||||||
|
from_secret: DEVOPS_SSH_PRIVATE_OPEN
|
||||||
|
port: 22
|
||||||
|
script:
|
||||||
|
- cd /home/eigen/PROJECT/POS/POS.DEV/BE
|
||||||
|
- sh build.sh
|
||||||
when:
|
when:
|
||||||
ref:
|
ref:
|
||||||
|
- refs/tags/devel_*
|
||||||
- refs/tags/*-alpha.*
|
- refs/tags/*-alpha.*
|
||||||
- name: build-production
|
- name: build-production
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
registry: registry.eigen.co.id
|
registry: registry.eigen.co.id
|
||||||
repo: registry.eigen.co.id/eigen/${DRONE_REPO_NAME}
|
repo: registry.eigen.co.id/eigen/${DRONE_REPO_NAME}
|
||||||
|
build_args:
|
||||||
|
- env_target=env.production
|
||||||
tags: ${DRONE_TAG}
|
tags: ${DRONE_TAG}
|
||||||
custom_dns: 172.10.10.16
|
custom_dns: 172.10.10.16
|
||||||
when:
|
when:
|
||||||
|
@ -54,56 +46,3 @@ trigger:
|
||||||
event:
|
event:
|
||||||
exclude:
|
exclude:
|
||||||
- promote
|
- promote
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: kustomize
|
|
||||||
|
|
||||||
clone:
|
|
||||||
disable: true
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: kustomize-testing
|
|
||||||
image: registry.k8s.io/kustomize/kustomize:v5.0.0
|
|
||||||
environment:
|
|
||||||
DEVOPS_SSH_PRIVATE:
|
|
||||||
from_secret: DEVOPS_SSH_PRIVATE
|
|
||||||
DEVOPS_SSH_PUBLIC:
|
|
||||||
from_secret: DEVOPS_SSH_PUBLIC
|
|
||||||
INFRASTRUCTURE_REPO: "k8s-kustomize-external"
|
|
||||||
DIRECTORY_NAME: "weplay-pos-testing"
|
|
||||||
commands:
|
|
||||||
- mkdir -p ~/.ssh &&
|
|
||||||
- echo $DEVOPS_SSH_PRIVATE | base64 -d > ~/.ssh/id_rsa &&
|
|
||||||
- echo $DEVOPS_SSH_PUBLIC | base64 -d > ~/.ssh/id_rsa.pub &&
|
|
||||||
- ssh-keyscan -H -p 2222 git.eigen.co.id >> ~/.ssh/known_hosts &&
|
|
||||||
- chmod 700 ~/.ssh/ &&
|
|
||||||
- chmod 600 ~/.ssh/id_rsa &&
|
|
||||||
- git clone ssh://git@git.eigen.co.id:2222/eigen/$INFRASTRUCTURE_REPO.git &&
|
|
||||||
- cd $INFRASTRUCTURE_REPO/$DIRECTORY_NAME
|
|
||||||
- kustomize edit set image registry.eigen.co.id/eigen/$DRONE_REPO_NAME=registry.eigen.co.id/eigen/$DRONE_REPO_NAME:$DRONE_TAG &&
|
|
||||||
- git add . &&
|
|
||||||
- |-
|
|
||||||
git commit -m "feat: update $DRONE_REPO_NAME testing to $DRONE_TAG" &&
|
|
||||||
- git push origin master
|
|
||||||
- name: send-message
|
|
||||||
image: harbor.eigen.co.id/docker.com/plugins/webhook
|
|
||||||
settings:
|
|
||||||
urls: https://mattermost.eigen.co.id/api/v4/posts
|
|
||||||
content_type: application/json
|
|
||||||
headers:
|
|
||||||
- Authorization=Bearer 5zubexudb38uuradfa36qy98ca
|
|
||||||
template: |
|
|
||||||
{
|
|
||||||
"channel_id": "s1ekqde1c3du5p35g6budnuotc",
|
|
||||||
"message": "ALERT: {{ repo.name }} gagal update dengan tag ${DRONE_TAG}"
|
|
||||||
}
|
|
||||||
when:
|
|
||||||
status:
|
|
||||||
- failure
|
|
||||||
trigger:
|
|
||||||
ref:
|
|
||||||
include:
|
|
||||||
- refs/tags/*-alpha.*
|
|
||||||
depends_on:
|
|
||||||
- server
|
|
|
@ -16,27 +16,15 @@ export class AddTaxItemTransaction1726045820711 implements MigrationInterface {
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "total_profit_share" numeric`,
|
`ALTER TABLE "transaction_item_breakdowns" ADD "total_profit_share" numeric`,
|
||||||
);
|
);
|
||||||
|
await queryRunner.query(
|
||||||
|
`ALTER TABLE "price_formulas" ADD "value_for" character varying NOT NULL DEFAULT 'dpp'`,
|
||||||
|
);
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "transaction_item_taxes" ADD CONSTRAINT "FK_f5c4966a381d903899cafb4b5ba" FOREIGN KEY ("transaction_id") REFERENCES "transaction_items"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
`ALTER TABLE "transaction_item_taxes" ADD CONSTRAINT "FK_f5c4966a381d903899cafb4b5ba" FOREIGN KEY ("transaction_id") REFERENCES "transaction_items"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
||||||
);
|
);
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "t_breakdown_item_taxes" ADD CONSTRAINT "FK_74bedce7e94f6707ddf26ef0c0f" FOREIGN KEY ("transaction_id") REFERENCES "transaction_item_breakdowns"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
`ALTER TABLE "t_breakdown_item_taxes" ADD CONSTRAINT "FK_74bedce7e94f6707ddf26ef0c0f" FOREIGN KEY ("transaction_id") REFERENCES "transaction_item_breakdowns"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
||||||
);
|
);
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "payment_total_dpp" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "payment_total_dpp" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "payment_total_tax" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "payment_total_tax" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "total_share_tenant" numeric`,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
@ -46,6 +34,9 @@ export class AddTaxItemTransaction1726045820711 implements MigrationInterface {
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "transaction_item_taxes" DROP CONSTRAINT "FK_f5c4966a381d903899cafb4b5ba"`,
|
`ALTER TABLE "transaction_item_taxes" DROP CONSTRAINT "FK_f5c4966a381d903899cafb4b5ba"`,
|
||||||
);
|
);
|
||||||
|
await queryRunner.query(
|
||||||
|
`ALTER TABLE "price_formulas" DROP COLUMN "value_for"`,
|
||||||
|
);
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "total_profit_share"`,
|
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "total_profit_share"`,
|
||||||
);
|
);
|
||||||
|
@ -54,20 +45,5 @@ export class AddTaxItemTransaction1726045820711 implements MigrationInterface {
|
||||||
);
|
);
|
||||||
await queryRunner.query(`DROP TABLE "t_breakdown_item_taxes"`);
|
await queryRunner.query(`DROP TABLE "t_breakdown_item_taxes"`);
|
||||||
await queryRunner.query(`DROP TABLE "transaction_item_taxes"`);
|
await queryRunner.query(`DROP TABLE "transaction_item_taxes"`);
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "payment_total_dpp"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "payment_total_dpp"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "payment_total_tax"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "payment_total_tax"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "total_share_tenant"`,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -5,11 +5,11 @@ COPY . .
|
||||||
RUN yarn install
|
RUN yarn install
|
||||||
RUN yarn build
|
RUN yarn build
|
||||||
FROM node:18.17-alpine
|
FROM node:18.17-alpine
|
||||||
# ARG env_target
|
ARG env_target
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
# RUN echo ${env_target}
|
RUN echo ${env_target}
|
||||||
# COPY env/$env_target /app/.env
|
COPY env/$env_target /app/.env
|
||||||
# COPY --from=builder /app/env/$env_target .env
|
COPY --from=builder /app/env/$env_target .env
|
||||||
COPY --from=builder /app/node_modules ./node_modules
|
COPY --from=builder /app/node_modules ./node_modules
|
||||||
COPY --from=builder /app/dist ./dist
|
COPY --from=builder /app/dist ./dist
|
||||||
COPY --from=builder /app/assets ./assets
|
COPY --from=builder /app/assets ./assets
|
||||||
|
|
|
@ -43,7 +43,4 @@ GOOGLE_CALENDAR_ID="326464ac296874c7121825f5ef2e2799baa90b51da240f0045aae22beec1
|
||||||
|
|
||||||
SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
|
SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
|
||||||
SUPERSET_ADMIN_USERNAME=admin
|
SUPERSET_ADMIN_USERNAME=admin
|
||||||
SUPERSET_ADMIN_PASSWORD=admin
|
SUPERSET_ADMIN_PASSWORD=admin
|
||||||
|
|
||||||
WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID=604883366037548
|
|
||||||
WHATSAPP_BUSINESS_ACCESS_TOKEN=EAAINOvRRiEEBO9yQsYDnYtjHZB7q1nZCwbBpRcxIGMDWajKZBtmWxNRKvPYkS95KQZBsZBOvSFyjiEg5CcCZBZBtaSZApxyV8fiA3cEyVwf7iVZBQP2YCTPRQZArMFeeXbO0uq5TGygmjsIz3M4YxcUHxPzKO4pKxIyxnzcoUZCqCSo1NqQSLVf3a0JyZAwgDXGL55dV
|
|
|
@ -40,7 +40,4 @@ GOOGLE_CALENDAR_ID="326464ac296874c7121825f5ef2e2799baa90b51da240f0045aae22beec1
|
||||||
|
|
||||||
SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
|
SUPERSET_URL=https://dashboard.weplayground.eigen.co.id
|
||||||
SUPERSET_ADMIN_USERNAME=admin
|
SUPERSET_ADMIN_USERNAME=admin
|
||||||
SUPERSET_ADMIN_PASSWORD=admin
|
SUPERSET_ADMIN_PASSWORD=admin
|
||||||
|
|
||||||
WHATSAPP_BUSINESS_ACCOUNT_NUMBER_ID=604883366037548
|
|
||||||
WHATSAPP_BUSINESS_ACCESS_TOKEN=EAAINOvRRiEEBO9yQsYDnYtjHZB7q1nZCwbBpRcxIGMDWajKZBtmWxNRKvPYkS95KQZBsZBOvSFyjiEg5CcCZBZBtaSZApxyV8fiA3cEyVwf7iVZBQP2YCTPRQZArMFeeXbO0uq5TGygmjsIz3M4YxcUHxPzKO4pKxIyxnzcoUZCqCSo1NqQSLVf3a0JyZAwgDXGL55dV
|
|
|
@ -49,7 +49,6 @@
|
||||||
"exceljs": "^4.4.0",
|
"exceljs": "^4.4.0",
|
||||||
"fs-extra": "^11.2.0",
|
"fs-extra": "^11.2.0",
|
||||||
"googleapis": "^140.0.0",
|
"googleapis": "^140.0.0",
|
||||||
"gtts": "^0.2.1",
|
|
||||||
"handlebars": "^4.7.8",
|
"handlebars": "^4.7.8",
|
||||||
"mathjs": "^13.0.2",
|
"mathjs": "^13.0.2",
|
||||||
"midtrans-client": "^1.3.1",
|
"midtrans-client": "^1.3.1",
|
||||||
|
@ -59,7 +58,6 @@
|
||||||
"pdfmake": "^0.2.10",
|
"pdfmake": "^0.2.10",
|
||||||
"pg": "^8.11.5",
|
"pg": "^8.11.5",
|
||||||
"plop": "^4.0.1",
|
"plop": "^4.0.1",
|
||||||
"qrcode": "^1.5.4",
|
|
||||||
"reflect-metadata": "^0.2.0",
|
"reflect-metadata": "^0.2.0",
|
||||||
"rxjs": "^7.5.0",
|
"rxjs": "^7.5.0",
|
||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
|
@ -72,7 +70,6 @@
|
||||||
"@types/express": "^4.17.13",
|
"@types/express": "^4.17.13",
|
||||||
"@types/jest": "29.5.12",
|
"@types/jest": "29.5.12",
|
||||||
"@types/node": "^20.12.13",
|
"@types/node": "^20.12.13",
|
||||||
"@types/qrcode": "^1.5.5",
|
|
||||||
"@types/supertest": "^2.0.11",
|
"@types/supertest": "^2.0.11",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
||||||
"@typescript-eslint/parser": "^5.0.0",
|
"@typescript-eslint/parser": "^5.0.0",
|
||||||
|
|
|
@ -33,10 +33,7 @@ import { SeasonTypeModel } from './modules/season-related/season-type/data/model
|
||||||
import { TaxModule } from './modules/transaction/tax/tax.module';
|
import { TaxModule } from './modules/transaction/tax/tax.module';
|
||||||
import { TaxModel } from './modules/transaction/tax/data/models/tax.model';
|
import { TaxModel } from './modules/transaction/tax/data/models/tax.model';
|
||||||
import { SalesPriceFormulaModule } from './modules/transaction/sales-price-formula/sales-price-formula.module';
|
import { SalesPriceFormulaModule } from './modules/transaction/sales-price-formula/sales-price-formula.module';
|
||||||
import {
|
import { SalesPriceFormulaModel } from './modules/transaction/sales-price-formula/data/models/sales-price-formula.model';
|
||||||
SalesPriceFormulaModel,
|
|
||||||
TransactionSettingModel,
|
|
||||||
} from './modules/transaction/sales-price-formula/data/models/sales-price-formula.model';
|
|
||||||
import { ProfitShareFormulaModule } from './modules/transaction/profit-share-formula/profit-share-formula.module';
|
import { ProfitShareFormulaModule } from './modules/transaction/profit-share-formula/profit-share-formula.module';
|
||||||
import { PaymentMethodModule } from './modules/transaction/payment-method/payment-method.module';
|
import { PaymentMethodModule } from './modules/transaction/payment-method/payment-method.module';
|
||||||
import { PaymentMethodModel } from './modules/transaction/payment-method/data/models/payment-method.model';
|
import { PaymentMethodModel } from './modules/transaction/payment-method/data/models/payment-method.model';
|
||||||
|
@ -48,10 +45,8 @@ import { GoogleCalendarModule } from './modules/configuration/google-calendar/go
|
||||||
import { TransactionModule } from './modules/transaction/transaction/transaction.module';
|
import { TransactionModule } from './modules/transaction/transaction/transaction.module';
|
||||||
import { TransactionModel } from './modules/transaction/transaction/data/models/transaction.model';
|
import { TransactionModel } from './modules/transaction/transaction/data/models/transaction.model';
|
||||||
import {
|
import {
|
||||||
TransactionBreakdownTaxModel,
|
|
||||||
TransactionItemBreakdownModel,
|
TransactionItemBreakdownModel,
|
||||||
TransactionItemModel,
|
TransactionItemModel,
|
||||||
TransactionItemTaxModel,
|
|
||||||
} from './modules/transaction/transaction/data/models/transaction-item.model';
|
} from './modules/transaction/transaction/data/models/transaction-item.model';
|
||||||
import { TransactionTaxModel } from './modules/transaction/transaction/data/models/transaction-tax.model';
|
import { TransactionTaxModel } from './modules/transaction/transaction/data/models/transaction-tax.model';
|
||||||
import { ReconciliationModule } from './modules/transaction/reconciliation/reconciliation.module';
|
import { ReconciliationModule } from './modules/transaction/reconciliation/reconciliation.module';
|
||||||
|
@ -84,29 +79,6 @@ import { SupersetModule } from './modules/configuration/superset/superset.module
|
||||||
import { GateScanModule } from './modules/gates/gate.module';
|
import { GateScanModule } from './modules/gates/gate.module';
|
||||||
import { UserLoginModel } from './modules/user-related/user/data/models/user-login.model';
|
import { UserLoginModel } from './modules/user-related/user/data/models/user-login.model';
|
||||||
import { LogUserLoginModel } from './modules/configuration/log/data/models/log-user-login.model';
|
import { LogUserLoginModel } from './modules/configuration/log/data/models/log-user-login.model';
|
||||||
import { AuthService } from './core/guards/domain/services/auth.service';
|
|
||||||
import { ReportSummaryModule } from './modules/reports/report-summary/report-summary.module';
|
|
||||||
import { QueueModule } from './modules/queue/queue.module';
|
|
||||||
import {
|
|
||||||
QueueOrderModel,
|
|
||||||
QueueTicketModel,
|
|
||||||
QueueItemModel,
|
|
||||||
QueueModel,
|
|
||||||
} from './modules/queue/data/models/queue.model';
|
|
||||||
import { ItemQueueModule } from './modules/item-related/item-queue/item-queue.module';
|
|
||||||
import { ItemQueueModel } from './modules/item-related/item-queue/data/models/item-queue.model';
|
|
||||||
import { QueueBucketModel } from './modules/queue/data/models/queue-bucket.model';
|
|
||||||
import { VerificationModel } from './modules/booking-online/authentication/data/models/verification.model';
|
|
||||||
import { BookingOnlineAuthModule } from './modules/booking-online/authentication/auth.module';
|
|
||||||
import { BookingOrderModule } from './modules/booking-online/order/order.module';
|
|
||||||
import { TimeGroupModule } from './modules/item-related/time-group/time-group.module';
|
|
||||||
import { TimeGroupModel } from './modules/item-related/time-group/data/models/time-group.model';
|
|
||||||
|
|
||||||
import { OtpVerificationModule } from './modules/configuration/otp-verification/otp-verification.module';
|
|
||||||
import { OtpVerificationModel } from './modules/configuration/otp-verification/data/models/otp-verification.model';
|
|
||||||
import { OtpVerifierModel } from './modules/configuration/otp-verification/data/models/otp-verifier.model';
|
|
||||||
import { RescheduleVerificationModel } from './modules/booking-online/order/data/models/reschedule-verification.model';
|
|
||||||
import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -131,8 +103,6 @@ import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
||||||
ItemModel,
|
ItemModel,
|
||||||
ItemCategoryModel,
|
ItemCategoryModel,
|
||||||
ItemRateModel,
|
ItemRateModel,
|
||||||
ItemQueueModel,
|
|
||||||
TimeGroupModel,
|
|
||||||
LogModel,
|
LogModel,
|
||||||
LogUserLoginModel,
|
LogUserLoginModel,
|
||||||
NewsModel,
|
NewsModel,
|
||||||
|
@ -150,9 +120,6 @@ import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
||||||
TransactionTaxModel,
|
TransactionTaxModel,
|
||||||
TransactionDemographyModel,
|
TransactionDemographyModel,
|
||||||
TransactionItemBreakdownModel,
|
TransactionItemBreakdownModel,
|
||||||
TransactionItemTaxModel,
|
|
||||||
TransactionBreakdownTaxModel,
|
|
||||||
TransactionSettingModel,
|
|
||||||
UserModel,
|
UserModel,
|
||||||
UserLoginModel,
|
UserLoginModel,
|
||||||
|
|
||||||
|
@ -162,20 +129,6 @@ import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
||||||
// report
|
// report
|
||||||
ReportBookmarkModel,
|
ReportBookmarkModel,
|
||||||
ExportReportHistoryModel,
|
ExportReportHistoryModel,
|
||||||
|
|
||||||
// Queue
|
|
||||||
QueueOrderModel,
|
|
||||||
QueueTicketModel,
|
|
||||||
QueueItemModel,
|
|
||||||
QueueModel,
|
|
||||||
QueueBucketModel,
|
|
||||||
|
|
||||||
// Booking Online
|
|
||||||
VerificationModel,
|
|
||||||
RescheduleVerificationModel,
|
|
||||||
|
|
||||||
OtpVerificationModel,
|
|
||||||
OtpVerifierModel,
|
|
||||||
],
|
],
|
||||||
synchronize: false,
|
synchronize: false,
|
||||||
}),
|
}),
|
||||||
|
@ -201,8 +154,6 @@ import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
||||||
ItemCategoryModule,
|
ItemCategoryModule,
|
||||||
ItemModule,
|
ItemModule,
|
||||||
ItemRateModule,
|
ItemRateModule,
|
||||||
ItemQueueModule,
|
|
||||||
TimeGroupModule,
|
|
||||||
|
|
||||||
// transaction
|
// transaction
|
||||||
PaymentMethodModule,
|
PaymentMethodModule,
|
||||||
|
@ -230,25 +181,15 @@ import { OtpCheckerGuard } from './core/guards/domain/otp-checker.guard';
|
||||||
ReportModule,
|
ReportModule,
|
||||||
ReportBookmarkModule,
|
ReportBookmarkModule,
|
||||||
ReportExportModule,
|
ReportExportModule,
|
||||||
ReportSummaryModule,
|
|
||||||
|
|
||||||
// superset
|
// superset
|
||||||
SupersetModule,
|
SupersetModule,
|
||||||
|
|
||||||
GateScanModule,
|
GateScanModule,
|
||||||
|
|
||||||
QueueModule,
|
|
||||||
|
|
||||||
BookingOnlineAuthModule,
|
|
||||||
BookingOrderModule,
|
|
||||||
OtpVerificationModule,
|
|
||||||
],
|
],
|
||||||
controllers: [],
|
controllers: [],
|
||||||
providers: [
|
providers: [
|
||||||
AuthService,
|
|
||||||
PrivilegeService,
|
PrivilegeService,
|
||||||
OtpCheckerGuard,
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* By default all request from client will protect by JWT
|
* By default all request from client will protect by JWT
|
||||||
* if there is some endpoint/function that does'nt require authentication
|
* if there is some endpoint/function that does'nt require authentication
|
||||||
|
|
|
@ -7,10 +7,10 @@ import {
|
||||||
UnauthorizedException,
|
UnauthorizedException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { Reflector } from '@nestjs/core';
|
import { Reflector } from '@nestjs/core';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
import { SessionService, UsersSession } from 'src/core/sessions';
|
import { SessionService, UsersSession } from 'src/core/sessions';
|
||||||
import { UNPROTECTED_URL } from '../constants';
|
import { UNPROTECTED_URL } from '../constants';
|
||||||
import { PrivilegeService } from './services/privilege.service';
|
import { PrivilegeService } from './services/privilege.service';
|
||||||
import { AuthService } from './services/auth.service';
|
|
||||||
|
|
||||||
@Injectable({ scope: Scope.REQUEST })
|
@Injectable({ scope: Scope.REQUEST })
|
||||||
export class JWTGuard implements CanActivate {
|
export class JWTGuard implements CanActivate {
|
||||||
|
@ -18,13 +18,14 @@ export class JWTGuard implements CanActivate {
|
||||||
protected readonly session: SessionService,
|
protected readonly session: SessionService,
|
||||||
protected readonly reflector: Reflector,
|
protected readonly reflector: Reflector,
|
||||||
protected readonly privilege: PrivilegeService,
|
protected readonly privilege: PrivilegeService,
|
||||||
protected readonly authService: AuthService,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
protected isPublic = false;
|
protected isPublic = false;
|
||||||
protected userSession: UsersSession;
|
protected userSession: UsersSession;
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext) {
|
canActivate(
|
||||||
|
context: ExecutionContext,
|
||||||
|
): boolean | Promise<boolean> | Observable<boolean> {
|
||||||
/**
|
/**
|
||||||
* Check if access url is protected or not
|
* Check if access url is protected or not
|
||||||
* By default `isUnprotected` equals `false`
|
* By default `isUnprotected` equals `false`
|
||||||
|
@ -60,29 +61,9 @@ export class JWTGuard implements CanActivate {
|
||||||
*/
|
*/
|
||||||
try {
|
try {
|
||||||
this.userSession = this.session.verifyToken(token);
|
this.userSession = this.session.verifyToken(token);
|
||||||
await this.authService.verifyRegisteredLoginToken(token);
|
|
||||||
|
|
||||||
Logger.log(`Access from ${this.userSession.name}`, 'AuthGuard');
|
Logger.log(`Access from ${this.userSession.name}`, 'AuthGuard');
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const expiredError = error.message;
|
|
||||||
if (expiredError === 'jwt expired') {
|
|
||||||
const [, body] = token.split('.');
|
|
||||||
const bodyToken = JSON.parse(atob(body));
|
|
||||||
|
|
||||||
const user = {
|
|
||||||
role: bodyToken.role,
|
|
||||||
user_id: bodyToken.id,
|
|
||||||
username: bodyToken.username,
|
|
||||||
user_privilege_id: bodyToken.user_privilege_id,
|
|
||||||
item_id: bodyToken.item_id,
|
|
||||||
item_name: bodyToken.item_name,
|
|
||||||
source: bodyToken.source,
|
|
||||||
};
|
|
||||||
|
|
||||||
this.authService.logoutUser(user, token);
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new UnauthorizedException({
|
throw new UnauthorizedException({
|
||||||
code: 10001,
|
code: 10001,
|
||||||
message:
|
message:
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
import {
|
|
||||||
CanActivate,
|
|
||||||
ExecutionContext,
|
|
||||||
Injectable,
|
|
||||||
UnprocessableEntityException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { InjectDataSource } from '@nestjs/typeorm';
|
|
||||||
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
|
|
||||||
import { OtpVerificationModel } from 'src/modules/configuration/otp-verification/data/models/otp-verification.model';
|
|
||||||
import { OtpVerificationEntity } from 'src/modules/configuration/otp-verification/domain/entities/otp-verification.entity';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class OtpCheckerGuard implements CanActivate {
|
|
||||||
constructor(
|
|
||||||
@InjectDataSource(CONNECTION_NAME.DEFAULT)
|
|
||||||
protected readonly dataSource: DataSource,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
get otpRepository() {
|
|
||||||
return this.dataSource.getRepository(OtpVerificationModel);
|
|
||||||
}
|
|
||||||
|
|
||||||
async canActivate(context: ExecutionContext): Promise<boolean> {
|
|
||||||
const request = context.switchToHttp().getRequest();
|
|
||||||
const verificationCode = request.headers['x-verification-code'];
|
|
||||||
console.log({ verificationCode });
|
|
||||||
|
|
||||||
if (verificationCode) {
|
|
||||||
const decoded = Buffer.from(verificationCode, 'base64').toString('ascii');
|
|
||||||
const [dataIdentity, otpCode] = decoded.split('|');
|
|
||||||
|
|
||||||
let otpData: OtpVerificationEntity;
|
|
||||||
|
|
||||||
otpData = await this.otpRepository.findOne({
|
|
||||||
where: {
|
|
||||||
otp_code: otpCode,
|
|
||||||
target_id: dataIdentity,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!otpData) {
|
|
||||||
otpData = await this.otpRepository.findOne({
|
|
||||||
where: {
|
|
||||||
otp_code: otpCode,
|
|
||||||
reference: dataIdentity,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// console.log({ dataIdentity, otpCode, otpData });
|
|
||||||
if (otpData && otpData?.verified_at) return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new UnprocessableEntityException('OTP not verified.');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -9,7 +9,7 @@ import { MAIN_MENU } from '../constants';
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class RolesGuard extends JWTGuard {
|
export class RolesGuard extends JWTGuard {
|
||||||
async canActivate(context: ExecutionContext): Promise<boolean> {
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||||
await super.canActivate(context);
|
super.canActivate(context);
|
||||||
|
|
||||||
// jika endpoint tersebut bukan public, maka lakukan check lanjutan
|
// jika endpoint tersebut bukan public, maka lakukan check lanjutan
|
||||||
if (!this.isPublic) {
|
if (!this.isPublic) {
|
||||||
|
|
|
@ -1,78 +0,0 @@
|
||||||
import {
|
|
||||||
HttpStatus,
|
|
||||||
Injectable,
|
|
||||||
Scope,
|
|
||||||
UnauthorizedException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { InjectDataSource } from '@nestjs/typeorm';
|
|
||||||
import {
|
|
||||||
CONNECTION_NAME,
|
|
||||||
OPERATION,
|
|
||||||
} from 'src/core/strings/constants/base.constants';
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
import { UserRole } from 'src/modules/user-related/user/constants';
|
|
||||||
import { UserModel } from 'src/modules/user-related/user/data/models/user.model';
|
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
|
||||||
import { EventBus } from '@nestjs/cqrs';
|
|
||||||
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
|
||||||
import { UserLoginModel } from 'src/modules/user-related/user/data/models/user-login.model';
|
|
||||||
|
|
||||||
interface UserEntity {
|
|
||||||
user_id: string;
|
|
||||||
username: string;
|
|
||||||
role: UserRole;
|
|
||||||
user_privilege_id: string;
|
|
||||||
item_id: string;
|
|
||||||
item_name: string;
|
|
||||||
source: AppSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable({ scope: Scope.REQUEST })
|
|
||||||
export class AuthService {
|
|
||||||
constructor(
|
|
||||||
@InjectDataSource(CONNECTION_NAME.DEFAULT)
|
|
||||||
protected readonly dataSource: DataSource,
|
|
||||||
|
|
||||||
private eventBus: EventBus,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
get repository() {
|
|
||||||
return this.dataSource.getRepository(UserLoginModel);
|
|
||||||
}
|
|
||||||
|
|
||||||
async logoutUser(user: UserEntity, token: string) {
|
|
||||||
await this.repository.delete({ login_token: token });
|
|
||||||
|
|
||||||
const userLogout = {
|
|
||||||
type: LogUserType.logout,
|
|
||||||
created_at: new Date().getTime(),
|
|
||||||
name: user.username,
|
|
||||||
user_privilege_id: user.user_privilege_id,
|
|
||||||
...user,
|
|
||||||
};
|
|
||||||
|
|
||||||
this.eventBus.publish(
|
|
||||||
new LogUserLoginEvent({
|
|
||||||
id: user.user_id,
|
|
||||||
old: null,
|
|
||||||
data: userLogout,
|
|
||||||
user: userLogout as any,
|
|
||||||
description: 'Logout',
|
|
||||||
module: UserModel.name,
|
|
||||||
op: OPERATION.UPDATE,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async verifyRegisteredLoginToken(token: string) {
|
|
||||||
const data = await this.repository.findOneBy({ login_token: token });
|
|
||||||
|
|
||||||
if (!data) {
|
|
||||||
throw new UnauthorizedException({
|
|
||||||
statusCode: HttpStatus.UNAUTHORIZED,
|
|
||||||
message: `Invalid token`,
|
|
||||||
error: 'Unauthorized',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,10 +2,3 @@ export enum LogUserType {
|
||||||
login = 'login',
|
login = 'login',
|
||||||
logout = 'logout',
|
logout = 'logout',
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum AppSource {
|
|
||||||
POS_ADMIN = 'POS_ADMIN',
|
|
||||||
POS_COUNTER = 'POS_COUNTER',
|
|
||||||
QUEUE_ADMIN = 'QUEUE_ADMIN',
|
|
||||||
QUEUE_CUSTOMER = 'QUEUE_CUSTOMER',
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
interface OtpServiceEntity {
|
|
||||||
length?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class OtpService {
|
|
||||||
private readonly otpLength: number;
|
|
||||||
|
|
||||||
constructor({ length = 4 }: OtpServiceEntity) {
|
|
||||||
this.otpLength = Math.max(length, 4); // Minimum of 4 digits
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasSequentialDigits(str: string): boolean {
|
|
||||||
for (let i = 0; i < str.length - 1; i++) {
|
|
||||||
const current = parseInt(str[i], 10);
|
|
||||||
const next = parseInt(str[i + 1], 10);
|
|
||||||
if (next === current + 1 || next === current - 1) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasRepeatedDigits(str: string): boolean {
|
|
||||||
return str.split('').every((char) => char === str[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private isPalindrome(str: string): boolean {
|
|
||||||
return str === str.split('').reverse().join('');
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasPartiallyRepeatedDigits(str: string): boolean {
|
|
||||||
const counts: Record<string, number> = {};
|
|
||||||
for (const char of str) {
|
|
||||||
counts[char] = (counts[char] || 0) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reject if any digit appears more than twice
|
|
||||||
return Object.values(counts).some((count) => count > 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasNoMatchLength(str: string) {
|
|
||||||
return str.length !== this.otpLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
private hasStartWithZero(str: string) {
|
|
||||||
return str.split('')[0] === '0';
|
|
||||||
}
|
|
||||||
|
|
||||||
public generateSecureOTP(): string {
|
|
||||||
let otp: string;
|
|
||||||
|
|
||||||
do {
|
|
||||||
otp = Array.from({ length: this.otpLength }, () =>
|
|
||||||
Math.floor(Math.random() * 10).toString(),
|
|
||||||
).join('');
|
|
||||||
} while (
|
|
||||||
this.hasNoMatchLength(otp) ||
|
|
||||||
this.hasSequentialDigits(otp) ||
|
|
||||||
this.hasRepeatedDigits(otp) ||
|
|
||||||
this.isPalindrome(otp) ||
|
|
||||||
this.hasPartiallyRepeatedDigits(otp) ||
|
|
||||||
this.hasStartWithZero(otp)
|
|
||||||
);
|
|
||||||
return otp;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -8,9 +8,7 @@ import { diskStorage } from 'multer';
|
||||||
const MB = 1024 * 1024;
|
const MB = 1024 * 1024;
|
||||||
|
|
||||||
const fileFilter = (req, file, callback) => {
|
const fileFilter = (req, file, callback) => {
|
||||||
if (
|
if (file.mimetype.match(/\/(jpg|jpeg|png)$/)) {
|
||||||
file.mimetype.match(/\/(jpg|jpeg|png|flv|mp4|m3u8|ts|3gp|mov|avi|wmv)$/)
|
|
||||||
) {
|
|
||||||
callback(null, true);
|
callback(null, true);
|
||||||
} else {
|
} else {
|
||||||
callback(
|
callback(
|
||||||
|
|
|
@ -55,7 +55,7 @@ export class ValidateRelationHelper<Entity> {
|
||||||
const relationColumn =
|
const relationColumn =
|
||||||
data[relation.relation]?.[`${relation.singleQuery[0]}`];
|
data[relation.relation]?.[`${relation.singleQuery[0]}`];
|
||||||
if (
|
if (
|
||||||
// !!relationColumn &&
|
!!relationColumn &&
|
||||||
this.mappingValidator(
|
this.mappingValidator(
|
||||||
relationColumn,
|
relationColumn,
|
||||||
relation.singleQuery[1],
|
relation.singleQuery[1],
|
||||||
|
|
|
@ -32,7 +32,7 @@ export abstract class BaseManager {
|
||||||
|
|
||||||
setUser() {
|
setUser() {
|
||||||
try {
|
try {
|
||||||
this.user = this.userProvider?.user ?? BLANK_USER;
|
this.user = this.userProvider?.user;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.user = BLANK_USER;
|
this.user = BLANK_USER;
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,7 +71,7 @@ export abstract class BaseCreateManager<Entity> extends BaseManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
async publishEvents() {
|
async publishEvents() {
|
||||||
this.eventBus?.publish(
|
this.eventBus.publish(
|
||||||
new RecordLog({
|
new RecordLog({
|
||||||
id: this.result['id'],
|
id: this.result['id'],
|
||||||
old: null,
|
old: null,
|
||||||
|
|
|
@ -50,7 +50,7 @@ export abstract class BaseIndexManager<Entity> extends BaseReadManager {
|
||||||
|
|
||||||
// jika searching status terdapat dalam enum, maka dia mencari specific data
|
// jika searching status terdapat dalam enum, maka dia mencari specific data
|
||||||
// ? karena jika tidak, ketika dia search "active" maka "inactive" juga ikut
|
// ? karena jika tidak, ketika dia search "active" maka "inactive" juga ikut
|
||||||
return `'${STATUS[statusData.toUpperCase()]}'`;
|
return `'${STATUS[statusData.toUpperCase()]}'` ?? `'%${statusData}%'`;
|
||||||
});
|
});
|
||||||
|
|
||||||
const exist = specificFilter.find((item) => item.isStatus);
|
const exist = specificFilter.find((item) => item.isStatus);
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
import { ValidateRelationHelper } from 'src/core/helpers/validation/validate-relation.helper';
|
import { ValidateRelationHelper } from 'src/core/helpers/validation/validate-relation.helper';
|
||||||
import { BaseManager } from '../base.manager';
|
import { BaseManager } from '../base.manager';
|
||||||
import {
|
import { OPERATION, STATUS } from 'src/core/strings/constants/base.constants';
|
||||||
OPERATION,
|
|
||||||
QUEUE_STATUS,
|
|
||||||
STATUS,
|
|
||||||
} from 'src/core/strings/constants/base.constants';
|
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
import { RecordLog } from 'src/modules/configuration/log/domain/entities/log.event';
|
import { RecordLog } from 'src/modules/configuration/log/domain/entities/log.event';
|
||||||
|
|
||||||
|
@ -12,12 +8,12 @@ export abstract class BaseUpdateStatusManager<Entity> extends BaseManager {
|
||||||
protected dataId: string;
|
protected dataId: string;
|
||||||
protected result: Entity;
|
protected result: Entity;
|
||||||
protected oldData: Entity;
|
protected oldData: Entity;
|
||||||
protected dataStatus: STATUS | QUEUE_STATUS;
|
protected dataStatus: STATUS;
|
||||||
protected relations = [];
|
protected relations = [];
|
||||||
protected duplicateColumn: string[];
|
protected duplicateColumn: string[];
|
||||||
abstract get entityTarget(): any;
|
abstract get entityTarget(): any;
|
||||||
|
|
||||||
setData(id: string, status: STATUS | QUEUE_STATUS): void {
|
setData(id: string, status: STATUS): void {
|
||||||
/**
|
/**
|
||||||
* // TODO: Handle case confirm multiple tabs;
|
* // TODO: Handle case confirm multiple tabs;
|
||||||
* Pola id yang dikirim dirubah menjadi data_id___updated_at
|
* Pola id yang dikirim dirubah menjadi data_id___updated_at
|
||||||
|
|
|
@ -23,7 +23,6 @@ export class BaseFilterDto implements BaseFilterEntity {
|
||||||
@IsNumber()
|
@IsNumber()
|
||||||
limit = 10;
|
limit = 10;
|
||||||
|
|
||||||
@ApiProperty({ type: String, required: false })
|
|
||||||
q: string;
|
q: string;
|
||||||
|
|
||||||
@ApiProperty({ type: ['string'], required: false })
|
@ApiProperty({ type: ['string'], required: false })
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
import { AppSource } from 'src/core/helpers/constant';
|
|
||||||
import { UserRole } from 'src/modules/user-related/user/constants';
|
import { UserRole } from 'src/modules/user-related/user/constants';
|
||||||
|
|
||||||
export interface UsersSession {
|
export interface UsersSession {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
role: UserRole;
|
role: UserRole;
|
||||||
source?: AppSource;
|
|
||||||
item_id?: string;
|
|
||||||
user_privilege_id: string;
|
user_privilege_id: string;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,9 +23,4 @@ export class UserProvider {
|
||||||
const [, token] = this.request.headers['authorization'].split(' ');
|
const [, token] = this.request.headers['authorization'].split(' ');
|
||||||
return this.session.verifyToken(token);
|
return this.session.verifyToken(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
get token(): string {
|
|
||||||
const [, token] = this.request.headers['authorization'].split(' ');
|
|
||||||
return token;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,11 +15,6 @@ export enum STATUS {
|
||||||
WAITING = 'waiting',
|
WAITING = 'waiting',
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum QUEUE_STATUS {
|
|
||||||
DONE = 'done',
|
|
||||||
CALLED = 'called',
|
|
||||||
}
|
|
||||||
|
|
||||||
export enum ORDER_TYPE {
|
export enum ORDER_TYPE {
|
||||||
ASC = 'ASC',
|
ASC = 'ASC',
|
||||||
DESC = 'DESC',
|
DESC = 'DESC',
|
||||||
|
|
|
@ -4,7 +4,6 @@ export enum MODULE_NAME {
|
||||||
GATE = 'gates',
|
GATE = 'gates',
|
||||||
ITEM = 'items',
|
ITEM = 'items',
|
||||||
ITEM_CATEGORY = 'item-categories',
|
ITEM_CATEGORY = 'item-categories',
|
||||||
ITEM_QUEUE = 'item-queues',
|
|
||||||
ITEM_RATE = 'item-rates',
|
ITEM_RATE = 'item-rates',
|
||||||
NEWS = 'news',
|
NEWS = 'news',
|
||||||
PAYMENT_METHOD = 'payment-methods',
|
PAYMENT_METHOD = 'payment-methods',
|
||||||
|
@ -25,12 +24,4 @@ export enum MODULE_NAME {
|
||||||
REPORT = 'report',
|
REPORT = 'report',
|
||||||
REPORT_BOOKMARK = 'report-bookmark',
|
REPORT_BOOKMARK = 'report-bookmark',
|
||||||
REPORT_EXPORT = 'report-export',
|
REPORT_EXPORT = 'report-export',
|
||||||
REPORT_SUMMARY = 'report-summary',
|
|
||||||
|
|
||||||
QUEUE = 'queue',
|
|
||||||
|
|
||||||
TIME_GROUPS = 'time-groups',
|
|
||||||
OTP_VERIFICATIONS = 'otp-verification',
|
|
||||||
|
|
||||||
OTP_VERIFIER = 'otp-verifier',
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ export enum TABLE_NAME {
|
||||||
FAQ = 'faqs',
|
FAQ = 'faqs',
|
||||||
ITEM = 'items',
|
ITEM = 'items',
|
||||||
ITEM_CATEGORY = 'item_categories',
|
ITEM_CATEGORY = 'item_categories',
|
||||||
ITEM_QUEUE = 'item_queues',
|
|
||||||
ITEM_RATE = 'item_rates',
|
ITEM_RATE = 'item_rates',
|
||||||
GATE = 'gates',
|
GATE = 'gates',
|
||||||
LOG = 'logs',
|
LOG = 'logs',
|
||||||
|
@ -12,7 +11,6 @@ export enum TABLE_NAME {
|
||||||
NEWS = 'news',
|
NEWS = 'news',
|
||||||
PAYMENT_METHOD = 'payment_methods',
|
PAYMENT_METHOD = 'payment_methods',
|
||||||
PRICE_FORMULA = 'price_formulas',
|
PRICE_FORMULA = 'price_formulas',
|
||||||
TRANSACTION_SETTING = 'transaction_settings',
|
|
||||||
REFUND = 'refunds',
|
REFUND = 'refunds',
|
||||||
REFUND_ITEM = 'refund_items',
|
REFUND_ITEM = 'refund_items',
|
||||||
SEASON_TYPE = 'season_types',
|
SEASON_TYPE = 'season_types',
|
||||||
|
@ -37,14 +35,4 @@ export enum TABLE_NAME {
|
||||||
|
|
||||||
REPORT_BOOKMARK = 'report_bookmark',
|
REPORT_BOOKMARK = 'report_bookmark',
|
||||||
EXPORT_REPORT_HISTORY = 'export_report_history',
|
EXPORT_REPORT_HISTORY = 'export_report_history',
|
||||||
|
|
||||||
QUEUE = 'queues',
|
|
||||||
QUEUE_ORDER = 'queue_orders',
|
|
||||||
QUEUE_TICKET = 'queue_tickets',
|
|
||||||
QUEUE_ITEM = 'queue_items',
|
|
||||||
QUEUE_BUCKET = 'queue_bucket',
|
|
||||||
|
|
||||||
TIME_GROUPS = 'time_groups',
|
|
||||||
OTP_VERIFICATIONS = 'otp_verifications',
|
|
||||||
OTP_VERIFIER = 'otp_verifier',
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ export class AddEstimationToItem1723801180604 implements MigrationInterface {
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
await queryRunner.query(
|
await queryRunner.query(
|
||||||
`ALTER TABLE "items" ADD "play_estimation" numeric`,
|
`ALTER TABLE "items" ADD "play_estimation" integer`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddFormulaToTax1726365023179 implements MigrationInterface {
|
|
||||||
name = 'AddFormulaToTax1726365023179';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "taxes" ADD "formula_render" json`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "taxes" ADD "formula_string" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "taxes" DROP COLUMN "formula_string"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "taxes" DROP COLUMN "formula_render"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ChangeUserLoginRelation1726642119207
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'ChangeUserLoginRelation1726642119207';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "refresh_token"`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" DROP CONSTRAINT "FK_2a80a213b51423ce5b8211f0584"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" DROP CONSTRAINT "REL_2a80a213b51423ce5b8211f058"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" ADD CONSTRAINT "FK_2a80a213b51423ce5b8211f0584" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" DROP CONSTRAINT "FK_2a80a213b51423ce5b8211f0584"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" ADD CONSTRAINT "REL_2a80a213b51423ce5b8211f058" UNIQUE ("user_id")`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" ADD CONSTRAINT "FK_2a80a213b51423ce5b8211f0584" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users" ADD "refresh_token" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddColumnSourceAtUserLogin1726642499135
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddColumnSourceAtUserLogin1726642499135';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."users_login_role_enum" AS ENUM('superadmin', 'staff', 'tenant', 'queue_admin')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" ADD "role" "public"."users_login_role_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."users_login_source_enum" AS ENUM('POS_ADMIN', 'POS_COUNTER', 'QUEUE_ADMIN', 'QUEUE_CUSTOMER')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "users_login" ADD "source" "public"."users_login_source_enum"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "users_login" DROP COLUMN "source"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."users_login_source_enum"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "users_login" DROP COLUMN "role"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."users_login_role_enum"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddSourceOnLogLogin1726647442006 implements MigrationInterface {
|
|
||||||
name = 'AddSourceOnLogLogin1726647442006';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."log_users_login_source_enum" AS ENUM('POS_ADMIN', 'POS_COUNTER', 'QUEUE_ADMIN', 'QUEUE_CUSTOMER')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "log_users_login" ADD "source" "public"."log_users_login_source_enum"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "log_users_login" DROP COLUMN "source"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."log_users_login_source_enum"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,43 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddDiscountForItemTransaction1726824289989
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddDiscountForItemTransaction1726824289989';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "subtotal" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "discount_value" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "subtotal" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "discount_value" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" ADD "total_price" numeric`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "total_price"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "discount_value"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" DROP COLUMN "subtotal"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "discount_value"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "subtotal"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ChangeColumnName1726830293878 implements MigrationInterface {
|
|
||||||
name = 'ChangeColumnName1726830293878';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" RENAME COLUMN "subtotal" TO "total_net_price"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" RENAME COLUMN "subtotal" TO "total_net_price"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_item_breakdowns" RENAME COLUMN "total_net_price" TO "subtotal"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" RENAME COLUMN "total_net_price" TO "subtotal"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddDiscountValueToVoucher1728377112337
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddDiscountValueToVoucher1728377112337';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_codes" ADD "discount_value" numeric`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_codes" ALTER COLUMN "discount" DROP NOT NULL`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_codes" ALTER COLUMN "discount" SET NOT NULL`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_codes" DROP COLUMN "discount_value"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ItemVideoAndVipPass1729072422409 implements MigrationInterface {
|
|
||||||
name = 'ItemVideoAndVipPass1729072422409';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD "video_url" character varying`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_categories" ADD "has_vip_pass" boolean NOT NULL DEFAULT false`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_categories" DROP COLUMN "has_vip_pass"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "video_url"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,43 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class QueueTable1729151429165 implements MigrationInterface {
|
|
||||||
name = 'QueueTable1729151429165';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "queue_orders" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "code" character varying NOT NULL, "customer" character varying, "phone" character varying, "date" bigint NOT NULL, CONSTRAINT "PK_b139e4cc9ca3e709c152f820d2e" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "queue_tickets" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "code" character varying NOT NULL, "customer" character varying, "phone" character varying, "date" bigint NOT NULL, "order_id" uuid, CONSTRAINT "PK_1b903aa90bcc04136caa6540c55" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "queue_items" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "qty" integer NOT NULL, "ticket_id" uuid, "item_id" uuid, CONSTRAINT "PK_2245e11ac3517494bacfe932773" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_tickets" ADD CONSTRAINT "FK_0e9823b8b7ca9523b3be73878e5" FOREIGN KEY ("order_id") REFERENCES "queue_orders"("id") ON DELETE SET NULL ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_items" ADD CONSTRAINT "FK_25352739034765f6917757df74b" FOREIGN KEY ("ticket_id") REFERENCES "queue_tickets"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_items" ADD CONSTRAINT "FK_ab15c053aeb4f739ebf533b61cd" FOREIGN KEY ("item_id") REFERENCES "items"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_items" DROP CONSTRAINT "FK_ab15c053aeb4f739ebf533b61cd"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_items" DROP CONSTRAINT "FK_25352739034765f6917757df74b"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_tickets" DROP CONSTRAINT "FK_0e9823b8b7ca9523b3be73878e5"`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(`DROP TABLE "queue_items"`);
|
|
||||||
await queryRunner.query(`DROP TABLE "queue_tickets"`);
|
|
||||||
await queryRunner.query(`DROP TABLE "queue_orders"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class VideoUrlToJson1729248576381 implements MigrationInterface {
|
|
||||||
name = 'VideoUrlToJson1729248576381';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "video_url"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" ADD "video_url" json`);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "video_url"`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD "video_url" character varying`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`DROP TABLE "item_queues"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,33 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ItemQueues1729570177597 implements MigrationInterface {
|
|
||||||
name = 'ItemQueues1729570177597';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."item_queues_status_enum" AS ENUM('active', 'cancel', 'confirmed', 'draft', 'expired', 'inactive', 'partial refund', 'pending', 'proses refund', 'refunded', 'rejected', 'settled', 'waiting')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."item_queues_item_type_enum" AS ENUM('tiket masuk', 'wahana', 'bundling', 'free gift', 'other')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "item_queues" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "creator_id" character varying(36), "creator_name" character varying(125), "editor_id" character varying(36), "editor_name" character varying(125), "created_at" bigint NOT NULL, "updated_at" bigint NOT NULL, "status" "public"."item_queues_status_enum" NOT NULL DEFAULT 'draft', "name" character varying NOT NULL, "item_type" "public"."item_queues_item_type_enum" NOT NULL DEFAULT 'tiket masuk', CONSTRAINT "PK_e19adb0b99d995e8f10c189985f" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" ADD "item_queue_id" uuid`);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c" FOREIGN KEY ("item_queue_id") REFERENCES "item_queues"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c"`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "item_queue_id"`);
|
|
||||||
await queryRunner.query(`DROP TABLE "item_queues"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."item_queues_item_type_enum"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."item_queues_status_enum"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ItemQueueOnDelete1729582398827 implements MigrationInterface {
|
|
||||||
name = 'ItemQueueOnDelete1729582398827';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c"`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c" FOREIGN KEY ("item_queue_id") REFERENCES "item_queues"("id") ON DELETE SET NULL ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c"`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD CONSTRAINT "FK_2cbbeb03e176addcf60d65f7c9c" FOREIGN KEY ("item_queue_id") REFERENCES "item_queues"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddTransactionIdToQueueOrder1729653046392
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddTransactionIdToQueueOrder1729653046392';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_orders" ADD "transaction_id" character varying NOT NULL`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queue_orders" DROP COLUMN "transaction_id"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,22 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddQueueTable1729756969674 implements MigrationInterface {
|
|
||||||
name = 'AddQueueTable1729756969674';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "queues" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "code" character varying NOT NULL, "status" character varying NOT NULL, "time" bigint NOT NULL, "call_time" bigint NOT NULL, "vip" boolean NOT NULL, "item_id" uuid NOT NULL, "qty" integer NOT NULL, CONSTRAINT "PK_d966f9eb39a9396658387071bb3" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD CONSTRAINT "FK_435954e9a0d9967f17e043d54b4" FOREIGN KEY ("item_id") REFERENCES "queue_items"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" DROP CONSTRAINT "FK_435954e9a0d9967f17e043d54b4"`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(`DROP TABLE "queues"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,39 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddQueueBaseModel1729838994129 implements MigrationInterface {
|
|
||||||
name = 'AddQueueBaseModel1729838994129';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "creator_id" character varying(36)`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "creator_name" character varying(125)`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "editor_id" character varying(36)`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "editor_name" character varying(125)`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "created_at" bigint NOT NULL`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "updated_at" bigint NOT NULL`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ALTER COLUMN "call_time" DROP NOT NULL`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "updated_at"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "created_at"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "editor_name"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "editor_id"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "creator_name"`);
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "creator_id"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddQueueBucket1730859187883 implements MigrationInterface {
|
|
||||||
name = 'AddQueueBucket1730859187883';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "queue_bucket" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "queue_item_id" character varying NOT NULL, "date" bigint NOT NULL, "regular" integer NOT NULL, "vip" integer NOT NULL, CONSTRAINT "PK_cdd58b0d9e93e4be922da9d8bd6" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "queue_bucket"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddTransactionAndItemRelation1731383726542
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddTransactionAndItemRelation1731383726542';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "item_id"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "item_id" uuid`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP COLUMN "customer_category_id"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" ADD "customer_category_id" uuid`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD CONSTRAINT "FK_edb934ab033f847e3f7ed4fc0fc" FOREIGN KEY ("item_id") REFERENCES "items"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" ADD CONSTRAINT "FK_08dc8138714894a66e94820766d" FOREIGN KEY ("customer_category_id") REFERENCES "vip_categories"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP CONSTRAINT "FK_08dc8138714894a66e94820766d"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP CONSTRAINT "FK_edb934ab033f847e3f7ed4fc0fc"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP COLUMN "customer_category_id"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" ADD "customer_category_id" character varying`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" DROP COLUMN "item_id"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transaction_items" ADD "item_id" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddItemQueueToQueue1731498661938 implements MigrationInterface {
|
|
||||||
name = 'AddItemQueueToQueue1731498661938';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "item_queue_id" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "queues" DROP COLUMN "item_queue_id"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddInformationToItemQueue1731570311609
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddInformationToItemQueue1731570311609';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "information" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "information"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class ItemQueueAddTimeAndPeakLevel1733199330134
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'ItemQueueAddTimeAndPeakLevel1733199330134';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "max_peak_level" integer NOT NULL DEFAULT '100'`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "call_preparation" integer NOT NULL DEFAULT '5'`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "call_preparation"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "max_peak_level"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddNotificationConfigToItemQueue1734717058658
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddNotificationConfigToItemQueue1734717058658';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "use_notification" boolean NOT NULL DEFAULT true`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "requiring_notification" boolean NOT NULL DEFAULT false`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "requiring_notification"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "use_notification"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddLastNotificationToQueue1734718462106
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddLastNotificationToQueue1734718462106';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" ADD "last_notification" bigint NULL`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "queues" DROP COLUMN "last_notification"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class TransactionSettingModel1745991391299
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'TransactionSettingModel1745991391299';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "transaction_settings" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "creator_id" character varying(36), "creator_name" character varying(125), "editor_id" character varying(36), "editor_name" character varying(125), "created_at" bigint NOT NULL, "updated_at" bigint NOT NULL, "value" numeric NOT NULL DEFAULT '100', CONSTRAINT "PK_db7fb38a439358b499ebdee4761" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "transaction_settings"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class BookingAuthentication1748313715598 implements MigrationInterface {
|
|
||||||
name = 'BookingAuthentication1748313715598';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "booking_verification" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "phone_number" character varying NOT NULL, "code" character varying, "tried" integer NOT NULL DEFAULT '0', "created_at" bigint NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000, "updated_at" bigint NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000, CONSTRAINT "PK_046e9288c7dd05c7259275d9fc0" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "booking_verification"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,27 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class CreateTimeGroupTable1748409891706 implements MigrationInterface {
|
|
||||||
name = 'CreateTimeGroupTable1748409891706';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."time_groups_status_enum" AS ENUM('active', 'cancel', 'confirmed', 'draft', 'expired', 'inactive', 'partial refund', 'pending', 'proses refund', 'refunded', 'rejected', 'settled', 'waiting')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "time_groups" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "creator_id" character varying(36), "creator_name" character varying(125), "editor_id" character varying(36), "editor_name" character varying(125), "created_at" bigint NOT NULL, "updated_at" bigint NOT NULL, "status" "public"."time_groups_status_enum" NOT NULL DEFAULT 'draft', "name" character varying NOT NULL, "start_time" TIME NOT NULL, "end_time" TIME NOT NULL, "max_usage_time" TIME NOT NULL, CONSTRAINT "PK_083d02988db7bedfe3b7c869b50" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" ADD "time_group_id" uuid`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD CONSTRAINT "FK_f44f222e1808448dca1b6cc4557" FOREIGN KEY ("time_group_id") REFERENCES "time_groups"("id") ON DELETE CASCADE ON UPDATE CASCADE`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP CONSTRAINT "FK_f44f222e1808448dca1b6cc4557"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "time_group_id"`);
|
|
||||||
await queryRunner.query(`DROP TABLE "time_groups"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."time_groups_status_enum"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddColumnOtpCode1748935417155 implements MigrationInterface {
|
|
||||||
name = 'AddColumnOtpCode1748935417155';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "vip_codes" ADD "otp_code" character varying`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" ADD "otp_code" character varying`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP COLUMN "otp_code"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`ALTER TABLE "vip_codes" DROP COLUMN "otp_code"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class CreateTableOtpCerifications1749028279580
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'CreateTableOtpCerifications1749028279580';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_action_type_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_source_enum" AS ENUM('POS', 'WEB')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "otp_verifications" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "creator_id" character varying(36), "creator_name" character varying(125), "editor_id" character varying(36), "editor_name" character varying(125), "created_at" bigint NOT NULL, "updated_at" bigint NOT NULL, "otp_code" character varying NOT NULL, "action_type" "public"."otp_verifications_action_type_enum" NOT NULL, "target_id" character varying, "reference" character varying, "source" "public"."otp_verifications_source_enum" NOT NULL, "is_used" boolean NOT NULL DEFAULT false, "expired_at" bigint NOT NULL, "verified_at" bigint, CONSTRAINT "PK_91d17e75ac3182dba6701869b39" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "otp_verifications"`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_source_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddColumnIsReplacedOtpVerification1749030419440
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddColumnIsReplacedOtpVerification1749030419440';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" ADD "is_replaced" boolean NOT NULL DEFAULT false`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" DROP COLUMN "is_replaced"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddTableOtpVerifier1749043616622 implements MigrationInterface {
|
|
||||||
name = 'AddTableOtpVerifier1749043616622';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "otp_verifier" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "creator_id" character varying(36), "creator_name" character varying(125), "editor_id" character varying(36), "editor_name" character varying(125), "created_at" bigint NOT NULL, "updated_at" bigint NOT NULL, "name" character varying, "phone_number" character varying NOT NULL, CONSTRAINT "PK_884e2d0873fc589a1bdc477b2ea" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`DROP TABLE "otp_verifier"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,37 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class UpdateEnumOtpActionType1749046285398
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'UpdateEnumOtpActionType1749046285398';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TYPE "public"."otp_verifications_action_type_enum" RENAME TO "otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_action_type_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_action_type_enum_old" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum_old" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TYPE "public"."otp_verifications_action_type_enum_old" RENAME TO "otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,28 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class RescheduleOtp1749524993295 implements MigrationInterface {
|
|
||||||
name = 'RescheduleOtp1749524993295';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TABLE "reschedule_verification" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "phone_number" character varying NOT NULL, "booking_id" character varying NOT NULL, "reschedule_date" character varying NOT NULL, "code" integer NOT NULL, "tried" integer NOT NULL DEFAULT '0', "created_at" bigint NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000, "updated_at" bigint NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000, CONSTRAINT "PK_d4df453337ca12771eb223323d8" PRIMARY KEY ("id"))`,
|
|
||||||
);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "booking_verification" ALTER COLUMN "created_at" SET DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "booking_verification" ALTER COLUMN "updated_at" SET DEFAULT EXTRACT(EPOCH FROM NOW()) * 1000`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "booking_verification" ALTER COLUMN "updated_at" SET DEFAULT (EXTRACT(epoch FROM now()) * (1000))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "booking_verification" ALTER COLUMN "created_at" SET DEFAULT (EXTRACT(epoch FROM now()) * (1000))`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`DROP TABLE "reschedule_verification"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddBookingDescriptionToItem1749537252986
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddBookingDescriptionToItem1749537252986';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD "booking_description" text`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP COLUMN "booking_description"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,24 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddBookingParentToTransaction1749604239749
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddBookingParentToTransaction1749604239749';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "transactions" ADD "parent_id" uuid`);
|
|
||||||
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" ADD CONSTRAINT "FK_413e95171729ba18cabce1c31e3" FOREIGN KEY ("parent_id") REFERENCES "transactions"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP CONSTRAINT "FK_413e95171729ba18cabce1c31e3"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "transactions" DROP COLUMN "parent_id"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,55 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddEnumOtpActionTypeAndUpdateColumnOtpVerifier1750045520332
|
|
||||||
implements MigrationInterface
|
|
||||||
{
|
|
||||||
name = 'AddEnumOtpActionTypeAndUpdateColumnOtpVerifier1750045520332';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifier" ADD "is_all_action" boolean NOT NULL DEFAULT false`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifier_action_types_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION', 'ACTIVATE_ITEM', 'ACTIVATE_USER', 'UPDATE_ITEM_PRICE', 'UPDATE_ITEM_DETAILS', 'CONFIRM_TRANSACTION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifier" ADD "action_types" "public"."otp_verifier_action_types_enum" array`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TYPE "public"."otp_verifications_action_type_enum" RENAME TO "otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_action_type_enum" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION', 'ACTIVATE_ITEM', 'ACTIVATE_USER', 'UPDATE_ITEM_PRICE', 'UPDATE_ITEM_DETAILS', 'CONFIRM_TRANSACTION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."otp_verifications_action_type_enum_old" AS ENUM('CREATE_DISCOUNT', 'CANCEL_TRANSACTION', 'REJECT_RECONCILIATION')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifications" ALTER COLUMN "action_type" TYPE "public"."otp_verifications_action_type_enum_old" USING "action_type"::"text"::"public"."otp_verifications_action_type_enum_old"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TYPE "public"."otp_verifications_action_type_enum_old" RENAME TO "otp_verifications_action_type_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifier" DROP COLUMN "action_types"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`DROP TYPE "public"."otp_verifier_action_types_enum"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "otp_verifier" DROP COLUMN "is_all_action"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class AddUsageTypeToItem1750319148269 implements MigrationInterface {
|
|
||||||
name = 'AddUsageTypeToItem1750319148269';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."item_queues_usage_type_enum" AS ENUM('one_time', 'multiple')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" ADD "usage_type" "public"."item_queues_usage_type_enum" NOT NULL DEFAULT 'one_time'`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`CREATE TYPE "public"."items_usage_type_enum" AS ENUM('one_time', 'multiple')`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD "usage_type" "public"."items_usage_type_enum" NOT NULL DEFAULT 'one_time'`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(`ALTER TABLE "items" DROP COLUMN "usage_type"`);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."items_usage_type_enum"`);
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "item_queues" DROP COLUMN "usage_type"`,
|
|
||||||
);
|
|
||||||
await queryRunner.query(`DROP TYPE "public"."item_queues_usage_type_enum"`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
export class RemoveItemNameUnique1750834308368 implements MigrationInterface {
|
|
||||||
name = 'RemoveItemNameUnique1750834308368';
|
|
||||||
|
|
||||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" DROP CONSTRAINT "UQ_213736582899b3599acaade2cd1"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
||||||
await queryRunner.query(
|
|
||||||
`ALTER TABLE "items" ADD CONSTRAINT "UQ_213736582899b3599acaade2cd1" UNIQUE ("name")`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
|
|
||||||
|
|
||||||
import { ConfigModule } from '@nestjs/config';
|
|
||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { VerificationModel } from './data/models/verification.model';
|
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
|
||||||
import { BookingAuthenticationController } from './infrastructure/controllers/booking-authentication.controller';
|
|
||||||
import { VerificationService } from './data/services/verification.service';
|
|
||||||
import { JwtModule } from '@nestjs/jwt';
|
|
||||||
import { JWT_EXPIRED } from 'src/core/sessions/constants';
|
|
||||||
import { JWT_SECRET } from 'src/core/sessions/constants';
|
|
||||||
@Module({
|
|
||||||
imports: [
|
|
||||||
ConfigModule.forRoot(),
|
|
||||||
TypeOrmModule.forFeature([VerificationModel], CONNECTION_NAME.DEFAULT),
|
|
||||||
|
|
||||||
JwtModule.register({
|
|
||||||
secret: JWT_SECRET,
|
|
||||||
signOptions: { expiresIn: JWT_EXPIRED },
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
controllers: [BookingAuthenticationController],
|
|
||||||
providers: [VerificationService],
|
|
||||||
})
|
|
||||||
export class BookingOnlineAuthModule {}
|
|
|
@ -1,29 +0,0 @@
|
||||||
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
||||||
import { BookingVerification } from '../../domain/entities/booking-verification.entity';
|
|
||||||
@Entity('booking_verification')
|
|
||||||
export class VerificationModel implements BookingVerification {
|
|
||||||
@PrimaryGeneratedColumn('uuid')
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
name: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
phone_number: string;
|
|
||||||
|
|
||||||
@Column({ nullable: true })
|
|
||||||
code?: string;
|
|
||||||
|
|
||||||
@Column({ default: 0 })
|
|
||||||
tried: number;
|
|
||||||
|
|
||||||
@Column({ type: 'bigint', default: () => 'EXTRACT(EPOCH FROM NOW()) * 1000' })
|
|
||||||
created_at: number;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
type: 'bigint',
|
|
||||||
default: () => 'EXTRACT(EPOCH FROM NOW()) * 1000',
|
|
||||||
onUpdate: 'EXTRACT(EPOCH FROM NOW()) * 1000',
|
|
||||||
})
|
|
||||||
updated_at: number;
|
|
||||||
}
|
|
|
@ -1,110 +0,0 @@
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
|
||||||
import { Repository } from 'typeorm';
|
|
||||||
import { VerificationModel } from '../models/verification.model';
|
|
||||||
import { BookingVerification } from '../../domain/entities/booking-verification.entity';
|
|
||||||
import { UnprocessableEntityException } from '@nestjs/common';
|
|
||||||
import { JwtService } from '@nestjs/jwt';
|
|
||||||
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
|
|
||||||
export class VerificationService {
|
|
||||||
constructor(
|
|
||||||
@InjectRepository(VerificationModel)
|
|
||||||
private readonly verificationRepository: Repository<VerificationModel>,
|
|
||||||
private readonly jwtService: JwtService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
maxAttempts = 3;
|
|
||||||
expiredTime = 5 * 60 * 1000;
|
|
||||||
expiredTimeRegister = 1 * 60 * 1000;
|
|
||||||
|
|
||||||
async generateToken(payload: BookingVerification) {
|
|
||||||
return this.jwtService.sign({
|
|
||||||
phone_number: payload.phone_number,
|
|
||||||
name: payload.name,
|
|
||||||
created_at: payload.created_at,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async register(data: BookingVerification) {
|
|
||||||
const isProduction = process.env.NODE_ENV === 'true';
|
|
||||||
const currentTime = Math.floor(Date.now()); // current time in seconds
|
|
||||||
|
|
||||||
// Generate a 4 digit OTP code
|
|
||||||
const otpCode = Math.floor(1000 + Math.random() * 9000).toString();
|
|
||||||
|
|
||||||
let verification = await this.verificationRepository.findOne({
|
|
||||||
where: { phone_number: data.phone_number },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (
|
|
||||||
isProduction &&
|
|
||||||
verification.updated_at &&
|
|
||||||
currentTime - verification.updated_at < this.expiredTimeRegister
|
|
||||||
) {
|
|
||||||
throw new UnprocessableEntityException('Please try again in 1 minute');
|
|
||||||
}
|
|
||||||
|
|
||||||
data.code = otpCode;
|
|
||||||
data.tried = 0;
|
|
||||||
data.updated_at = currentTime;
|
|
||||||
|
|
||||||
if (verification) {
|
|
||||||
// Update existing record
|
|
||||||
verification = this.verificationRepository.merge(verification, data);
|
|
||||||
} else {
|
|
||||||
// Create new record
|
|
||||||
verification = this.verificationRepository.create(data);
|
|
||||||
}
|
|
||||||
const payload = await this.verificationRepository.save(verification);
|
|
||||||
|
|
||||||
const notificationService = new WhatsappService();
|
|
||||||
notificationService.sendOtpNotification({
|
|
||||||
phone: data.phone_number,
|
|
||||||
code: otpCode,
|
|
||||||
});
|
|
||||||
|
|
||||||
return payload;
|
|
||||||
}
|
|
||||||
|
|
||||||
async findByPhoneNumber(phoneNumber: string) {
|
|
||||||
return this.verificationRepository.findOne({
|
|
||||||
where: { phone_number: phoneNumber },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async verify(data: BookingVerification): Promise<BookingVerification> {
|
|
||||||
const verification = await this.findByPhoneNumber(data.phone_number);
|
|
||||||
if (!verification) {
|
|
||||||
throw new UnprocessableEntityException('Phone number not found');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (verification.tried >= this.maxAttempts) {
|
|
||||||
throw new UnprocessableEntityException(
|
|
||||||
'Too many attempts, please resend OTP Code',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (verification.code != data.code) {
|
|
||||||
verification.tried++;
|
|
||||||
await this.verificationRepository.save(verification);
|
|
||||||
throw new UnprocessableEntityException('Invalid verification code');
|
|
||||||
}
|
|
||||||
|
|
||||||
const currentTime = Math.floor(Date.now());
|
|
||||||
if (
|
|
||||||
verification.updated_at &&
|
|
||||||
currentTime - verification.updated_at > this.expiredTime
|
|
||||||
) {
|
|
||||||
throw new UnprocessableEntityException('Verification code expired');
|
|
||||||
}
|
|
||||||
|
|
||||||
return verification;
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id: string, data: BookingVerification) {
|
|
||||||
return this.verificationRepository.update(id, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete(id: string) {
|
|
||||||
return this.verificationRepository.delete(id);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
export interface BookingVerification {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
phone_number: string;
|
|
||||||
code?: string;
|
|
||||||
tried?: number;
|
|
||||||
created_at?: number;
|
|
||||||
updated_at?: number;
|
|
||||||
}
|
|
|
@ -1,43 +0,0 @@
|
||||||
import { Controller, Post, Body, Get, Param } from '@nestjs/common';
|
|
||||||
|
|
||||||
import {
|
|
||||||
BookingVerificationDto,
|
|
||||||
VerificationCodeDto,
|
|
||||||
} from '../dto/booking-verification.dto';
|
|
||||||
import { VerificationService } from '../../data/services/verification.service';
|
|
||||||
import { Public } from 'src/core/guards/domain/decorators/unprotected.guard';
|
|
||||||
import { ApiTags } from '@nestjs/swagger';
|
|
||||||
|
|
||||||
@ApiTags('Booking Authentication')
|
|
||||||
@Public()
|
|
||||||
@Controller('v1/booking-authentication')
|
|
||||||
export class BookingAuthenticationController {
|
|
||||||
constructor(
|
|
||||||
private readonly bookingAuthenticationService: VerificationService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Post('verify')
|
|
||||||
async verify(@Body() body: VerificationCodeDto) {
|
|
||||||
const verification = await this.bookingAuthenticationService.verify(body);
|
|
||||||
const token = await this.bookingAuthenticationService.generateToken(
|
|
||||||
verification,
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
message: `Verification successful for ${verification.phone_number}`,
|
|
||||||
token,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('register')
|
|
||||||
async register(@Body() body: BookingVerificationDto) {
|
|
||||||
const verification = await this.bookingAuthenticationService.register(body);
|
|
||||||
return {
|
|
||||||
message: `Verification code sent to ${verification.phone_number}`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get('get-by-phone/:phone_number')
|
|
||||||
async getByPhoneNumber(@Param('phone_number') phone_number: string) {
|
|
||||||
return this.bookingAuthenticationService.findByPhoneNumber(phone_number);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,67 +0,0 @@
|
||||||
import { BookingVerification } from '../../domain/entities/booking-verification.entity';
|
|
||||||
import { IsString, IsNotEmpty, Matches } from 'class-validator';
|
|
||||||
import { ApiProperty } from '@nestjs/swagger';
|
|
||||||
|
|
||||||
export class BookingVerificationDto implements BookingVerification {
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: 'John Doe',
|
|
||||||
description: 'Name of the person booking',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
name: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '628123456789',
|
|
||||||
description: 'Phone number containing only numeric characters',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
@Matches(/^\d+$/, {
|
|
||||||
message: 'phone_number must contain only numeric characters',
|
|
||||||
})
|
|
||||||
phone_number: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class VerificationCodeDto implements BookingVerification {
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: 'John Doe',
|
|
||||||
description: 'Name of the person booking',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
name: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '628123456789',
|
|
||||||
description: 'Phone number containing only numeric characters',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
@Matches(/^\d+$/, {
|
|
||||||
message: 'phone_number must contain only numeric characters',
|
|
||||||
})
|
|
||||||
phone_number: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '1234',
|
|
||||||
description: 'Verification code',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
code?: string;
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
export function generateOtp(digits = 4): number {
|
|
||||||
if (digits < 1) {
|
|
||||||
throw new Error('OTP digits must be at least 1');
|
|
||||||
}
|
|
||||||
const min = Math.pow(10, digits - 1);
|
|
||||||
const max = Math.pow(10, digits) - 1;
|
|
||||||
const otp = Math.floor(Math.random() * (max - min + 1)) + min;
|
|
||||||
return otp;
|
|
||||||
}
|
|
|
@ -1,36 +0,0 @@
|
||||||
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
||||||
import { RescheduleVerification } from '../../domain/entities/reschedule-verification.entity';
|
|
||||||
|
|
||||||
@Entity('reschedule_verification')
|
|
||||||
export class RescheduleVerificationModel implements RescheduleVerification {
|
|
||||||
@PrimaryGeneratedColumn('uuid')
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
name: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
phone_number: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
booking_id: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
reschedule_date: string;
|
|
||||||
|
|
||||||
@Column()
|
|
||||||
code: number;
|
|
||||||
|
|
||||||
@Column({ default: 0 })
|
|
||||||
tried: number;
|
|
||||||
|
|
||||||
@Column({ type: 'bigint', default: () => 'EXTRACT(EPOCH FROM NOW()) * 1000' })
|
|
||||||
created_at: number;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
type: 'bigint',
|
|
||||||
default: () => 'EXTRACT(EPOCH FROM NOW()) * 1000',
|
|
||||||
onUpdate: 'EXTRACT(EPOCH FROM NOW()) * 1000',
|
|
||||||
})
|
|
||||||
updated_at: number;
|
|
||||||
}
|
|
|
@ -1,16 +0,0 @@
|
||||||
export interface RescheduleVerification {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
phone_number: string;
|
|
||||||
booking_id: string;
|
|
||||||
reschedule_date: string;
|
|
||||||
code: number;
|
|
||||||
tried?: number;
|
|
||||||
created_at?: number;
|
|
||||||
updated_at?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface RescheduleRequest {
|
|
||||||
booking_id: string;
|
|
||||||
reschedule_date: string;
|
|
||||||
}
|
|
|
@ -1,67 +0,0 @@
|
||||||
import { Injectable } from '@nestjs/common';
|
|
||||||
import { RelationParam } from 'src/core/modules/domain/entities/base-filter.entity';
|
|
||||||
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
|
|
||||||
import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
|
|
||||||
import { IndexItemManager } from 'src/modules/item-related/item/domain/usecases/managers/index-item.manager';
|
|
||||||
import { SelectQueryBuilder } from 'typeorm';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class BookingItemManager extends IndexItemManager {
|
|
||||||
get relations(): RelationParam {
|
|
||||||
return {
|
|
||||||
// relation only join (for query purpose)
|
|
||||||
joinRelations: [],
|
|
||||||
|
|
||||||
// relation join and select (relasi yang ingin ditampilkan),
|
|
||||||
selectRelations: [
|
|
||||||
'item_category',
|
|
||||||
'bundling_items',
|
|
||||||
'tenant',
|
|
||||||
'time_group',
|
|
||||||
'item_rates',
|
|
||||||
],
|
|
||||||
|
|
||||||
// relation yang hanya ingin dihitung (akan return number)
|
|
||||||
countRelations: [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
get selects(): string[] {
|
|
||||||
const parent = super.selects;
|
|
||||||
return [
|
|
||||||
...parent,
|
|
||||||
`${this.tableName}.image_url`,
|
|
||||||
'item_rates.id',
|
|
||||||
'item_rates.price',
|
|
||||||
'item_rates.season_period_id',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
getResult(): PaginationResponse<ItemEntity> {
|
|
||||||
const result = super.getResult();
|
|
||||||
const { data, total } = result;
|
|
||||||
const hasRates = (this.filterParam.season_period_ids?.length ?? 0) > 0;
|
|
||||||
const items = data.map((item) => {
|
|
||||||
const currentRate = item.item_rates.find((rate) =>
|
|
||||||
this.filterParam.season_period_ids?.includes(rate.season_period_id),
|
|
||||||
);
|
|
||||||
const { item_rates, ...rest } = item;
|
|
||||||
const rate = currentRate?.['price'] ?? rest.base_price;
|
|
||||||
return {
|
|
||||||
...rest,
|
|
||||||
base_price: hasRates ? rate : rest.base_price,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
return { total, data: items };
|
|
||||||
}
|
|
||||||
|
|
||||||
setQueryFilter(
|
|
||||||
queryBuilder: SelectQueryBuilder<ItemEntity>,
|
|
||||||
): SelectQueryBuilder<ItemEntity> {
|
|
||||||
const query = super.setQueryFilter(queryBuilder);
|
|
||||||
|
|
||||||
query.andWhere(`${this.tableName}.status = 'active'`);
|
|
||||||
|
|
||||||
return query;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,64 +0,0 @@
|
||||||
import { HttpStatus } from '@nestjs/common';
|
|
||||||
import { UnprocessableEntityException } from '@nestjs/common';
|
|
||||||
import { STATUS } from 'src/core/strings/constants/base.constants';
|
|
||||||
import { TransactionType } from 'src/modules/transaction/transaction/constants';
|
|
||||||
import { CreateTransactionManager } from 'src/modules/transaction/transaction/domain/usecases/managers/create-transaction.manager';
|
|
||||||
import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper';
|
|
||||||
import { mappingRevertTransaction } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/mapping-transaction.helper';
|
|
||||||
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
|
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
|
||||||
|
|
||||||
export class CreateBookingManager extends CreateTransactionManager {
|
|
||||||
async beforeProcess(): Promise<void> {
|
|
||||||
mappingRevertTransaction(this.data, TransactionType.ONLINE);
|
|
||||||
|
|
||||||
const id = uuidv4();
|
|
||||||
const invoiceCode = await generateInvoiceCodeHelper(
|
|
||||||
this.dataService,
|
|
||||||
'BOOK',
|
|
||||||
);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { token, redirect_url } = await this.dataServiceFirstOpt.create({
|
|
||||||
...this.data,
|
|
||||||
id,
|
|
||||||
});
|
|
||||||
Object.assign(this.data, {
|
|
||||||
payment_midtrans_token: token,
|
|
||||||
payment_midtrans_url: redirect_url,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
console.log({ error });
|
|
||||||
throw new UnprocessableEntityException({
|
|
||||||
statusCode: HttpStatus.UNPROCESSABLE_ENTITY,
|
|
||||||
message: `Gagal! transaksi telah terbuat, silahkan periksa email untuk melanjutkan pembayaran`,
|
|
||||||
error: 'Unprocessable Entity',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Object.assign(this.data, {
|
|
||||||
id,
|
|
||||||
invoice_code: invoiceCode,
|
|
||||||
status: STATUS.PENDING,
|
|
||||||
invoice_date: new Date(),
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
async afterProcess(): Promise<void> {
|
|
||||||
const whatsapp = new WhatsappService();
|
|
||||||
console.log(`/snap/v4/redirection/${this.data.payment_midtrans_token}`);
|
|
||||||
console.log(this.data.payment_midtrans_url);
|
|
||||||
await whatsapp.bookingRegister(
|
|
||||||
{
|
|
||||||
phone: this.data.customer_phone,
|
|
||||||
code: this.data.invoice_code,
|
|
||||||
name: this.data.customer_name,
|
|
||||||
time: this.data.booking_date,
|
|
||||||
id: this.data.id,
|
|
||||||
},
|
|
||||||
this.data.payment_total,
|
|
||||||
`snap/v4/redirection/${this.data.payment_midtrans_token}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,115 +0,0 @@
|
||||||
import { Injectable, UnprocessableEntityException } from '@nestjs/common';
|
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
|
||||||
import { Repository } from 'typeorm';
|
|
||||||
import { RescheduleVerificationModel } from '../../../data/models/reschedule-verification.model';
|
|
||||||
import {
|
|
||||||
RescheduleRequest,
|
|
||||||
RescheduleVerification,
|
|
||||||
} from '../../entities/reschedule-verification.entity';
|
|
||||||
import { generateOtp } from 'src/modules/booking-online/helpers/generate-otp';
|
|
||||||
import { TransactionReadService } from 'src/modules/transaction/transaction/data/services/transaction-read.service';
|
|
||||||
import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
|
|
||||||
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class RescheduleVerificationManager {
|
|
||||||
constructor(
|
|
||||||
@InjectRepository(RescheduleVerificationModel)
|
|
||||||
private readonly rescheduleVerificationRepository: Repository<RescheduleVerificationModel>,
|
|
||||||
private readonly transactionService: TransactionReadService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async saveVerification(
|
|
||||||
request: RescheduleRequest,
|
|
||||||
): Promise<RescheduleVerificationModel> {
|
|
||||||
try {
|
|
||||||
const otp = generateOtp();
|
|
||||||
const transaction = await this.findDetailByBookingId(request.booking_id);
|
|
||||||
|
|
||||||
if (!transaction) {
|
|
||||||
throw new Error('Transaction not found for the provided booking id');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data: Partial<RescheduleVerification> = {
|
|
||||||
code: otp,
|
|
||||||
booking_id: transaction.id,
|
|
||||||
name: transaction.customer_name,
|
|
||||||
phone_number: transaction.customer_phone,
|
|
||||||
reschedule_date: request.reschedule_date,
|
|
||||||
};
|
|
||||||
|
|
||||||
const existTransaction =
|
|
||||||
await this.rescheduleVerificationRepository.findOne({
|
|
||||||
where: {
|
|
||||||
booking_id: transaction.id,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const verification =
|
|
||||||
existTransaction ?? this.rescheduleVerificationRepository.create(data);
|
|
||||||
const result = await this.rescheduleVerificationRepository.save({
|
|
||||||
...verification,
|
|
||||||
code: otp,
|
|
||||||
});
|
|
||||||
|
|
||||||
const whatsapp = new WhatsappService();
|
|
||||||
whatsapp.sendOtpNotification({
|
|
||||||
phone: transaction.customer_phone,
|
|
||||||
code: otp.toString(),
|
|
||||||
});
|
|
||||||
// whatsapp.bookingRescheduleOTP({
|
|
||||||
// phone: transaction.customer_phone,
|
|
||||||
// code: otp.toString(),
|
|
||||||
// name: transaction.customer_name,
|
|
||||||
// time: new Date(request.reschedule_date).getTime(),
|
|
||||||
// id: transaction.id,
|
|
||||||
// });
|
|
||||||
return result;
|
|
||||||
} catch (error) {
|
|
||||||
// You can customize the error handling as needed, e.g., throw HttpException for NestJS
|
|
||||||
throw new UnprocessableEntityException(
|
|
||||||
`Failed to save reschedule verification: ${error.message}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async verifyOtp(
|
|
||||||
booking_id: string,
|
|
||||||
code: number,
|
|
||||||
): Promise<RescheduleVerificationModel> {
|
|
||||||
const verification = await this.rescheduleVerificationRepository.findOne({
|
|
||||||
where: { booking_id, code },
|
|
||||||
order: { created_at: 'DESC' },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!verification) {
|
|
||||||
throw new UnprocessableEntityException({
|
|
||||||
success: false,
|
|
||||||
message: 'Verification code not match',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optionally, you can implement OTP expiration logic here
|
|
||||||
|
|
||||||
if (verification.code !== code) {
|
|
||||||
// Increment tried count
|
|
||||||
verification.tried = (verification.tried || 0) + 1;
|
|
||||||
await this.rescheduleVerificationRepository.save(verification);
|
|
||||||
throw new UnprocessableEntityException({
|
|
||||||
success: false,
|
|
||||||
message: 'Invalid verification code.',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optionally, you can mark the verification as used or verified here
|
|
||||||
|
|
||||||
return verification;
|
|
||||||
}
|
|
||||||
|
|
||||||
async findDetailByBookingId(bookingId: string): Promise<TransactionEntity> {
|
|
||||||
const transaction = await this.transactionService.getOneByOptions({
|
|
||||||
where: { id: bookingId },
|
|
||||||
});
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,90 +0,0 @@
|
||||||
import { Injectable, UnprocessableEntityException } from '@nestjs/common';
|
|
||||||
import { TransactionModel } from 'src/modules/transaction/transaction/data/models/transaction.model';
|
|
||||||
import { STATUS } from 'src/core/strings/constants/base.constants';
|
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
|
||||||
import { TransactionDataService } from 'src/modules/transaction/transaction/data/services/transaction-data.service';
|
|
||||||
import { generateInvoiceCodeHelper } from 'src/modules/transaction/transaction/domain/usecases/managers/helpers/generate-invoice-code.helper';
|
|
||||||
import * as moment from 'moment';
|
|
||||||
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
|
|
||||||
import { RescheduleVerificationModel } from '../../../data/models/reschedule-verification.model';
|
|
||||||
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class RescheduleManager {
|
|
||||||
constructor(private serviceData: TransactionDataService) {}
|
|
||||||
|
|
||||||
async reschedule(data: RescheduleVerificationModel) {
|
|
||||||
const transaction = await this.serviceData.getTransactionWithReschedule(
|
|
||||||
data.booking_id,
|
|
||||||
);
|
|
||||||
|
|
||||||
const rescheduleDate = moment(data.reschedule_date, 'DD-MM-YYYY');
|
|
||||||
|
|
||||||
const id = uuidv4();
|
|
||||||
const invoiceCode = await generateInvoiceCodeHelper(
|
|
||||||
this.serviceData,
|
|
||||||
'BOOK',
|
|
||||||
);
|
|
||||||
|
|
||||||
const items = this.makeItemZeroPrice(transaction.items);
|
|
||||||
const transactionData = this.makeTransactionZeroPrice(transaction);
|
|
||||||
|
|
||||||
Object.assign(transactionData, {
|
|
||||||
parent_id: transaction.id,
|
|
||||||
id,
|
|
||||||
invoice_code: invoiceCode,
|
|
||||||
status: STATUS.SETTLED,
|
|
||||||
invoice_date: rescheduleDate.format('YYYY-MM-DD'),
|
|
||||||
booking_date: rescheduleDate.format('YYYY-MM-DD'),
|
|
||||||
created_at: moment().unix() * 1000,
|
|
||||||
updated_at: moment().unix() * 1000,
|
|
||||||
items,
|
|
||||||
});
|
|
||||||
|
|
||||||
await this.serviceData.getRepository().save(transactionData);
|
|
||||||
|
|
||||||
const whatsapp = new WhatsappService();
|
|
||||||
whatsapp.rescheduleCreated({
|
|
||||||
id: transactionData.id,
|
|
||||||
name: transactionData.customer_name,
|
|
||||||
phone: transactionData.customer_phone,
|
|
||||||
time: moment(transactionData.invoice_date).unix() * 1000,
|
|
||||||
code: transactionData.invoice_code,
|
|
||||||
});
|
|
||||||
|
|
||||||
return transactionData;
|
|
||||||
}
|
|
||||||
|
|
||||||
private makeItemZeroPrice(items: TransactionItemModel[]) {
|
|
||||||
return items.map((item) => {
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
id: uuidv4(),
|
|
||||||
item_price: 0,
|
|
||||||
total_price: 0,
|
|
||||||
total_hpp: 0,
|
|
||||||
total_profit: 0,
|
|
||||||
total_profit_share: 0,
|
|
||||||
payment_total_dpp: 0,
|
|
||||||
payment_total_tax: 0,
|
|
||||||
total_net_price: 0,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private makeTransactionZeroPrice(transaction: TransactionModel) {
|
|
||||||
return {
|
|
||||||
...transaction,
|
|
||||||
payment_sub_total: 0,
|
|
||||||
payment_discount_total: 0,
|
|
||||||
payment_total: 0,
|
|
||||||
payment_total_pay: 0,
|
|
||||||
payment_total_share: 0,
|
|
||||||
payment_total_tax: 0,
|
|
||||||
payment_total_profit: 0,
|
|
||||||
payment_total_net_profit: 0,
|
|
||||||
payment_total_dpp: 0,
|
|
||||||
discount_percentage: 0,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,121 +0,0 @@
|
||||||
import { BaseStatusDto } from 'src/core/modules/infrastructure/dto/base-status.dto';
|
|
||||||
import { ApiProperty } from '@nestjs/swagger';
|
|
||||||
import {
|
|
||||||
IsArray,
|
|
||||||
IsNumber,
|
|
||||||
IsObject,
|
|
||||||
IsString,
|
|
||||||
ValidateIf,
|
|
||||||
} from 'class-validator';
|
|
||||||
import { SeasonPeriodEntity } from 'src/modules/season-related/season-period/domain/entities/season-period.entity';
|
|
||||||
import { TransactionItemEntity } from 'src/modules/transaction/transaction/domain/entities/transaction-item.entity';
|
|
||||||
import {
|
|
||||||
TransactionPaymentType,
|
|
||||||
TransactionUserType,
|
|
||||||
} from 'src/modules/transaction/transaction/constants';
|
|
||||||
|
|
||||||
export class TransactionDto extends BaseStatusDto {
|
|
||||||
@ApiProperty({
|
|
||||||
type: Object,
|
|
||||||
required: false,
|
|
||||||
example: {
|
|
||||||
id: 'uuid',
|
|
||||||
season_type: {
|
|
||||||
id: 'uuid',
|
|
||||||
name: 'high season',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
@IsObject()
|
|
||||||
@ValidateIf((body) => body.season_period)
|
|
||||||
season_period: SeasonPeriodEntity;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: TransactionUserType.GROUP,
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
customer_type: TransactionUserType;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: 'Andika',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
customer_name: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: false,
|
|
||||||
example: '0823...',
|
|
||||||
})
|
|
||||||
@ValidateIf((body) => body.customer_phone)
|
|
||||||
customer_phone: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: Date,
|
|
||||||
required: true,
|
|
||||||
example: '2024-01-01',
|
|
||||||
})
|
|
||||||
booking_date: Date;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: false,
|
|
||||||
example: TransactionPaymentType.MIDTRANS,
|
|
||||||
})
|
|
||||||
payment_type: TransactionPaymentType;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: Number,
|
|
||||||
required: true,
|
|
||||||
example: 7000000,
|
|
||||||
})
|
|
||||||
@IsNumber()
|
|
||||||
payment_sub_total: number;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: Number,
|
|
||||||
required: true,
|
|
||||||
example: 3500000,
|
|
||||||
})
|
|
||||||
@IsNumber()
|
|
||||||
payment_total: number;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: [Object],
|
|
||||||
required: true,
|
|
||||||
example: [
|
|
||||||
{
|
|
||||||
item: {
|
|
||||||
id: '68aa12f7-2cce-422b-9bae-185eb1343b94',
|
|
||||||
created_at: '1718876384378',
|
|
||||||
status: 'active',
|
|
||||||
name: 'tes',
|
|
||||||
item_type: 'bundling',
|
|
||||||
hpp: '100000',
|
|
||||||
base_price: '100000',
|
|
||||||
limit_type: 'no limit',
|
|
||||||
limit_value: 0,
|
|
||||||
item_category: {
|
|
||||||
id: 'ab15981a-a656-4efc-856c-b2abfbe30979',
|
|
||||||
name: 'Kategori Bundling 2',
|
|
||||||
},
|
|
||||||
bundling_items: [
|
|
||||||
{
|
|
||||||
id: 'bd5a7a38-df25-4203-a1cd-bf94867946b2',
|
|
||||||
name: 'Wahana 21 panjangggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
tenant: null,
|
|
||||||
},
|
|
||||||
qty: 40,
|
|
||||||
total_price: 4000000,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
@IsArray()
|
|
||||||
items: TransactionItemEntity[];
|
|
||||||
}
|
|
|
@ -1,47 +0,0 @@
|
||||||
import { IsString, Matches } from 'class-validator';
|
|
||||||
import { RescheduleRequest } from 'src/modules/booking-online/order/domain/entities/reschedule-verification.entity';
|
|
||||||
|
|
||||||
import { ApiProperty } from '@nestjs/swagger';
|
|
||||||
|
|
||||||
export class RescheduleRequestDTO implements RescheduleRequest {
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '123e4567-e89b-12d3-a456-426614174000',
|
|
||||||
description: 'The unique identifier of the booking',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
booking_id: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '25-12-2024',
|
|
||||||
description: 'The new date for rescheduling in the format DD-MM-YYYY',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@Matches(/^(0[1-9]|[12][0-9]|3[01])-(0[1-9]|1[0-2])-\d{4}$/, {
|
|
||||||
message: 'reschedule_date must be in the format DD-MM-YYYY',
|
|
||||||
})
|
|
||||||
reschedule_date: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class RescheduleVerificationOTP {
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '123e4567-e89b-12d3-a456-426614174000',
|
|
||||||
description: 'The unique identifier of the booking',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
booking_id: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
example: '123456',
|
|
||||||
description: 'The OTP code sent for verification',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
code: string;
|
|
||||||
}
|
|
|
@ -1,32 +0,0 @@
|
||||||
import { Controller, Get, Query } from '@nestjs/common';
|
|
||||||
import { ApiTags } from '@nestjs/swagger';
|
|
||||||
import { Public } from 'src/core/guards';
|
|
||||||
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
|
|
||||||
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
|
|
||||||
import { ItemReadService } from 'src/modules/item-related/item/data/services/item-read.service';
|
|
||||||
import { ItemEntity } from 'src/modules/item-related/item/domain/entities/item.entity';
|
|
||||||
import { FilterItemDto } from 'src/modules/item-related/item/infrastructure/dto/filter-item.dto';
|
|
||||||
import { BookingItemManager } from '../domain/usecases/managers/booking-item.manager';
|
|
||||||
|
|
||||||
@ApiTags('Booking Item')
|
|
||||||
@Controller('v1/booking-item')
|
|
||||||
@Public(true)
|
|
||||||
export class ItemController {
|
|
||||||
constructor(
|
|
||||||
private indexManager: BookingItemManager,
|
|
||||||
private serviceData: ItemReadService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
async index(
|
|
||||||
@Query() params: FilterItemDto,
|
|
||||||
): Promise<PaginationResponse<ItemEntity>> {
|
|
||||||
params.limit = 1000;
|
|
||||||
params.show_to_booking = true;
|
|
||||||
params.all_item = true;
|
|
||||||
this.indexManager.setFilterParam(params);
|
|
||||||
this.indexManager.setService(this.serviceData, TABLE_NAME.ITEM);
|
|
||||||
await this.indexManager.execute();
|
|
||||||
return this.indexManager.getResult();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,274 +0,0 @@
|
||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Get,
|
|
||||||
Param,
|
|
||||||
Post,
|
|
||||||
Res,
|
|
||||||
UnprocessableEntityException,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import { ApiTags } from '@nestjs/swagger';
|
|
||||||
import { Public } from 'src/core/guards';
|
|
||||||
import { TransactionDto } from './dto/booking-order.dto';
|
|
||||||
import { TransactionEntity } from 'src/modules/transaction/transaction/domain/entities/transaction.entity';
|
|
||||||
import { TransactionDataService } from 'src/modules/transaction/transaction/data/services/transaction-data.service';
|
|
||||||
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
|
|
||||||
import { MidtransService } from 'src/modules/configuration/midtrans/data/services/midtrans.service';
|
|
||||||
import { CreateBookingManager } from '../domain/usecases/managers/create-booking.manager';
|
|
||||||
import * as QRCode from 'qrcode';
|
|
||||||
import { Gate } from 'src/core/response/domain/decorators/pagination.response';
|
|
||||||
import { Response } from 'express';
|
|
||||||
import {
|
|
||||||
RescheduleRequestDTO,
|
|
||||||
RescheduleVerificationOTP,
|
|
||||||
} from './dto/reschedule.dto';
|
|
||||||
import { RescheduleVerificationManager } from '../domain/usecases/managers/reschedule-verification.manager';
|
|
||||||
import { RescheduleManager } from '../domain/usecases/managers/reschedule.manager';
|
|
||||||
import { STATUS } from 'src/core/strings/constants/base.constants';
|
|
||||||
import * as moment from 'moment';
|
|
||||||
import { WhatsappService } from 'src/services/whatsapp/whatsapp.service';
|
|
||||||
|
|
||||||
@ApiTags('Booking Order')
|
|
||||||
@Controller('v1/booking')
|
|
||||||
@Public(true)
|
|
||||||
export class BookingOrderController {
|
|
||||||
constructor(
|
|
||||||
private createBooking: CreateBookingManager,
|
|
||||||
private serviceData: TransactionDataService,
|
|
||||||
private midtransService: MidtransService,
|
|
||||||
private rescheduleVerification: RescheduleVerificationManager,
|
|
||||||
private rescheduleManager: RescheduleManager,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
@Post()
|
|
||||||
async create(@Body() data: TransactionDto) {
|
|
||||||
const payload: Partial<TransactionEntity> = data;
|
|
||||||
|
|
||||||
this.createBooking.setData(payload as any);
|
|
||||||
this.createBooking.setService(
|
|
||||||
this.serviceData,
|
|
||||||
TABLE_NAME.TRANSACTION,
|
|
||||||
this.midtransService,
|
|
||||||
);
|
|
||||||
await this.createBooking.execute();
|
|
||||||
const result = await this.createBooking.getResult();
|
|
||||||
const {
|
|
||||||
invoice_code,
|
|
||||||
status,
|
|
||||||
payment_midtrans_token,
|
|
||||||
payment_midtrans_url,
|
|
||||||
id,
|
|
||||||
} = result;
|
|
||||||
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
invoice_code,
|
|
||||||
status,
|
|
||||||
payment_midtrans_token,
|
|
||||||
payment_midtrans_url,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('reschedule')
|
|
||||||
async reschedule(@Body() data: RescheduleRequestDTO) {
|
|
||||||
const transaction = await this.serviceData.getTransactionWithReschedule(
|
|
||||||
data.booking_id,
|
|
||||||
);
|
|
||||||
|
|
||||||
const today = moment().startOf('day');
|
|
||||||
const rescheduleDate = moment(data.reschedule_date, 'DD-MM-YYYY');
|
|
||||||
const rescheduleDateStartOfDay = rescheduleDate.startOf('day');
|
|
||||||
|
|
||||||
//TODO: validate session period priority
|
|
||||||
|
|
||||||
if (rescheduleDateStartOfDay.isSameOrBefore(today)) {
|
|
||||||
throw new UnprocessableEntityException(
|
|
||||||
'Reschedule date must be in the future',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!transaction) {
|
|
||||||
throw new UnprocessableEntityException('Transaction not found');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (transaction.status !== STATUS.SETTLED) {
|
|
||||||
throw new UnprocessableEntityException('Transaction is not settled');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (transaction.children_transactions.length > 0) {
|
|
||||||
throw new UnprocessableEntityException('Transaction already rescheduled');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (transaction.parent_id) {
|
|
||||||
throw new UnprocessableEntityException('Transaction is a reschedule');
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await this.rescheduleVerification.saveVerification(data);
|
|
||||||
const maskedPhoneNumber = result.phone_number.replace(/.(?=.{4})/g, '*');
|
|
||||||
result.phone_number = maskedPhoneNumber;
|
|
||||||
|
|
||||||
return `Verification code sent to ${maskedPhoneNumber}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('reschedule/verification')
|
|
||||||
async verificationReschedule(@Body() data: RescheduleVerificationOTP) {
|
|
||||||
const result = await this.rescheduleVerification.verifyOtp(
|
|
||||||
data.booking_id,
|
|
||||||
+data.code,
|
|
||||||
);
|
|
||||||
|
|
||||||
const reschedule = await this.rescheduleManager.reschedule(result);
|
|
||||||
const transaction = await this.get(reschedule.id);
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: reschedule.id,
|
|
||||||
phone_number: result.phone_number,
|
|
||||||
name: result.name,
|
|
||||||
reschedule_date: result.reschedule_date,
|
|
||||||
transaction,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get(':id')
|
|
||||||
async get(@Param('id') transactionId: string) {
|
|
||||||
const data = await this.serviceData.getOneByOptions({
|
|
||||||
relations: [
|
|
||||||
'items',
|
|
||||||
'parent_transaction',
|
|
||||||
'items.item',
|
|
||||||
'items.item.time_group',
|
|
||||||
],
|
|
||||||
where: { id: transactionId },
|
|
||||||
});
|
|
||||||
|
|
||||||
const {
|
|
||||||
parent_id,
|
|
||||||
customer_name,
|
|
||||||
customer_phone,
|
|
||||||
booking_date,
|
|
||||||
invoice_code,
|
|
||||||
status,
|
|
||||||
id,
|
|
||||||
items,
|
|
||||||
parent_transaction,
|
|
||||||
} = data;
|
|
||||||
|
|
||||||
let timeGroup = null;
|
|
||||||
|
|
||||||
const usageItems = items.map((item) => {
|
|
||||||
const itemData = item.item;
|
|
||||||
if (itemData.time_group) {
|
|
||||||
const timeGroupData = itemData.time_group;
|
|
||||||
const {
|
|
||||||
id: groupId,
|
|
||||||
name,
|
|
||||||
start_time,
|
|
||||||
end_time,
|
|
||||||
max_usage_time,
|
|
||||||
} = timeGroupData;
|
|
||||||
timeGroup = {
|
|
||||||
id: groupId,
|
|
||||||
name,
|
|
||||||
start_time,
|
|
||||||
end_time,
|
|
||||||
max_usage_time,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
const {
|
|
||||||
id,
|
|
||||||
item_id,
|
|
||||||
item_name,
|
|
||||||
item_price,
|
|
||||||
item_category_name,
|
|
||||||
total_price,
|
|
||||||
total_net_price,
|
|
||||||
qty,
|
|
||||||
qty_remaining,
|
|
||||||
} = item;
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
item_id,
|
|
||||||
item_name,
|
|
||||||
item_price,
|
|
||||||
item_category_name,
|
|
||||||
total_price,
|
|
||||||
total_net_price,
|
|
||||||
qty,
|
|
||||||
qty_remaining,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
// Mask customer_phone with * and keep last 4 numbers
|
|
||||||
let maskedCustomerPhone = customer_phone;
|
|
||||||
if (typeof customer_phone === 'string' && customer_phone.length > 4) {
|
|
||||||
const last4 = customer_phone.slice(-4);
|
|
||||||
maskedCustomerPhone = '*'.repeat(customer_phone.length - 4) + last4;
|
|
||||||
}
|
|
||||||
|
|
||||||
let parentTransaction = undefined;
|
|
||||||
if (parent_transaction) {
|
|
||||||
const {
|
|
||||||
id: parentId,
|
|
||||||
invoice_code: parentInvoiceCode,
|
|
||||||
invoice_date: parentInvoiceDate,
|
|
||||||
} = parent_transaction;
|
|
||||||
parentTransaction = {
|
|
||||||
id: parentId,
|
|
||||||
invoice_code: parentInvoiceCode,
|
|
||||||
invoice_date: parentInvoiceDate,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
customer_name,
|
|
||||||
customer_phone: maskedCustomerPhone,
|
|
||||||
booking_date,
|
|
||||||
invoice_code,
|
|
||||||
status,
|
|
||||||
id,
|
|
||||||
is_reschedule: !!parent_id,
|
|
||||||
items: usageItems,
|
|
||||||
time_group: timeGroup,
|
|
||||||
parent: parentTransaction,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Gate()
|
|
||||||
@Get('qrcode/:id')
|
|
||||||
async getQRcode(@Param('id') id: string, @Res() res: Response) {
|
|
||||||
console.log(QRCode);
|
|
||||||
const qrData = id;
|
|
||||||
const data = await QRCode.toDataURL(qrData);
|
|
||||||
res.setHeader('Content-Type', 'image/png');
|
|
||||||
const base64Data = data.split(',')[1];
|
|
||||||
const buffer = Buffer.from(base64Data, 'base64');
|
|
||||||
res.send(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post('resend-notification/:id')
|
|
||||||
async resendNotification(@Param('id') id: string) {
|
|
||||||
try {
|
|
||||||
const transaction = await this.serviceData.getOneByOptions({
|
|
||||||
where: { id },
|
|
||||||
});
|
|
||||||
|
|
||||||
const whatsappService = new WhatsappService();
|
|
||||||
const formattedDate = moment(transaction.booking_date);
|
|
||||||
const payload = {
|
|
||||||
id: transaction.id,
|
|
||||||
phone: transaction.customer_phone,
|
|
||||||
code: transaction.invoice_code,
|
|
||||||
name: transaction.customer_name,
|
|
||||||
time: formattedDate.valueOf(),
|
|
||||||
};
|
|
||||||
await whatsappService.bookingCreated(payload);
|
|
||||||
return {
|
|
||||||
message: 'Notification sent successfully',
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
throw new UnprocessableEntityException({
|
|
||||||
message: 'Failed to send notification',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,38 +0,0 @@
|
||||||
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
|
|
||||||
|
|
||||||
import { ConfigModule } from '@nestjs/config';
|
|
||||||
import { Module } from '@nestjs/common';
|
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
|
||||||
import { ItemModel } from 'src/modules/item-related/item/data/models/item.model';
|
|
||||||
import { ItemModule } from 'src/modules/item-related/item/item.module';
|
|
||||||
import { ItemController } from './infrastructure/item.controller';
|
|
||||||
import { TransactionModule } from 'src/modules/transaction/transaction/transaction.module';
|
|
||||||
import { BookingOrderController } from './infrastructure/order.controller';
|
|
||||||
import { CreateBookingManager } from './domain/usecases/managers/create-booking.manager';
|
|
||||||
import { MidtransModule } from 'src/modules/configuration/midtrans/midtrans.module';
|
|
||||||
import { CqrsModule } from '@nestjs/cqrs';
|
|
||||||
import { RescheduleVerificationModel } from './data/models/reschedule-verification.model';
|
|
||||||
import { RescheduleVerificationManager } from './domain/usecases/managers/reschedule-verification.manager';
|
|
||||||
import { RescheduleManager } from './domain/usecases/managers/reschedule.manager';
|
|
||||||
import { BookingItemManager } from './domain/usecases/managers/booking-item.manager';
|
|
||||||
@Module({
|
|
||||||
imports: [
|
|
||||||
ConfigModule.forRoot(),
|
|
||||||
TypeOrmModule.forFeature(
|
|
||||||
[ItemModel, RescheduleVerificationModel],
|
|
||||||
CONNECTION_NAME.DEFAULT,
|
|
||||||
),
|
|
||||||
ItemModule,
|
|
||||||
TransactionModule,
|
|
||||||
MidtransModule,
|
|
||||||
CqrsModule,
|
|
||||||
],
|
|
||||||
controllers: [ItemController, BookingOrderController],
|
|
||||||
providers: [
|
|
||||||
CreateBookingManager,
|
|
||||||
RescheduleVerificationManager,
|
|
||||||
RescheduleManager,
|
|
||||||
BookingItemManager,
|
|
||||||
],
|
|
||||||
})
|
|
||||||
export class BookingOrderModule {}
|
|
|
@ -19,14 +19,10 @@ export class AuthAdminQueueOrchestrator {
|
||||||
return this.loginManager.getResult();
|
return this.loginManager.getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
async logout(userId?: string): Promise<any> {
|
async logout(id?: string): Promise<any> {
|
||||||
if (userId) this.logoutManager.setData({ user_id: userId });
|
if (id) this.logoutManager.setData({ id });
|
||||||
this.logoutManager.setService(this.serviceData, TABLE_NAME.USER);
|
this.logoutManager.setService(this.serviceData, TABLE_NAME.USER);
|
||||||
await this.logoutManager.execute();
|
await this.logoutManager.execute();
|
||||||
return this.logoutManager.getResult();
|
return this.logoutManager.getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
async forceLogout(token): Promise<any> {
|
|
||||||
return this.serviceData.forceLogout(token);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,8 +24,4 @@ export class AuthOrchestrator {
|
||||||
await this.logoutManager.execute();
|
await this.logoutManager.execute();
|
||||||
return this.logoutManager.getResult();
|
return this.logoutManager.getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
async forceLogout(token): Promise<any> {
|
|
||||||
return this.serviceData.forceLogout(token);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,9 +14,8 @@ import { UserModel } from 'src/modules/user-related/user/data/models/user.model'
|
||||||
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
||||||
import { In } from 'typeorm';
|
import { In } from 'typeorm';
|
||||||
import { UserRole } from 'src/modules/user-related/user/constants';
|
import { UserRole } from 'src/modules/user-related/user/constants';
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
import { LogUserType } from 'src/core/helpers/constant';
|
||||||
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
||||||
import { UserLoginEntity } from 'src/modules/user-related/user/domain/entities/user-login.entity';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
|
@ -63,24 +62,19 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const hasLoginAsQueue = this.userLogin?.user_login?.find(
|
if (this.userLogin.user_login) {
|
||||||
(item) => item.source === AppSource.QUEUE_ADMIN,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (hasLoginAsQueue && hasLoginAsQueue?.item_id !== this.data.item_id) {
|
|
||||||
throw new UnauthorizedException({
|
throw new UnauthorizedException({
|
||||||
statusCode: HttpStatus.UNAUTHORIZED,
|
statusCode: HttpStatus.UNAUTHORIZED,
|
||||||
message: `Akun anda sudah login di item "${hasLoginAsQueue?.item_name}"`,
|
message: `Akun anda sudah login di perangkat lain.`,
|
||||||
|
error: 'Unauthorized',
|
||||||
|
});
|
||||||
|
} else if (itemLogin) {
|
||||||
|
throw new UnauthorizedException({
|
||||||
|
statusCode: HttpStatus.UNAUTHORIZED,
|
||||||
|
message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
||||||
error: 'Unauthorized',
|
error: 'Unauthorized',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// else if (itemLogin && itemLogin.user_id !== this.userLogin.id) {
|
|
||||||
// throw new UnauthorizedException({
|
|
||||||
// statusCode: HttpStatus.UNAUTHORIZED,
|
|
||||||
// message: `"${userLoginItem.name}" masih login sebagai admin antrian `,
|
|
||||||
// error: 'Unauthorized',
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// * Disini untuk isi token
|
// * Disini untuk isi token
|
||||||
const tokenData = {
|
const tokenData = {
|
||||||
|
@ -91,28 +85,32 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
user_privilege_id: this.userLogin.user_privilege_id,
|
user_privilege_id: this.userLogin.user_privilege_id,
|
||||||
item_id: this.data.item_id,
|
item_id: this.data.item_id,
|
||||||
item_name: this.data.item_name,
|
item_name: this.data.item_name,
|
||||||
source: AppSource.QUEUE_ADMIN,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Logger.debug('Sign Token Admin Queue', 'LoginAdminQueueManager');
|
Logger.debug('Sign Token Admin Queue', 'LoginAdminQueueManager');
|
||||||
this.token = this.session.createAccessToken(tokenData);
|
this.token = this.session.createAccessToken(tokenData);
|
||||||
|
|
||||||
Logger.debug('Save Login Token', 'LoginManager');
|
Logger.debug('refreshToken Admin Queue', 'LoginAdminQueueManager');
|
||||||
const userLoginData: UserLoginEntity = {
|
const refreshToken = this.session.createAccessToken(tokenData);
|
||||||
user_id: this.userLogin.id,
|
|
||||||
login_token: this.token,
|
|
||||||
login_date: new Date().getTime(),
|
|
||||||
source: AppSource.QUEUE_ADMIN,
|
|
||||||
role: this.userLogin.role,
|
|
||||||
item_id: this.data.item_id,
|
|
||||||
item_name: this.data.item_name,
|
|
||||||
};
|
|
||||||
if (hasLoginAsQueue?.item_id === this.data.item_id) {
|
|
||||||
Object.assign(userLoginData, { id: hasLoginAsQueue.id });
|
|
||||||
}
|
|
||||||
// Update refresh token
|
|
||||||
await this.dataService.saveUserLogin(userLoginData);
|
|
||||||
|
|
||||||
|
Logger.debug('Update Refresh Token Admin Queue', 'LoginAdminQueueManager');
|
||||||
|
|
||||||
|
// Update refresh token
|
||||||
|
await this.dataService.update(
|
||||||
|
this.queryRunner,
|
||||||
|
this.entityTarget,
|
||||||
|
{ id: this.userLogin.id },
|
||||||
|
{
|
||||||
|
refresh_token: refreshToken,
|
||||||
|
user_login: {
|
||||||
|
user_id: this.userLogin.id,
|
||||||
|
login_token: this.token,
|
||||||
|
login_date: new Date().getTime(),
|
||||||
|
item_id: this.data.item_id,
|
||||||
|
item_name: this.data.item_name,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
await this.publishEvents();
|
await this.publishEvents();
|
||||||
|
|
||||||
Logger.debug('Process Login Admin Queue Done', 'LoginAdminQueueManager');
|
Logger.debug('Process Login Admin Queue Done', 'LoginAdminQueueManager');
|
||||||
|
@ -151,7 +149,6 @@ export class LoginAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
created_at: new Date().getTime(),
|
created_at: new Date().getTime(),
|
||||||
item_id: this.data.item_id,
|
item_id: this.data.item_id,
|
||||||
item_name: this.data.item_name,
|
item_name: this.data.item_name,
|
||||||
source: AppSource.QUEUE_ADMIN,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
import { LogUserType } from 'src/core/helpers/constant';
|
||||||
import { BaseCustomManager } from 'src/core/modules/domain/usecase/managers/base-custom.manager';
|
import { BaseCustomManager } from 'src/core/modules/domain/usecase/managers/base-custom.manager';
|
||||||
import { EventTopics } from 'src/core/strings/constants/interface.constants';
|
import { EventTopics } from 'src/core/strings/constants/interface.constants';
|
||||||
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
||||||
|
@ -17,17 +17,21 @@ export class LogoutAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
}
|
}
|
||||||
|
|
||||||
async process(): Promise<void> {
|
async process(): Promise<void> {
|
||||||
const id = this.data?.user_id ?? this.user.id;
|
const id = this.data?.id ?? this.user.id;
|
||||||
|
|
||||||
this.userLogin = await this.dataService.getOneByOptions({
|
this.userLogin = await this.dataService.getOneByOptions({
|
||||||
where: { id },
|
where: { id },
|
||||||
});
|
});
|
||||||
|
|
||||||
await this.dataService.removeUserLogin({
|
await this.dataService.update(
|
||||||
user_id: id,
|
this.queryRunner,
|
||||||
source: AppSource.QUEUE_ADMIN,
|
this.entityTarget,
|
||||||
});
|
{ id: this.userLogin.id },
|
||||||
|
{
|
||||||
|
refresh_token: null,
|
||||||
|
user_login: null,
|
||||||
|
},
|
||||||
|
);
|
||||||
await this.publishEvents();
|
await this.publishEvents();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +58,6 @@ export class LogoutAdminQueueManager extends BaseCustomManager<UserEntity> {
|
||||||
user_id: this.userLogin.id,
|
user_id: this.userLogin.id,
|
||||||
username: this.userLogin.name,
|
username: this.userLogin.name,
|
||||||
created_at: new Date().getTime(),
|
created_at: new Date().getTime(),
|
||||||
source: AppSource.QUEUE_ADMIN,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
@ -14,9 +14,8 @@ import { UserModel } from 'src/modules/user-related/user/data/models/user.model'
|
||||||
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
||||||
import { Not } from 'typeorm';
|
import { Not } from 'typeorm';
|
||||||
import { UserRole } from 'src/modules/user-related/user/constants';
|
import { UserRole } from 'src/modules/user-related/user/constants';
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
import { LogUserType } from 'src/core/helpers/constant';
|
||||||
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
||||||
import { UserLoginEntity } from 'src/modules/user-related/user/domain/entities/user-login.entity';
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class LoginManager extends BaseCustomManager<UserEntity> {
|
export class LoginManager extends BaseCustomManager<UserEntity> {
|
||||||
|
@ -63,25 +62,24 @@ export class LoginManager extends BaseCustomManager<UserEntity> {
|
||||||
username: this.userLogin.username,
|
username: this.userLogin.username,
|
||||||
role: this.userLogin.role,
|
role: this.userLogin.role,
|
||||||
user_privilege_id: this.userLogin.user_privilege_id,
|
user_privilege_id: this.userLogin.user_privilege_id,
|
||||||
source: AppSource.POS_ADMIN,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Logger.debug('Sign Token', 'LoginManager');
|
Logger.debug('Sign Token', 'LoginManager');
|
||||||
this.token = this.session.createAccessToken(tokenData);
|
this.token = this.session.createAccessToken(tokenData);
|
||||||
|
|
||||||
Logger.debug('Save Login Token', 'LoginManager');
|
Logger.debug('refreshToken', 'LoginManager');
|
||||||
const userLoginData: UserLoginEntity = {
|
const refreshToken = this.session.createAccessToken(tokenData);
|
||||||
user_id: this.userLogin.id,
|
|
||||||
login_token: this.token,
|
|
||||||
login_date: new Date().getTime(),
|
|
||||||
source: AppSource.POS_ADMIN,
|
|
||||||
role: this.userLogin.role,
|
|
||||||
item_id: null,
|
|
||||||
item_name: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
Logger.debug('Update Refresh Token', 'LoginManager');
|
||||||
// Update refresh token
|
// Update refresh token
|
||||||
await this.dataService.saveUserLogin(userLoginData);
|
await this.dataService.update(
|
||||||
|
this.queryRunner,
|
||||||
|
this.entityTarget,
|
||||||
|
{ id: this.userLogin.id },
|
||||||
|
{
|
||||||
|
refresh_token: refreshToken,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
await this.publishEvents();
|
await this.publishEvents();
|
||||||
Logger.debug('Process Login Done', 'LoginManager');
|
Logger.debug('Process Login Done', 'LoginManager');
|
||||||
|
@ -133,7 +131,6 @@ export class LoginManager extends BaseCustomManager<UserEntity> {
|
||||||
user_id: this.userLogin.id,
|
user_id: this.userLogin.id,
|
||||||
username: this.userLogin.username,
|
username: this.userLogin.username,
|
||||||
created_at: new Date().getTime(),
|
created_at: new Date().getTime(),
|
||||||
source: AppSource.POS_ADMIN,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { BaseCustomManager } from 'src/core/modules/domain/usecase/managers/base
|
||||||
import { EventTopics } from 'src/core/strings/constants/interface.constants';
|
import { EventTopics } from 'src/core/strings/constants/interface.constants';
|
||||||
import { UserModel } from 'src/modules/user-related/user/data/models/user.model';
|
import { UserModel } from 'src/modules/user-related/user/data/models/user.model';
|
||||||
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
import { UserEntity } from 'src/modules/user-related/user/domain/entities/user.entity';
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
import { LogUserType } from 'src/core/helpers/constant';
|
||||||
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
import { LogUserLoginEvent } from 'src/modules/configuration/log/domain/entities/log-user-login.event';
|
||||||
|
|
||||||
export class LogoutManager extends BaseCustomManager<UserEntity> {
|
export class LogoutManager extends BaseCustomManager<UserEntity> {
|
||||||
|
@ -15,11 +15,15 @@ export class LogoutManager extends BaseCustomManager<UserEntity> {
|
||||||
}
|
}
|
||||||
|
|
||||||
async process(): Promise<void> {
|
async process(): Promise<void> {
|
||||||
await this.dataService.removeUserLogin({
|
await this.dataService.update(
|
||||||
user_id: this.user.id,
|
this.queryRunner,
|
||||||
login_token: this.userProvider.token,
|
this.entityTarget,
|
||||||
source: AppSource.POS_ADMIN,
|
{ id: this.user.id },
|
||||||
});
|
{
|
||||||
|
refresh_token: null,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
await this.publishEvents();
|
await this.publishEvents();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +50,6 @@ export class LogoutManager extends BaseCustomManager<UserEntity> {
|
||||||
user_id: this.user.id,
|
user_id: this.user.id,
|
||||||
username: this.user.name,
|
username: this.user.name,
|
||||||
created_at: new Date().getTime(),
|
created_at: new Date().getTime(),
|
||||||
source: AppSource.POS_ADMIN,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Body, Controller, Delete, Param, Post, Put } from '@nestjs/common';
|
import { Body, Controller, Delete, Param, Post, Put } from '@nestjs/common';
|
||||||
import { ExcludePrivilege, Public } from 'src/core/guards';
|
import { ExcludePrivilege, Public } from 'src/core/guards';
|
||||||
import { ApiBearerAuth } from '@nestjs/swagger';
|
import { ApiBearerAuth } from '@nestjs/swagger';
|
||||||
import { ForceLogoutDto, LoginQueueDto } from './dto/login.dto';
|
import { LoginQueueDto } from './dto/login.dto';
|
||||||
import { AuthAdminQueueOrchestrator } from '../domain/auth-admin-queue.orchestrator';
|
import { AuthAdminQueueOrchestrator } from '../domain/auth-admin-queue.orchestrator';
|
||||||
|
|
||||||
@Controller('v1/auth/queue')
|
@Controller('v1/auth/queue')
|
||||||
|
@ -18,18 +18,12 @@ export class AuthAdminQueueController {
|
||||||
@Public(false)
|
@Public(false)
|
||||||
@ExcludePrivilege()
|
@ExcludePrivilege()
|
||||||
@Delete('logout')
|
@Delete('logout')
|
||||||
async logout() {
|
async logoout() {
|
||||||
return await this.orchestrator.logout();
|
return await this.orchestrator.logout();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put(':user_id/logout')
|
@Put(':id/logout')
|
||||||
async logoutQueueAdmin(@Param('user_id') userId: string) {
|
async logoutQueueAdmin(@Param('id') dataId: string) {
|
||||||
return await this.orchestrator.logout(userId);
|
return await this.orchestrator.logout(dataId);
|
||||||
}
|
|
||||||
|
|
||||||
@Post('force-logout')
|
|
||||||
@Public(true)
|
|
||||||
async forceLogout(@Body() body: ForceLogoutDto) {
|
|
||||||
return await this.orchestrator.forceLogout(body.token);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Body, Controller, Delete, Post } from '@nestjs/common';
|
||||||
import { ExcludePrivilege, Public } from 'src/core/guards';
|
import { ExcludePrivilege, Public } from 'src/core/guards';
|
||||||
import { AuthOrchestrator } from '../domain/auth.orchestrator';
|
import { AuthOrchestrator } from '../domain/auth.orchestrator';
|
||||||
import { ApiBearerAuth } from '@nestjs/swagger';
|
import { ApiBearerAuth } from '@nestjs/swagger';
|
||||||
import { ForceLogoutDto, LoginDto } from './dto/login.dto';
|
import { LoginDto } from './dto/login.dto';
|
||||||
|
|
||||||
@Controller('v1/auth')
|
@Controller('v1/auth')
|
||||||
export class AuthController {
|
export class AuthController {
|
||||||
|
@ -18,13 +18,7 @@ export class AuthController {
|
||||||
@Public(false)
|
@Public(false)
|
||||||
@ExcludePrivilege()
|
@ExcludePrivilege()
|
||||||
@Delete('logout')
|
@Delete('logout')
|
||||||
async logout() {
|
async logoout() {
|
||||||
return await this.orchestrator.logout();
|
return await this.orchestrator.logout();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('force-logout')
|
|
||||||
@Public(true)
|
|
||||||
async forceLogout(@Body() body: ForceLogoutDto) {
|
|
||||||
return await this.orchestrator.forceLogout(body.token);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,9 +29,3 @@ export class LoginQueueDto implements LoginRequest {
|
||||||
@IsString()
|
@IsString()
|
||||||
item_name: string;
|
item_name: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ForceLogoutDto {
|
|
||||||
@ApiProperty({ required: true })
|
|
||||||
@IsString()
|
|
||||||
token: string;
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,5 +3,4 @@ export const DatabaseListen = [
|
||||||
'vip_code',
|
'vip_code',
|
||||||
'pos_activity',
|
'pos_activity',
|
||||||
'pos_cash_activity',
|
'pos_cash_activity',
|
||||||
'time_groups',
|
|
||||||
];
|
];
|
||||||
|
|
|
@ -52,10 +52,6 @@ import { SeasonPeriodDataService } from 'src/modules/season-related/season-perio
|
||||||
import { SeasonPeriodModel } from 'src/modules/season-related/season-period/data/models/season-period.model';
|
import { SeasonPeriodModel } from 'src/modules/season-related/season-period/data/models/season-period.model';
|
||||||
import { TransactionDemographyModel } from 'src/modules/transaction/transaction/data/models/transaction-demography.model';
|
import { TransactionDemographyModel } from 'src/modules/transaction/transaction/data/models/transaction-demography.model';
|
||||||
import { UserLoginModel } from 'src/modules/user-related/user/data/models/user-login.model';
|
import { UserLoginModel } from 'src/modules/user-related/user/data/models/user-login.model';
|
||||||
import {
|
|
||||||
TimeGroupDeletedHandler,
|
|
||||||
TimeGroupUpdatedHandler,
|
|
||||||
} from './domain/managers/time-group.handle';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -87,10 +83,6 @@ import {
|
||||||
VipCodeCreatedHandler,
|
VipCodeCreatedHandler,
|
||||||
VipCategoryDeletedHandler,
|
VipCategoryDeletedHandler,
|
||||||
VipCategoryUpdatedHandler,
|
VipCategoryUpdatedHandler,
|
||||||
|
|
||||||
TimeGroupDeletedHandler,
|
|
||||||
TimeGroupUpdatedHandler,
|
|
||||||
|
|
||||||
SeasonPeriodDeletedHandler,
|
SeasonPeriodDeletedHandler,
|
||||||
SeasonPeriodUpdatedHandler,
|
SeasonPeriodUpdatedHandler,
|
||||||
ItemUpdatedHandler,
|
ItemUpdatedHandler,
|
||||||
|
|
|
@ -19,7 +19,6 @@ export class CouchService {
|
||||||
}
|
}
|
||||||
|
|
||||||
async onModuleInit() {
|
async onModuleInit() {
|
||||||
// return;
|
|
||||||
const nano = this.nanoInstance;
|
const nano = this.nanoInstance;
|
||||||
for (const database of DatabaseListen) {
|
for (const database of DatabaseListen) {
|
||||||
const db = nano.db.use(database);
|
const db = nano.db.use(database);
|
||||||
|
@ -96,75 +95,4 @@ export class CouchService {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async totalTodayTransactions(database = 'transaction') {
|
|
||||||
try {
|
|
||||||
const nano = this.nanoInstance;
|
|
||||||
const db = nano.use<any>(database);
|
|
||||||
|
|
||||||
// Get today's start timestamp (midnight)
|
|
||||||
const today = new Date();
|
|
||||||
today.setHours(0, 0, 0, 0);
|
|
||||||
const todayTimestamp = today.getTime();
|
|
||||||
|
|
||||||
// Query for documents created today
|
|
||||||
const selector = {
|
|
||||||
created_at: {
|
|
||||||
$gte: todayTimestamp,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const result = await db.find({
|
|
||||||
selector: selector,
|
|
||||||
fields: ['_id', 'payment_total_pay'],
|
|
||||||
limit: 10000,
|
|
||||||
});
|
|
||||||
|
|
||||||
return result.docs.reduce(
|
|
||||||
(sum, doc) => sum + (doc.payment_total_pay || 0),
|
|
||||||
0,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
apm.captureError(error);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getUnixTimestampLast7Days() {
|
|
||||||
const date = new Date();
|
|
||||||
date.setDate(date.getDate() - 4);
|
|
||||||
date.setHours(0, 0, 0, 0);
|
|
||||||
return date.getTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async clearTransactions() {
|
|
||||||
const nano = this.nanoInstance;
|
|
||||||
const transaction = nano.use('transaction');
|
|
||||||
|
|
||||||
const expiredDate = this.getUnixTimestampLast7Days();
|
|
||||||
|
|
||||||
const selectorPayment = {
|
|
||||||
created_at: {
|
|
||||||
$lt: expiredDate,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const transactions = await transaction.find({
|
|
||||||
selector: selectorPayment,
|
|
||||||
fields: ['_id', '_rev'],
|
|
||||||
limit: 100000,
|
|
||||||
});
|
|
||||||
|
|
||||||
const { docs } = transactions;
|
|
||||||
console.log(docs.length);
|
|
||||||
const deletedDocs = {
|
|
||||||
docs: docs.map((doc) => ({
|
|
||||||
_id: doc._id,
|
|
||||||
_rev: doc._rev,
|
|
||||||
_deleted: true,
|
|
||||||
})),
|
|
||||||
};
|
|
||||||
await transaction.bulk(deletedDocs);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,9 @@ export class ChangeStatusBookingHandler
|
||||||
},
|
},
|
||||||
relations: ['items', 'items.bundling_items'],
|
relations: ['items', 'items.bundling_items'],
|
||||||
});
|
});
|
||||||
|
console.log('change status', { dataID, couchData, booking });
|
||||||
mappingTransaction(booking);
|
mappingTransaction(booking);
|
||||||
|
console.log('after mapping');
|
||||||
|
|
||||||
if (!couchData) {
|
if (!couchData) {
|
||||||
console.log('save data to couch');
|
console.log('save data to couch');
|
||||||
|
|
|
@ -44,12 +44,10 @@ export class ItemUpdatedHandler
|
||||||
'item_category',
|
'item_category',
|
||||||
'bundling_items',
|
'bundling_items',
|
||||||
'bundling_items.item_category',
|
'bundling_items.item_category',
|
||||||
'bundling_items.time_group',
|
|
||||||
'item_rates',
|
'item_rates',
|
||||||
'item_rates.item',
|
'item_rates.item',
|
||||||
'item_rates.season_period',
|
'item_rates.season_period',
|
||||||
'item_rates.season_period.season_type',
|
'item_rates.season_period.season_type',
|
||||||
'time_group',
|
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -107,12 +105,10 @@ export class ItemPriceUpdatedHandler
|
||||||
'item_category',
|
'item_category',
|
||||||
'bundling_items',
|
'bundling_items',
|
||||||
'bundling_items.item_category',
|
'bundling_items.item_category',
|
||||||
'bundling_items.time_group',
|
|
||||||
'item_rates',
|
'item_rates',
|
||||||
'item_rates.item',
|
'item_rates.item',
|
||||||
'item_rates.season_period',
|
'item_rates.season_period',
|
||||||
'item_rates.season_period.season_type',
|
'item_rates.season_period.season_type',
|
||||||
'time_group',
|
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -150,12 +146,10 @@ export class ItemRateUpdatedHandler
|
||||||
'item_category',
|
'item_category',
|
||||||
'bundling_items',
|
'bundling_items',
|
||||||
'bundling_items.item_category',
|
'bundling_items.item_category',
|
||||||
'bundling_items.time_group',
|
|
||||||
'item_rates',
|
'item_rates',
|
||||||
'item_rates.item',
|
'item_rates.item',
|
||||||
'item_rates.season_period',
|
'item_rates.season_period',
|
||||||
'item_rates.season_period.season_type',
|
'item_rates.season_period.season_type',
|
||||||
'time_group',
|
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
|
|
||||||
import { CouchService } from '../../data/services/couch.service';
|
|
||||||
import { STATUS } from 'src/core/strings/constants/base.constants';
|
|
||||||
import { TimeGroupDeletedEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-deleted.event';
|
|
||||||
import { TimeGroupChangeStatusEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-change-status.event';
|
|
||||||
import { TimeGroupUpdatedEvent } from 'src/modules/item-related/time-group/domain/entities/event/time-group-updated.event';
|
|
||||||
|
|
||||||
@EventsHandler(TimeGroupDeletedEvent)
|
|
||||||
export class TimeGroupDeletedHandler
|
|
||||||
implements IEventHandler<TimeGroupDeletedEvent>
|
|
||||||
{
|
|
||||||
constructor(private couchService: CouchService) {}
|
|
||||||
|
|
||||||
async handle(event: TimeGroupDeletedEvent) {
|
|
||||||
const data = await this.couchService.deleteDoc(
|
|
||||||
{
|
|
||||||
_id: event.data.id,
|
|
||||||
...event.data.data,
|
|
||||||
},
|
|
||||||
'time_groups',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventsHandler(TimeGroupChangeStatusEvent, TimeGroupUpdatedEvent)
|
|
||||||
export class TimeGroupUpdatedHandler
|
|
||||||
implements IEventHandler<TimeGroupChangeStatusEvent>
|
|
||||||
{
|
|
||||||
constructor(private couchService: CouchService) {}
|
|
||||||
|
|
||||||
async handle(event: TimeGroupChangeStatusEvent) {
|
|
||||||
const dataOld = event.data.old;
|
|
||||||
const data = event.data.data;
|
|
||||||
|
|
||||||
// change status to active
|
|
||||||
if (dataOld?.status != data.status && data.status == STATUS.ACTIVE) {
|
|
||||||
await this.couchService.createDoc(
|
|
||||||
{
|
|
||||||
_id: data.id,
|
|
||||||
...data,
|
|
||||||
},
|
|
||||||
'time_groups',
|
|
||||||
);
|
|
||||||
} else if (dataOld?.status != data.status) {
|
|
||||||
await this.couchService.deleteDoc(
|
|
||||||
{
|
|
||||||
_id: data.id,
|
|
||||||
...data,
|
|
||||||
},
|
|
||||||
'time_groups',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// update
|
|
||||||
else {
|
|
||||||
await this.couchService.updateDoc(
|
|
||||||
{
|
|
||||||
_id: data.id,
|
|
||||||
...data,
|
|
||||||
},
|
|
||||||
'time_groups',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -5,17 +5,13 @@ import { Public } from 'src/core/guards';
|
||||||
import * as Nano from 'nano';
|
import * as Nano from 'nano';
|
||||||
import { CreateUserPrivilegeDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/create-user-privilege.dto';
|
import { CreateUserPrivilegeDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/create-user-privilege.dto';
|
||||||
import { ConfigService } from '@nestjs/config';
|
import { ConfigService } from '@nestjs/config';
|
||||||
import { CouchService } from '../data/services/couch.service';
|
|
||||||
|
|
||||||
@ApiTags(`couch`)
|
@ApiTags(`couch`)
|
||||||
@Controller('v1/couch')
|
@Controller('v1/couch')
|
||||||
@Public()
|
@Public()
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class CouchDataController {
|
export class CouchDataController {
|
||||||
constructor(
|
constructor(private configService: ConfigService) {}
|
||||||
private configService: ConfigService,
|
|
||||||
private couchService: CouchService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
get nanoInstance() {
|
get nanoInstance() {
|
||||||
const couchConfiguration = this.configService.get<string>('COUCHDB_CONFIG');
|
const couchConfiguration = this.configService.get<string>('COUCHDB_CONFIG');
|
||||||
|
@ -68,11 +64,4 @@ export class CouchDataController {
|
||||||
// return people.get();
|
// return people.get();
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Public(true)
|
|
||||||
@Get('clear-transactions')
|
|
||||||
async clearTransactions(): Promise<string> {
|
|
||||||
await this.couchService.clearTransactions();
|
|
||||||
return 'OK';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
|
import { CONNECTION_NAME } from 'src/core/strings/constants/base.constants';
|
||||||
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
|
import { TransactionItemModel } from 'src/modules/transaction/transaction/data/models/transaction-item.model';
|
||||||
import { TransactionTaxModel } from 'src/modules/transaction/transaction/data/models/transaction-tax.model';
|
import { TransactionTaxModel } from 'src/modules/transaction/transaction/data/models/transaction-tax.model';
|
||||||
import { CouchModule } from 'src/modules/configuration/couch/couch.module';
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
ConfigModule.forRoot(),
|
ConfigModule.forRoot(),
|
||||||
|
@ -19,7 +19,6 @@ import { CouchModule } from 'src/modules/configuration/couch/couch.module';
|
||||||
CONNECTION_NAME.DEFAULT,
|
CONNECTION_NAME.DEFAULT,
|
||||||
),
|
),
|
||||||
CqrsModule,
|
CqrsModule,
|
||||||
CouchModule,
|
|
||||||
],
|
],
|
||||||
controllers: [GoogleCalendarController],
|
controllers: [GoogleCalendarController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { Column, Entity } from 'typeorm';
|
||||||
import { BaseCoreModel } from 'src/core/modules/data/model/base-core.model';
|
import { BaseCoreModel } from 'src/core/modules/data/model/base-core.model';
|
||||||
import { LogUserLoginEntity } from '../../domain/entities/log-user-login.entity';
|
import { LogUserLoginEntity } from '../../domain/entities/log-user-login.entity';
|
||||||
import { UserRole } from '../../../../user-related/user/constants';
|
import { UserRole } from '../../../../user-related/user/constants';
|
||||||
import { AppSource, LogUserType } from 'src/core/helpers/constant';
|
import { LogUserType } from 'src/core/helpers/constant';
|
||||||
|
|
||||||
@Entity(TABLE_NAME.LOG_USER_LOGIN)
|
@Entity(TABLE_NAME.LOG_USER_LOGIN)
|
||||||
export class LogUserLoginModel
|
export class LogUserLoginModel
|
||||||
|
@ -31,7 +31,4 @@ export class LogUserLoginModel
|
||||||
|
|
||||||
@Column({ type: 'bigint', nullable: true })
|
@Column({ type: 'bigint', nullable: true })
|
||||||
created_at: number;
|
created_at: number;
|
||||||
|
|
||||||
@Column({ type: 'enum', enum: AppSource, nullable: true })
|
|
||||||
source: AppSource;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { TransactionDataService } from 'src/modules/transaction/transaction/data
|
||||||
import { PaymentTransactionHandler } from './domain/handlers/payment-transaction.handler';
|
import { PaymentTransactionHandler } from './domain/handlers/payment-transaction.handler';
|
||||||
import { MailTemplateController } from './infrastructure/mail.controller';
|
import { MailTemplateController } from './infrastructure/mail.controller';
|
||||||
import { PdfMakeManager } from '../export/domain/managers/pdf-make.manager';
|
import { PdfMakeManager } from '../export/domain/managers/pdf-make.manager';
|
||||||
import { CouchModule } from '../couch/couch.module';
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
ConfigModule.forRoot(),
|
ConfigModule.forRoot(),
|
||||||
|
@ -19,7 +19,6 @@ import { CouchModule } from '../couch/couch.module';
|
||||||
CONNECTION_NAME.DEFAULT,
|
CONNECTION_NAME.DEFAULT,
|
||||||
),
|
),
|
||||||
CqrsModule,
|
CqrsModule,
|
||||||
CouchModule,
|
|
||||||
],
|
],
|
||||||
controllers: [MailTemplateController],
|
controllers: [MailTemplateController],
|
||||||
providers: [
|
providers: [
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
|
|
||||||
import {
|
|
||||||
OTP_ACTION_TYPE,
|
|
||||||
OTP_SOURCE,
|
|
||||||
OtpVerificationEntity,
|
|
||||||
} from '../../domain/entities/otp-verification.entity';
|
|
||||||
import { Column, Entity } from 'typeorm';
|
|
||||||
import { BaseModel } from 'src/core/modules/data/model/base.model';
|
|
||||||
|
|
||||||
@Entity(TABLE_NAME.OTP_VERIFICATIONS)
|
|
||||||
export class OtpVerificationModel
|
|
||||||
extends BaseModel<OtpVerificationEntity>
|
|
||||||
implements OtpVerificationEntity
|
|
||||||
{
|
|
||||||
@Column({ type: 'varchar', nullable: false })
|
|
||||||
otp_code: string;
|
|
||||||
|
|
||||||
@Column({ type: 'enum', enum: OTP_ACTION_TYPE })
|
|
||||||
action_type: OTP_ACTION_TYPE;
|
|
||||||
|
|
||||||
@Column({ type: 'varchar', nullable: true })
|
|
||||||
target_id: string;
|
|
||||||
|
|
||||||
@Column({ type: 'varchar', nullable: true })
|
|
||||||
reference: string;
|
|
||||||
|
|
||||||
@Column({ type: 'enum', enum: OTP_SOURCE })
|
|
||||||
source: OTP_SOURCE;
|
|
||||||
|
|
||||||
@Column({ default: false })
|
|
||||||
is_used: boolean;
|
|
||||||
|
|
||||||
@Column({ default: false })
|
|
||||||
is_replaced: boolean;
|
|
||||||
|
|
||||||
@Column({ type: 'bigint', nullable: false })
|
|
||||||
expired_at: number; // UNIX timestamp
|
|
||||||
|
|
||||||
@Column({ type: 'bigint', nullable: true })
|
|
||||||
verified_at: number; // UNIX timestamp or null
|
|
||||||
}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue