@chevre/domain 21.2.0-alpha.28 → 21.2.0-alpha.29

package/lib/chevre/repo/transaction.d.ts

@@ -40,6 +40,8 @@ export declare class MongoRepository {
     findById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
+        inclusion?: string[];
+        exclusion?: string[];
     }): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する

package/lib/chevre/repo/transaction.js

@@ -273,10 +273,29 @@ class MongoRepository {
      */
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
             })
+                .select(projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);

package/lib/chevre/service/payment/any.js

@@ -52,10 +52,18 @@ exports.voidPayTransaction = voidPayTransaction;
 function invalidatePaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
+        if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
+            throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
+        }
         const transaction = yield repos.transaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         });
+        // 確定取引に対応(2023-05-03~)
+        if (transaction.status === factory.transactionStatusType.Confirmed) {
+            // no op
+            return;
+        }
         const paymentMethodIdByPaymentUrl = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
         const paymentMethodType = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.typeOf;
         if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0
@@ -70,12 +78,10 @@ function invalidatePaymentUrl(params) {
                         ? transaction.seller.name
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
-                    // project: transaction.seller.project
                 },
                 recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-                        // tslint:disable-next-line:max-line-length
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
                         paymentMethod: {
                             additionalProperty: [],
@@ -103,10 +109,11 @@ function processVoidPayTransaction(params) {
             transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         }
         else {
-            transaction = yield repos.transaction.findById({
+            transaction = (yield repos.transaction.findById({
                 typeOf: params.purpose.typeOf,
-                id: params.purpose.id
-            });
+                id: params.purpose.id,
+                inclusion: ['id', 'typeOf', 'status']
+            }));
         }
         // 承認アクションを取得
         let authorizeActions;
@@ -122,7 +129,7 @@ function processVoidPayTransaction(params) {
             const authorizeActionsOnTransaction = yield repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
-                    typeOf: factory.transactionType.PlaceOrder,
+                    typeOf: transaction.typeOf,
                     id: transaction.id
                 }
             });
@@ -131,12 +138,20 @@ function processVoidPayTransaction(params) {
                 return ((_a = a.object) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
                     && ((_b = a.instrument) === null || _b === void 0 ? void 0 : _b.identifier) === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
             });
+            switch (transaction.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
+                // 確定取引に対応(2023-05-03~)
+                case factory.transactionStatusType.Confirmed:
+                    // アクションステータスを検証する
+                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                    break;
+                default:
+                // no op
+            }
         }
         const errors = [];
         for (const action of authorizeActions) {
-            // 直列にゆっくり処理する場合↓
-            // tslint:disable-next-line:no-magic-numbers
-            // await new Promise((resolve) => setTimeout(() => { resolve(); }, 1000));
             // 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
             try {
                 // 取引が存在すれば中止

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -78,7 +78,21 @@ function createTasks(params) {
             object: transaction
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    // 確定取引にも決済承認中止タスクを追加(2023-05-03~)
+    const voidPaymentTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidPayTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             const potentialActions = transaction.potentialActions;
@@ -107,7 +121,6 @@ function createTasks(params) {
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;
-        // 期限切れor中止の場合は、タスクリストを作成する
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
             const voidReserveTaskAttributes = {
@@ -136,19 +149,6 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            const voidPaymentTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidPayTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidMoneyTransferTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidMoneyTransferTransaction,
@@ -162,7 +162,7 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidPaymentTaskAttributes, voidMoneyTransferTaskAttributes);
+            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
             break;
         default:
             throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.28"
+  "version": "21.2.0-alpha.29"
 }