@chevre/domain 21.6.0-alpha.1 → 21.6.0-alpha.3

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -43,7 +43,7 @@ function createPayActions(params) {
     return payActions;
 }
 function createPayObject(params) {
-    var _a, _b;
+    var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
@@ -100,7 +100,7 @@ function createPayObject(params) {
                     totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.unitCode.C62,
-                        value: (_b = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets) === null || _b === void 0 ? void 0 : _b.length
+                        value: (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? paymentMethod.movieTickets.length : 0
                     },
                     typeOf: paymentMethodType
                 }, movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets }, (Array.isArray(paymentServiceOutput)) ? { serviceOutput: paymentServiceOutput } : undefined);

package/lib/chevre/service/assetTransaction/pay.js

@@ -243,9 +243,6 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
             typeOf: 'MonetaryAmount',
             currency,
             value: amount
-            // value: (typeof pendingTransaction.object.amount === 'number')
-            //     ? pendingTransaction.object.amount
-            //     : pendingTransaction.object.amount.value
         };
         const savingPendingTransaction = {
             typeOf: pendingTransaction.typeOf,

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

@@ -113,7 +113,7 @@ exports.checkMovieTicket = checkMovieTicket;
  */
 function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         let accountId;
         let payAction;
         let accountsReceivablesByServiceType = [];
@@ -138,7 +138,7 @@ function authorize(params, transaction, paymentServiceId, useCheckMovieTicketBef
                 paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.unitCode.C62,
-                        value: (_b = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets) === null || _b === void 0 ? void 0 : _b.length
+                        value: (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? paymentMethod.movieTickets.length : 0
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -53,6 +53,15 @@ function onResourceDeleted(params) {
                         ids: params.id
                     })(repos);
                     break;
+                case factory.product.ProductType.EventService:
+                case factory.product.ProductType.Product:
+                case factory.product.ProductType.Transportation:
+                    yield deleteResourcesByProduct({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
+                    break;
                 default:
                     // no op
                     throw new factory.errors.NotImplemented(`${params.typeOf} onDeleted not implemented`);
@@ -333,3 +342,46 @@ function deleteResourcesByOfferCatalog(params) {
         }
     });
 }
+function deleteResourcesByProduct(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        for (const productId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: productId, typeOf: params.typeOf },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                let deleteEventResult;
+                let updateOfferResult;
+                // 興行を設定されたイベント削除
+                deleteEventResult = yield repos.event.deleteManyByItemOfferedId({
+                    project: { id: params.project.id },
+                    offers: { itemOffered: { id: { $in: [productId] } } }
+                });
+                // アドオンから除外
+                updateOfferResult = yield repos.offer.pullAddOns({
+                    project: { id: params.project.id },
+                    addOn: { itemOffered: { id: { $in: [productId] } } }
+                });
+                deleteResult = { deleteEventResult, updateOfferResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -82,11 +82,18 @@ function createPaymentMethods(params) {
         });
     });
     // 決済方法から注文金額の計算
+    // price += authorizePaymentActions
+    //     .filter((a) => {
+    //         return a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY;
+    //     })
+    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     price += authorizePaymentActions
-        .filter((a) => {
+        .reduce((a, b) => {
         var _a, _b;
-        return ((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY;
-    })
-        .reduce((a, b) => a + b.result.amount, 0);
+        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? b.result.totalPaymentDue.value
+            : 0;
+        return a + jpyAmount;
+    }, 0);
     return { paymentMethods, price };
 }

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -99,9 +99,17 @@ function validatePrice(transaction, authorizeActions) {
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
             && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment;
     });
+    // priceByAgent += authorizePaymentActions
+    //     .filter((a) => a.result?.totalPaymentDue?.currency === factory.priceCurrency.JPY)
+    //     .reduce((a, b) => a + (<IAuthorizeAnyPaymentResult>b.result).amount, 0);
     priceByAgent += authorizePaymentActions
-        .filter((a) => { var _a, _b; return ((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY; })
-        .reduce((a, b) => a + b.result.amount, 0);
+        .reduce((a, b) => {
+        var _a, _b;
+        const jpyAmount = (((_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.totalPaymentDue) === null || _b === void 0 ? void 0 : _b.currency) === factory.priceCurrency.JPY)
+            ? b.result.totalPaymentDue.value
+            : 0;
+        return a + jpyAmount;
+    }, 0);
     // 販売者が提供するアイテムの発生金額
     priceBySeller += authorizeActions
         .filter((authorizeAction) => authorizeAction.actionStatus === factory.actionStatusType.CompletedActionStatus)

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.323.0",
+    "@chevre/factory": "4.324.0-alpha.0",
     "@cinerino/sdk": "3.162.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.6.0-alpha.1"
+  "version": "21.6.0-alpha.3"
 }