@chevre/domain 21.33.0-alpha.24 → 21.33.0-alpha.25

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -146,6 +146,7 @@ async function main() {
                             })({
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
                                 action: await chevre.repository.Action.createInstance(mongoose.connection),
+                                actionRecipe: await chevre.repository.ActionRecipe.createInstance(mongoose.connection),
                                 assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
                                 paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
                                 paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),

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

@@ -86,14 +86,14 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
             // use actionRecipe(2024-06-02~)
             if (typeof (actionRecipe === null || actionRecipe === void 0 ? void 0 : actionRecipe.recipeCategory) === 'string') {
                 pendingPaymentAgencyTransaction = recipe2paymentAgencyTransaction(actionRecipe);
-                debug('handlePrePublishedPaymentMethodIdOnAuthorizing: pendingPaymentAgencyTransaction from recipe:', JSON.stringify(pendingPaymentAgencyTransaction));
             }
             else {
-                const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
-                if (entryTranArgs !== undefined && entryTranResult !== undefined
-                    && execTranArgs !== undefined && execTranResult !== undefined) {
-                    pendingPaymentAgencyTransaction = { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
-                }
+                // discontinue(2024-06-05~)
+                // const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
+                // if (entryTranArgs !== undefined && entryTranResult !== undefined
+                //     && execTranArgs !== undefined && execTranResult !== undefined) {
+                //     pendingPaymentAgencyTransaction = { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
+                // }
             }
             if (pendingPaymentAgencyTransaction === undefined) {
                 throw new factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');

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

@@ -57,7 +57,7 @@ function voidPayTransaction(params) {
 exports.voidPayTransaction = voidPayTransaction;
 function invalidatePaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
         }
@@ -71,7 +71,8 @@ function invalidatePaymentUrl(params) {
             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;
+        // const paymentMethodType = transaction.object.paymentMethods?.typeOf;
+        const paymentMethodType = (_c = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentMethod) === null || _c === void 0 ? void 0 : _c.identifier;
         if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0
             && typeof paymentMethodType === 'string' && paymentMethodType.length > 0) {
             // chevreで決済URL無効化
@@ -82,7 +83,7 @@ function invalidatePaymentUrl(params) {
                     typeOf: transaction.seller.typeOf,
                     name: (typeof transaction.seller.name === 'string')
                         ? transaction.seller.name
-                        : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
+                        : String((_d = transaction.seller.name) === null || _d === void 0 ? void 0 : _d.ja),
                     id: transaction.seller.id
                 },
                 recipient: {
@@ -92,7 +93,7 @@ function invalidatePaymentUrl(params) {
                 },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-                        id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
+                        id: (_f = (_e = transaction.object.paymentMethods) === null || _e === void 0 ? void 0 : _e.issuedThrough) === null || _f === void 0 ? void 0 : _f.id,
                         paymentMethod: {
                             additionalProperty: [],
                             name: paymentMethodType,
@@ -252,15 +253,15 @@ function publishPaymentUrl(params) {
             })(repos);
             // 取引に保管
             const paymentMethodByPaymentUrl = {
-                typeOf: params.object.paymentMethod,
+                // typeOf: params.object.paymentMethod, // discontinue(2024-06-05~)
                 paymentMethodId: result.paymentMethodId,
-                paymentUrl: result.paymentUrl,
+                // paymentUrl: result.paymentUrl, // migrate to recipe(2024-06-05~)
                 issuedThrough: { id: (typeof startParams.object.id === 'string') ? startParams.object.id : '' },
                 // GMO IFを保管(2024-01-01~)
-                entryTranArgs: result.entryTranArgs,
-                entryTranResult: result.entryTranResult,
-                execTranArgs: result.execTranArgs,
-                execTranResult: result.execTranResult,
+                // entryTranArgs: result.entryTranArgs, // migrate to recipe(2024-06-05~)
+                // entryTranResult: result.entryTranResult, // migrate to recipe(2024-06-05~)
+                // execTranArgs: result.execTranArgs, // migrate to recipe(2024-06-05~)
+                // execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
                 paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~)
             };
             yield repos.transaction.findByIdAndUpdateInProgress({

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

@@ -127,12 +127,13 @@ function validatePrice(authorizePaymentActions, authorizeEventServiceOfferAction
     }
 }
 function validatePaymentUrl(transaction, authorizePaymentActions) {
-    var _a, _b;
+    var _a;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
-    const paymentUrl = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentUrl;
+    // const paymentUrl = transaction.object.paymentMethods?.paymentUrl;
     if (typeof paymentMethodId === 'string' && paymentMethodId.length > 0
-        && typeof paymentUrl === 'string' && paymentUrl.length > 0) {
+    // && typeof paymentUrl === 'string' && paymentUrl.length > 0
+    ) {
         // 発行された決済URLに対する決済承認を確認する
         const authorizePaymentAction4paymentUrlExists = authorizePaymentActions.some(({ result }) => {
             const resultAsInvoice = (Array.isArray(result))

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.3",
+    "@chevre/factory": "4.374.0-alpha.4",
     "@cinerino/sdk": "7.1.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.24"
+  "version": "21.33.0-alpha.25"
 }