geek-custom-api-core 0.0.63 → 0.0.65

package/.history/{package_20260310213944.json → package_20260413113743.json}

@@ -1,6 +1,6 @@
 {
     "name": "geek-custom-api-core",
-    "version": "0.0.58",
+    "version": "0.0.64",
     "description": "",
     "author": "",
     "license": "UNLICENSED",
@@ -24,6 +24,7 @@
         "@nestjs/common": "^10.3.9",
         "@nestjs/config": "^3.2.2",
         "@nestjs/core": "^10.3.9",
+        "@nestjs/event-emitter": "^2.1.1",
         "@nestjs/jwt": "^10.1.0",
         "@nestjs/mapped-types": "^2.0.2",
         "@nestjs/passport": "^10.0.0",
@@ -53,7 +54,7 @@
     "devDependencies": {
         "@nestjs/cli": "^10.0.0",
         "@nestjs/schematics": "^9.0.0",
-        "@nestjs/testing": "^11.1.14",
+        "@nestjs/testing": "^10.4.22",
         "@types/bcrypt": "^5.0.0",
         "@types/express": "^4.17.13",
         "@types/jest": "^29.5.0",
@@ -90,6 +91,9 @@
         "transform": {
             "^.+\\.(t|j)s$": "ts-jest"
         },
+        "moduleNameMapper": {
+            "^src/(.*)$": "<rootDir>/$1"
+        },
         "collectCoverageFrom": [
             "**/*.(t|j)s"
         ],

package/.history/{package_20260310215253.json → package_20260413113744.json}

@@ -1,6 +1,6 @@
 {
     "name": "geek-custom-api-core",
-    "version": "0.0.59",
+    "version": "0.0.64",
     "description": "",
     "author": "",
     "license": "UNLICENSED",
@@ -24,6 +24,7 @@
         "@nestjs/common": "^10.3.9",
         "@nestjs/config": "^3.2.2",
         "@nestjs/core": "^10.3.9",
+        "@nestjs/event-emitter": "^2.1.1",
         "@nestjs/jwt": "^10.1.0",
         "@nestjs/mapped-types": "^2.0.2",
         "@nestjs/passport": "^10.0.0",
@@ -53,7 +54,7 @@
     "devDependencies": {
         "@nestjs/cli": "^10.0.0",
         "@nestjs/schematics": "^9.0.0",
-        "@nestjs/testing": "^11.1.14",
+        "@nestjs/testing": "^10.4.22",
         "@types/bcrypt": "^5.0.0",
         "@types/express": "^4.17.13",
         "@types/jest": "^29.5.0",
@@ -90,6 +91,9 @@
         "transform": {
             "^.+\\.(t|j)s$": "ts-jest"
         },
+        "moduleNameMapper": {
+            "^src/(.*)$": "<rootDir>/$1"
+        },
         "collectCoverageFrom": [
             "**/*.(t|j)s"
         ],

package/.history/package_20260417115917.json

@@ -0,0 +1,103 @@
+{
+    "name": "geek-custom-api-core",
+    "version": "0.0.65",
+    "description": "",
+    "author": "",
+    "license": "UNLICENSED",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "engines": {
+        "node": ">=22.0.0"
+    },
+    "scripts": {
+        "build": "nest build",
+        "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+        "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
+        "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+        "start": "nest start",
+        "yalc": "npm run build && yalc publish"
+    },
+    "dependencies": {
+        "@aws-sdk/client-s3": "^3.400.0",
+        "@aws-sdk/client-secrets-manager": "^3.939.0",
+        "@nestjs/axios": "^3.0.2",
+        "@nestjs/common": "^10.3.9",
+        "@nestjs/config": "^3.2.2",
+        "@nestjs/core": "^10.3.9",
+        "@nestjs/event-emitter": "^2.1.1",
+        "@nestjs/jwt": "^10.1.0",
+        "@nestjs/mapped-types": "^2.0.2",
+        "@nestjs/passport": "^10.0.0",
+        "@nestjs/platform-express": "^10.3.9",
+        "@nestjs/schedule": "^6.1.1",
+        "@nestjs/swagger": "^7.4.2",
+        "@nestjs/typeorm": "^10.0.0",
+        "axios": "^1.4.0",
+        "bcrypt": "^5.1.0",
+        "class-transformer": "^0.5.1",
+        "class-validator": "^0.14.0",
+        "date-fns": "^2.30.0",
+        "dayjs": "^1.11.10",
+        "fast-xml-parser": "^4.3.6",
+        "ioredis": "^5.4.1",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.46",
+        "multer-s3": "^3.0.1",
+        "mysql2": "^3.6.0",
+        "passport-jwt": "^4.0.1",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.8.1",
+        "typeorm": "^0.3.17",
+        "uuid": "^9.0.1",
+        "xlsx": "^0.18.5"
+    },
+    "devDependencies": {
+        "@nestjs/cli": "^10.0.0",
+        "@nestjs/schematics": "^9.0.0",
+        "@nestjs/testing": "^10.4.22",
+        "@types/bcrypt": "^5.0.0",
+        "@types/express": "^4.17.13",
+        "@types/jest": "^29.5.0",
+        "@types/multer": "^2.0.0",
+        "@types/node": "^22.0.0",
+        "@types/passport-jwt": "^3.0.9",
+        "@types/supertest": "^2.0.12",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.0.0",
+        "jest": "^29.7.0",
+        "prettier": "^3.2.5",
+        "source-map-support": "^0.5.21",
+        "supertest": "^7.1.3",
+        "ts-jest": "^29.1.2",
+        "ts-loader": "^9.5.1",
+        "ts-node": "^10.9.2",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.3.3",
+        "webpack": "^5.90.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-node-externals": "^3.0.0"
+    },
+    "jest": {
+        "moduleFileExtensions": [
+            "js",
+            "json",
+            "ts"
+        ],
+        "rootDir": "src",
+        "testRegex": ".*\\.spec\\.ts$",
+        "transform": {
+            "^.+\\.(t|j)s$": "ts-jest"
+        },
+        "moduleNameMapper": {
+            "^src/(.*)$": "<rootDir>/$1"
+        },
+        "collectCoverageFrom": [
+            "**/*.(t|j)s"
+        ],
+        "coverageDirectory": "../coverage",
+        "testEnvironment": "node"
+    }
+}

package/dist/api/app/comment/entity/comment.entity.d.ts

@@ -7,5 +7,6 @@ export declare class Comment extends CommonEntity {
     contentSno: number;
     memberId: string;
     memberNo: number;
+    attachment: string;
     comment: string;
 }

package/dist/api/app/comment/entity/comment.entity.js

@@ -59,6 +59,12 @@ __decorate([
     (0, class_transformer_1.Exclude)({ toClassOnly: true }),
     __metadata("design:type", Number)
 ], Comment.prototype, "memberNo", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({ description: '첨부파일', required: false }),
+    __metadata("design:type", String)
+], Comment.prototype, "attachment", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, class_validator_1.IsString)(),

package/dist/api/app/comment/entity/comment.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"comment.entity.js","sourceRoot":"","sources":["../../../../../src/api/app/comment/entity/comment.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAA4C;AAC5C,qDAMyB;AACzB,2EAA+D;AAC/D,uDAAoD;AACpD,qCAAyC;AAGlC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,4BAAY;CAuCxC,CAAA;AAvCY,0BAAO;AAKlB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtD,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;2CACZ;AAMnB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;0CAC1C;AAKlB;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,wBAAM,EAAC,mBAAY,CAAC;IACpB,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAChC;AAK1B;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACxC;AAMnB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChE,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;yCACd;AAMjB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,gCAAc,GAAE;IAChB,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxD,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;yCACd;AAKjB;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACnC;kBAtCL,OAAO;IADnB,IAAA,gBAAM,EAAC,YAAY,CAAC;GACR,OAAO,CAuCnB"}
+{"version":3,"file":"comment.entity.js","sourceRoot":"","sources":["../../../../../src/api/app/comment/entity/comment.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAA4C;AAC5C,qDAMyB;AACzB,2EAA+D;AAC/D,uDAAoD;AACpD,qCAAyC;AAGlC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,4BAAY;CA4CxC,CAAA;AA5CY,0BAAO;AAKhB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtD,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;2CACZ;AAMnB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;0CAC1C;AAKlB;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,wBAAM,EAAC,mBAAY,CAAC;IACpB,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAChC;AAK1B;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACxC;AAMnB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChE,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;yCACd;AAMjB;IAJC,IAAA,gBAAM,GAAE;IACR,IAAA,gCAAc,GAAE;IAChB,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxD,IAAA,2BAAO,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;;yCACd;AAKjB;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;2CACnC;AAKnB;IAHC,IAAA,gBAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACnC;kBA3CP,OAAO;IADnB,IAAA,gBAAM,EAAC,YAAY,CAAC;GACR,OAAO,CA4CnB"}

package/dist/api/app/deposit/deposit.batch.service.d.ts

@@ -1,4 +1,6 @@
 import { DefaultService } from 'src/common/service/default.service';
 export declare class DepositBatchService extends DefaultService {
-    handleDepositExpiration(): Promise<void>;
+    handleDepositExpiration(): Promise<{
+        expiredCount: any;
+    }>;
 }

package/dist/api/app/deposit/deposit.batch.service.js

@@ -15,22 +15,75 @@ const default_service_1 = require("../../../common/service/default.service");
 const depositJobDetail_entity_1 = require("./entity/depositJobDetail.entity");
 const enum_1 = require("../../../common/enum/enum");
 const common_1 = require("@nestjs/common");
+const depositManager_entity_1 = require("./entity/depositManager.entity");
 let DepositBatchService = class DepositBatchService extends default_service_1.DefaultService {
     async handleDepositExpiration() {
         const entityManager = await this.getEntityManager();
-        try {
-            const result = await entityManager
+        return await entityManager.transaction(async (manager) => {
+            const expiredTargets = await manager.query(`
+                SELECT
+                    jd.sno,
+                    jd.partnerSno,
+                    jd.memberNo,
+                    jd.memberId,
+                    jd.memberName,
+                    jd.expiredDt,
+                    (jd.depositAmount - IFNULL(usedSub.netUsed, 0)) AS remainAmount
+                FROM gs_depositJobDetail jd
+                LEFT JOIN (
+                    SELECT
+                        issueDetailSno,
+                        SUM(usedDepositAmount - refundAmount) AS netUsed
+                    FROM gs_depositOrderDetail
+                    GROUP BY issueDetailSno
+                ) usedSub ON jd.sno = usedSub.issueDetailSno
+                WHERE jd.expireFl = ?
+                  AND jd.expiredDt IS NOT NULL
+                  AND jd.expiredDt < NOW()
+                FOR UPDATE
+                `, [enum_1.YN.N]);
+            if (!expiredTargets.length) {
+                return { expiredCount: 0 };
+            }
+            for (const target of expiredTargets) {
+                const remainAmount = Number(target.remainAmount || 0);
+                if (remainAmount <= 0) {
+                    continue;
+                }
+                const [lastLedger] = await manager.query(`
+                    SELECT balanceAfter
+                    FROM gs_depositManager
+                    WHERE partnerSno = ? AND memberNo = ?
+                    ORDER BY sno DESC
+                    LIMIT 1
+                    FOR UPDATE
+                    `, [target.partnerSno, target.memberNo]);
+                const prevBalance = Number((lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) || 0);
+                await manager.save(depositManager_entity_1.DepositManager, {
+                    partnerSno: Number(target.partnerSno),
+                    memberNo: Number(target.memberNo),
+                    memberId: target.memberId,
+                    memberName: target.memberName,
+                    depositType: enum_1.DEPOSIT_TYPE.EXPIRED,
+                    source: enum_1.DEPOSIT_SOURCE.SYSTEM,
+                    managerSno: 0,
+                    refType: enum_1.DEPOSIT_REF_TYPE.JOB_DETAIL,
+                    refSno: Number(target.sno),
+                    depositAmount: -remainAmount,
+                    balanceAfter: prevBalance - remainAmount,
+                    reason: `예치금 만료 (지급건:${target.sno})`,
+                });
+            }
+            await manager
                 .createQueryBuilder()
                 .update(depositJobDetail_entity_1.DepositJobDetail)
                 .set({ expireFl: enum_1.YN.Y })
-                .where('expireFl = :expireFl', { expireFl: enum_1.YN.N })
-                .andWhere('expiredDt IS NOT NULL')
-                .andWhere('expiredDt < NOW()')
+                .where('sno IN (:...snos)', {
+                snos: expiredTargets.map((target) => Number(target.sno)),
+            })
                 .execute();
-        }
-        catch (error) {
-            throw error;
-        }
+            return { expiredCount: expiredTargets.length };
+        });
     }
 };
 exports.DepositBatchService = DepositBatchService;

package/dist/api/app/deposit/deposit.batch.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.batch.service.js","sourceRoot":"","sources":["../../../../src/api/app/deposit/deposit.batch.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwD;AACxD,6EAAoE;AACpE,8EAAoE;AACpE,oDAA0C;AAC1C,2CAA4C;AAGrC,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,gCAAc;IAE7C,AAAN,KAAK,CAAC,uBAAuB;QACzB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEpD,IAAI,CAAC;YAGD,MAAM,MAAM,GAAG,MAAM,aAAa;iBAC7B,kBAAkB,EAAE;iBACpB,MAAM,CAAC,0CAAgB,CAAC;iBACxB,GAAG,CAAC,EAAE,QAAQ,EAAE,SAAE,CAAC,CAAC,EAAE,CAAC;iBACvB,KAAK,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,SAAE,CAAC,CAAC,EAAE,CAAC;iBACjD,QAAQ,CAAC,uBAAuB,CAAC;iBACjC,QAAQ,CAAC,mBAAmB,CAAC;iBAC7B,OAAO,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ,CAAA;AApBY,kDAAmB;AAEtB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,gBAAgB,CAAC;;;;kEAkBrC;8BAnBQ,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CAoB/B"}
+{"version":3,"file":"deposit.batch.service.js","sourceRoot":"","sources":["../../../../src/api/app/deposit/deposit.batch.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwD;AACxD,6EAAoE;AACpE,8EAAoE;AACpE,oDAK8B;AAC9B,2CAA4C;AAC5C,0EAAgE;AAGzD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,gCAAc;IAE7C,AAAN,KAAK,CAAC,uBAAuB;QACzB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEpD,OAAO,MAAM,aAAa,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACrD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAK,CACtC;;;;;;;;;;;;;;;;;;;;;iBAqBC,EACD,CAAC,SAAE,CAAC,CAAC,CAAC,CACT,CAAC;YAEF,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;gBACzB,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;YAC/B,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;gBAClC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;gBACtD,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;oBACpB,SAAS;gBACb,CAAC;gBAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,CACpC;;;;;;;qBAOC,EACD,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,CACvC,CAAC;gBAEF,MAAM,WAAW,GAAG,MAAM,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,KAAI,CAAC,CAAC,CAAC;gBAE1D,MAAM,OAAO,CAAC,IAAI,CAAC,sCAAc,EAAE;oBAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;oBACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;oBACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,WAAW,EAAE,mBAAY,CAAC,OAAO;oBACjC,MAAM,EAAE,qBAAc,CAAC,MAAM;oBAC7B,UAAU,EAAE,CAAC;oBACb,OAAO,EAAE,uBAAgB,CAAC,UAAU;oBACpC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;oBAC1B,aAAa,EAAE,CAAC,YAAY;oBAC5B,YAAY,EAAE,WAAW,GAAG,YAAY;oBACxC,MAAM,EAAE,eAAe,MAAM,CAAC,GAAG,GAAG;iBACvC,CAAC,CAAC;YACP,CAAC;YAED,MAAM,OAAO;iBACR,kBAAkB,EAAE;iBACpB,MAAM,CAAC,0CAAgB,CAAC;iBACxB,GAAG,CAAC,EAAE,QAAQ,EAAE,SAAE,CAAC,CAAC,EAAE,CAAC;iBACvB,KAAK,CAAC,mBAAmB,EAAE;gBACxB,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAC3D,CAAC;iBACD,OAAO,EAAE,CAAC;YAEf,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AApFY,kDAAmB;AAEtB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,gBAAgB,CAAC;;;;kEAkFrC;8BAnFQ,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CAoF/B"}

package/dist/api/app/deposit/deposit.controller.d.ts

@@ -37,6 +37,10 @@ export declare class DepositController {
         rescode: string;
         message: string;
     }>;
+    syncDepositOrderPaymentStatus(orderInfo: any): Promise<{
+        rescode: string;
+        message: string;
+    }>;
     refundDepositOrder(orderInfo: any[]): Promise<{
         rescode: string;
         message: string;

package/dist/api/app/deposit/deposit.controller.js

@@ -47,6 +47,10 @@ let DepositController = class DepositController {
         console.log(JSON.stringify(orderInfo, null, 2));
         return this.depositService.confirmDepositOrder(orderInfo);
     }
+    async syncDepositOrderPaymentStatus(orderInfo) {
+        console.log(JSON.stringify(orderInfo, null, 2));
+        return this.depositService.syncDepositOrderPaymentStatus(orderInfo);
+    }
     async refundDepositOrder(orderInfo) {
         console.log(JSON.stringify(orderInfo, null, 2));
         const targetStatus = [
@@ -287,6 +291,13 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], DepositController.prototype, "confirmDepositOrder", null);
+__decorate([
+    (0, common_1.Post)('/webhook/deposit/order/create'),
+    __param(0, (0, common_1.Body)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], DepositController.prototype, "syncDepositOrderPaymentStatus", null);
 __decorate([
     (0, common_1.Post)('/webhook/deposit/order/refund'),
     (0, swagger_1.ApiOperation)({

package/dist/api/app/deposit/deposit.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.controller.js","sourceRoot":"","sources":["../../../../src/api/app/deposit/deposit.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deposit.controller.js","sourceRoot":"","sources":["../../../../src/api/app/deposit/deposit.controller.ts"],"names":[],"mappings":"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"}

package/dist/api/app/deposit/deposit.service.d.ts

@@ -21,6 +21,12 @@ export declare class DepositService extends DefaultService {
     private readonly logger;
     constructor(partnerService: PartnerService, moduleRef: ModuleRef);
     private hasCashReceiptRequest;
+    private isPaymentDone;
+    private resolveOrderNo;
+    private resolveMemberId;
+    private resolveMemberName;
+    private getNextCashReceiptIssueStatus;
+    private updateDepositOrderPaymentState;
     issueSingle(list: DepositIssueDto[], managerSno: number, partnerSno: number): Promise<any[]>;
     private executeFifoDeduct;
     private processIssue;
@@ -150,4 +156,8 @@ export declare class DepositService extends DefaultService {
         rescode: string;
         message: string;
     }>;
+    syncDepositOrderPaymentStatus(orderInfo: any): Promise<{
+        rescode: string;
+        message: string;
+    }>;
 }

package/dist/api/app/deposit/deposit.service.js

@@ -82,6 +82,37 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
             return false;
         }
     }
+    isPaymentDone(orderInfo) {
+        var _a;
+        return ((_a = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.pay) === null || _a === void 0 ? void 0 : _a.payStatusType) === 'DONE';
+    }
+    resolveOrderNo(orderInfo) {
+        var _a;
+        return ((_a = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.order) === null || _a === void 0 ? void 0 : _a.orderNo) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.orderNo);
+    }
+    resolveMemberId(orderInfo, fallback) {
+        var _a;
+        return ((_a = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.order) === null || _a === void 0 ? void 0 : _a.memberId) || fallback;
+    }
+    resolveMemberName(orderInfo, fallback) {
+        var _a;
+        return ((_a = orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.order) === null || _a === void 0 ? void 0 : _a.ordererName) || fallback;
+    }
+    getNextCashReceiptIssueStatus(depositOrder, orderInfo) {
+        return depositOrder.usedAmount > 0 &&
+            this.isPaymentDone(orderInfo) &&
+            this.hasCashReceiptRequest(orderInfo)
+            ? enum_1.CASH_RECEIPT_ISSUE_STATUS.READY
+            : enum_1.CASH_RECEIPT_ISSUE_STATUS.NONE;
+    }
+    async updateDepositOrderPaymentState(manager, depositOrder, orderInfo) {
+        await manager.update(depositOrder_entity_1.DepositOrder, depositOrder.sno, {
+            orderStatus: this.isPaymentDone(orderInfo) ? 'DONE' : 'PENDING',
+            memberId: this.resolveMemberId(orderInfo, depositOrder.memberId),
+            memberName: this.resolveMemberName(orderInfo, depositOrder.memberName),
+            cashReceiptIssueStatus: this.getNextCashReceiptIssueStatus(depositOrder, orderInfo),
+        });
+    }
     async issueSingle(list, managerSno, partnerSno) {
         const partner = await this.partnerService.findOne(partnerSno);
         const entityManager = await this.getEntityManager();
@@ -663,49 +694,61 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
     }
     async getDepositManagerMemberList(dto) {
         const entityManager = await this.getEntityManager();
-        const qb = entityManager
-            .createQueryBuilder(depositJobDetail_entity_1.DepositJobDetail, 'jd')
-            .select(['memberNo', 'memberId', 'memberName'])
-            .addSelect(`
-      SUM(
-        jd.depositAmount - IFNULL(od.usedAmount, 0)
-      )
-      `, 'remainBalance')
-            .leftJoin((qb) => qb
-            .select('od.issueDetailSno', 'issueDetailSno')
-            .addSelect('SUM(od.usedDepositAmount - od.refundAmount)', 'usedAmount')
-            .from(depositOrderDetail_entity_1.DepositOrderDetail, 'od')
-            .groupBy('od.issueDetailSno'), 'od', 'jd.sno = od.issueDetailSno')
-            .where('jd.partnerSno = :partnerSno', {
-            partnerSno: dto.partnerSno,
-        })
-            .andWhere('jd.expireFl = :expireFl', { expireFl: 'n' })
-            .andWhere('(jd.expiredDt IS NULL OR jd.expiredDt >= NOW())');
-        if (dto.searchType) {
-            qb.andWhere(`jd.${dto.searchType} LIKE :searchValue`, {
-                searchValue: `%${dto.searchValue}%`,
-            });
-        }
-        qb.groupBy('jd.memberNo');
-        qb.orderBy('jd.memberNo', 'DESC');
-        qb.offset(dto.skip);
-        qb.limit(dto.take);
-        const list = await qb.getRawMany();
-        const countQb = entityManager
-            .createQueryBuilder(depositJobDetail_entity_1.DepositJobDetail, 'jd')
-            .select('COUNT(DISTINCT jd.memberNo)', 'cnt')
-            .where('jd.partnerSno = :partnerSno', {
-            partnerSno: dto.partnerSno,
-        })
-            .andWhere('jd.expireFl = :expireFl', { expireFl: 'n' })
-            .andWhere('(jd.expiredDt IS NULL OR jd.expiredDt >= NOW())');
-        if (dto.searchType) {
-            countQb.andWhere(`jd.${dto.searchType} LIKE :searchValue`, {
-                searchValue: `%${dto.searchValue}%`,
-            });
-        }
-        const count = await countQb.getRawOne();
-        const data = [list, count.cnt];
+        const searchClause = dto.searchType
+            ? ` AND dm.${dto.searchType} LIKE ?`
+            : '';
+        const searchParams = dto.searchType ? [`%${dto.searchValue}%`] : [];
+        const list = await entityManager.query(`
+            SELECT
+              members.memberNo,
+              members.memberId,
+              members.memberName,
+              COALESCE(balance.remainBalance, 0) AS remainBalance
+            FROM (
+              SELECT
+                dm.memberNo,
+                MAX(dm.memberId) AS memberId,
+                MAX(dm.memberName) AS memberName
+              FROM gs_depositManager dm
+              WHERE dm.partnerSno = ?${searchClause}
+              GROUP BY dm.memberNo
+            ) members
+            LEFT JOIN (
+              SELECT
+                jd.memberNo,
+                SUM(jd.depositAmount - IFNULL(od.usedAmount, 0)) AS remainBalance
+              FROM gs_depositJobDetail jd
+              LEFT JOIN (
+                SELECT
+                  od.issueDetailSno,
+                  SUM(od.usedDepositAmount - od.refundAmount) AS usedAmount
+                FROM gs_depositOrderDetail od
+                GROUP BY od.issueDetailSno
+              ) od ON jd.sno = od.issueDetailSno
+              WHERE jd.partnerSno = ?
+                AND jd.expireFl = 'N'
+                AND (jd.expiredDt IS NULL OR jd.expiredDt >= NOW())
+              GROUP BY jd.memberNo
+            ) balance ON balance.memberNo = members.memberNo
+            ORDER BY members.memberNo DESC
+            LIMIT ? OFFSET ?
+            `, [
+            dto.partnerSno,
+            ...searchParams,
+            dto.partnerSno,
+            dto.take,
+            dto.skip,
+        ]);
+        const [countRow] = await entityManager.query(`
+            SELECT COUNT(*) AS cnt
+            FROM (
+              SELECT dm.memberNo
+              FROM gs_depositManager dm
+              WHERE dm.partnerSno = ?${searchClause}
+              GROUP BY dm.memberNo
+            ) members
+            `, [dto.partnerSno, ...searchParams]);
+        const data = [list, Number((countRow === null || countRow === void 0 ? void 0 : countRow.cnt) || 0)];
         return (0, gsUtil_1.paginateResponse)(data, dto.page, dto.take);
     }
     async getDepositManagerMemberDetail(memberNo, partnerSno) {
@@ -920,7 +963,7 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
         const depositOrder = await entityManager.findOne(depositOrder_entity_1.DepositOrder, {
             where: { orderNo: orderNo },
         });
-        if (!depositOrder || depositOrder.orderStatus !== 'PENDING') {
+        if (!depositOrder) {
             throw new common_1.HttpException('유효하지 않거나 이미 처리된 예약 건입니다.', common_1.HttpStatus.BAD_REQUEST);
         }
         const targetOrderSno = depositOrder.sno;
@@ -928,6 +971,16 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
         const targetMemberNo = depositOrder.memberNo;
         return await entityManager.transaction(async (manager) => {
             var _a;
+            const existingOrderDetails = await manager.find(depositOrderDetail_entity_1.DepositOrderDetail, {
+                where: { orderSno: targetOrderSno },
+            });
+            if (existingOrderDetails.length > 0) {
+                await this.updateDepositOrderPaymentState(manager, depositOrder, orderInfo);
+                return { rescode: '0000', message: 'SUCCESS' };
+            }
+            if (depositOrder.orderStatus !== 'PENDING') {
+                throw new common_1.HttpException('유효하지 않거나 이미 처리된 예약 건입니다.', common_1.HttpStatus.BAD_REQUEST);
+            }
             const availableIssues = await manager.query(`
         SELECT 
             jd.sno AS issueDetailSno,
@@ -1022,16 +1075,7 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
             if (orderDetails.length > 0) {
                 await manager.save(depositOrderDetail_entity_1.DepositOrderDetail, orderDetails);
             }
-            await manager.update(depositOrder_entity_1.DepositOrder, targetOrderSno, {
-                orderStatus: 'DONE',
-                memberId: orderInfo.order.memberId || depositOrder.memberId,
-                memberName: orderInfo.order.ordererName || depositOrder.memberName,
-                cashReceiptIssueStatus: depositOrder.usedAmount > 0 &&
-                    orderInfo.pay.payStatusType === 'DONE' &&
-                    this.hasCashReceiptRequest(orderInfo)
-                    ? enum_1.CASH_RECEIPT_ISSUE_STATUS.READY
-                    : enum_1.CASH_RECEIPT_ISSUE_STATUS.NONE,
-            });
+            await this.updateDepositOrderPaymentState(manager, depositOrder, orderInfo);
             const [lastLedger] = await manager.query(`SELECT balanceAfter FROM gs_depositManager WHERE partnerSno = ? AND memberNo = ? ORDER BY sno DESC LIMIT 1 FOR UPDATE`, [targetPartnerSno, targetMemberNo]);
             const prevBalance = Number((lastLedger === null || lastLedger === void 0 ? void 0 : lastLedger.balanceAfter) || 0);
             await manager.save(depositManager_entity_1.DepositManager, {
@@ -1154,6 +1198,9 @@ let DepositService = DepositService_1 = class DepositService extends default_ser
             return { rescode: '0000', message: 'SUCCESS' };
         });
     }
+    async syncDepositOrderPaymentStatus(orderInfo) {
+        return this.confirmDepositOrder(orderInfo);
+    }
 };
 exports.DepositService = DepositService;
 exports.DepositService = DepositService = DepositService_1 = __decorate([