@chevre/domain 21.2.0-alpha.51 → 21.2.0-alpha.52

package/lib/chevre/service/transaction.js

@@ -121,6 +121,7 @@ exports.exportTasks = exportTasks;
  */
 // tslint:disable-next-line:max-func-body-length
 function deleteTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const transactions = yield repos.transaction.search({
             ids: [params.object.id],
@@ -137,9 +138,11 @@ function deleteTransaction(params) {
         const actionAttributes = {
             typeOf: factory.actionType.DeleteAction,
             project: transaction.project,
-            object: transaction,
+            object: params.object,
             agent: transaction.project
         };
+        let deletePayTransactionResult;
+        let payTransactionNumbers = [];
         let deleteReservationsResult;
         let deleteReserveTransactionResult;
         let deletedReservationNumbers = [];
@@ -154,13 +157,15 @@ function deleteTransaction(params) {
                         case factory.transactionStatusType.Expired:
                             // tslint:disable-next-line:no-suspicious-comment
                             // TODO サービス登録取引を削除
-                            // tslint:disable-next-line:no-suspicious-comment
-                            // TODO 決済取引を削除
+                            // 決済取引を削除
+                            const deletePayTransactionsByPlaceOrderResult = yield deletePayTransactionsByPlaceOrder({ transaction })(repos);
+                            deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;
+                            payTransactionNumbers = deletePayTransactionsByPlaceOrderResult.payTransactionNumbers;
                             // 取引上での予約を削除
-                            const deleteReservationsByTransactionResult = yield deleteReservationsByTransaction({ transaction })(repos);
-                            deleteReservationsResult = deleteReservationsByTransactionResult.deleteResult;
-                            deleteReserveTransactionResult = deleteReservationsByTransactionResult.deleteReserveTransactionResult;
-                            deletedReservationNumbers = deleteReservationsByTransactionResult.reserveTransactionNumbers;
+                            const deleteReservationsByPlaceOrderResult = yield deleteReservationsByPlaceOrder({ transaction })(repos);
+                            deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
+                            deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
+                            deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
                             break;
                         case factory.transactionStatusType.Confirmed:
                             // no op
@@ -169,8 +174,6 @@ function deleteTransaction(params) {
                     }
                     // 取引削除
                     yield repos.transaction.findByIdAndDelete({ id: transaction.id });
-                    // await repos.transaction.transactionModel.findByIdAndDelete(transaction.id)
-                    //     .exec();
                     break;
                 // implemented(2022-06-09~)
                 case factory.transactionType.ReturnOrder:
@@ -199,6 +202,8 @@ function deleteTransaction(params) {
         }
         // アクション完了
         const actionResult = {
+            deletePayTransactionResult,
+            payTransactionNumbers,
             deleteReservationsResult,
             deleteReserveTransactionResult,
             deletedReservationNumbers
@@ -207,7 +212,7 @@ function deleteTransaction(params) {
     });
 }
 exports.deleteTransaction = deleteTransaction;
-function deleteReservationsByTransaction(params) {
+function deleteReservationsByPlaceOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let deleteResult;
         let deleteReserveTransactionResult;
@@ -256,3 +261,40 @@ function deleteReservationsByTransaction(params) {
         return { deleteResult, deleteReserveTransactionResult, reserveTransactionNumbers };
     });
 }
+function deletePayTransactionsByPlaceOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let deletePayTransactionResult;
+        // 取引に対する全ての承認アクションを検索
+        const authorizeActions = yield repos.action.searchByPurpose({
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: factory.transactionType.PlaceOrder,
+                id: params.transaction.id
+            }
+        });
+        // 決済取引番号を抽出
+        const authorizePaymentActions = authorizeActions
+            .filter((a) => {
+            var _a;
+            const pendingTransactionNumber = (_a = a.object) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
+            return a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
+                && typeof pendingTransactionNumber === 'string'
+                && pendingTransactionNumber.length > 0;
+        });
+        const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
+        if (payTransactionNumbers.length > 0) {
+            // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: payTransactionNumbers,
+                typeOf: factory.assetTransactionType.Pay
+            });
+            deletePayTransactionResult = {
+                n: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.n,
+                ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
+                deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
+            };
+        }
+        return { deletePayTransactionResult, payTransactionNumbers };
+    });
+}

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.51"
+  "version": "21.2.0-alpha.52"
 }