@chevre/domain 21.8.0-alpha.5 → 21.8.0-alpha.7

package/lib/chevre/service/delivery.js

@@ -29,6 +29,23 @@ const accountTransactionIdentifier_1 = require("../factory/accountTransactionIde
  */
 function givePointAward(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 入金識別子が存在する場合、冪等性の確保(2023-08-24~)
+        const pendingTransactionIdentifier = params.object.identifier;
+        if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
+            // すでにConfirmedのMoneyTransfer取引が存在すれば何もしない
+            const assetTransactions = yield repos.assetTransaction.search({
+                limit: 1,
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.MoneyTransfer,
+                statuses: [factory.transactionStatusType.Confirmed],
+                object: {
+                    pendingTransaction: { identifier: { $eq: pendingTransactionIdentifier } }
+                }
+            }, ['_id']);
+            if (assetTransactions.length > 0) {
+                return;
+            }
+        }
         // アクション開始
         const action = yield repos.action.start(params);
         try {

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -14,7 +14,6 @@ exports.onOrderStatusChanged = void 0;
  * 注文ステータス変更時処理
  */
 const google_libphonenumber_1 = require("google-libphonenumber");
-const moment = require("moment");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
 const product_1 = require("../offer/product");
@@ -130,8 +129,7 @@ function onOrderStatusChanged(params) {
 exports.onOrderStatusChanged = onOrderStatusChanged;
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         const tasks = [];
         yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
             // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
@@ -181,14 +179,14 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
         return tasks;
     });
 }
-const COA_TASK_DELAY_IN_SECONDS = 0;
+// const COA_TASK_DELAY_IN_SECONDS = 0;
 function createConfirmReserveTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
-        const taskRunsAt4coa = moment(order.orderDate)
-            .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
+        const taskRunsAt = new Date();
+        const taskRunsAt4coa = new Date();
+        // const taskRunsAt4coa = moment(order.orderDate)
+        //     .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
+        //     .toDate();
         const confirmObjects = [
             ...(0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order }),
             ...(0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order })
@@ -242,8 +240,7 @@ function createConfirmReserveTransactionTasks(order, simpleOrder) {
 }
 function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
             const confirmObjects = (0, factory_1.createConfirmRegisterServiceActionObjectByOrder)({ order });
             const tasks = [];
@@ -317,14 +314,14 @@ function createSendOrderTransactionTaskIfNotExist(params) {
         }
     });
 }
-const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
+// const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;
-    const taskRunsAt = moment(order.dateReturned)
-        .toDate();
-    const taskRunsAt4coa = moment(order.dateReturned)
-        .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-        .toDate();
+    const taskRunsAt = new Date();
+    const taskRunsAt4coa = new Date();
+    // const taskRunsAt4coa = moment(order.dateReturned)
+    //     .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
     const tasks = [];
     const returnActionRecipient = {
         typeOf: order.seller.typeOf,
@@ -399,12 +396,13 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
     }
     return tasks;
 }
-const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
+// const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
 function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
     var _a, _b;
-    const taskRunsAt = moment(order.dateReturned)
-        .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
-        .toDate();
+    const taskRunsAt = new Date();
+    // const taskRunsAt = moment(order.dateReturned)
+    //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
     const tasks = [];
     const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
     const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;

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.8.0-alpha.5"
+  "version": "21.8.0-alpha.7"
 }