@chevre/domain 21.35.0-alpha.2 → 21.35.0-alpha.3

package/lib/chevre/service/task/returnPayTransaction.js

@@ -48,19 +48,17 @@ exports.call = call;
 function returnPayTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const refundActionAttributes = params;
-        const orderNumber = refundActionAttributes.purpose.orderNumber;
-        const returnOrderTransactions = yield repos.transaction.search({
+        const orderNumber = params.purpose.orderNumber;
+        const returnOrderTransaction = (yield repos.transaction.search({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.ReturnOrder,
             object: { order: { orderNumbers: [orderNumber] } },
-            inclusion: [],
+            inclusion: ['object', 'project'],
             exclusion: []
-        });
-        const returnOrderTransaction = returnOrderTransactions.shift();
+        })).shift();
         if (returnOrderTransaction === undefined) {
-            throw new factory.errors.NotFound('ReturnOrderTransaction');
+            throw new factory.errors.NotFound(factory.transactionType.ReturnOrder);
         }
         const paymentServiceType = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
         if (typeof paymentServiceType !== 'string' || paymentServiceType.length === 0) {
@@ -72,28 +70,31 @@ function returnPayTransaction(params) {
             inclusion: ['seller', 'project', 'dateReturned'],
             exclusion: []
         });
+        let transactionNumber; // 返金取引番号
+        // すでに返金取引が存在すれば何もしない
+        const alreadyExists = yield refundTransactionAlreadyExists(params)({ assetTransaction: repos.assetTransaction });
+        if (!alreadyExists) {
+            transactionNumber = (yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() })).transactionNumber;
+        }
+        const refundActionAttributes = Object.assign(Object.assign({}, params), (typeof transactionNumber === 'string')
+            ? { instrument: { transactionNumber, typeOf: factory.assetTransactionType.Refund } } // add instrument(2024-06-17~)
+            : undefined);
         const action = yield repos.action.start(refundActionAttributes);
-        let refundTransaction;
+        // let refundTransaction: Pick<factory.assetTransaction.refund.ITransaction, 'id' | 'transactionNumber' | 'typeOf'> | undefined;
         try {
-            // すでに返金取引が存在すれば何もしない
-            const alreadyExists = yield refundTransactionAlreadyExists(params)({ assetTransaction: repos.assetTransaction });
-            if (!alreadyExists) {
-                // まず取引番号発行
-                const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-                // 返品手数料
-                const refundFee = transaction2refundFee({ returnOrderTransaction });
-                // no op
+            if (typeof transactionNumber === 'string') {
+                const refundFee = transaction2refundFee({ returnOrderTransaction }); // 返品手数料
                 const startRefundTransactionParams = createStartRefundTransactionParams(Object.assign(Object.assign({}, params), { transactionNumber,
                     paymentServiceType,
                     refundFee, seller: order.seller }));
                 const refundPurpose = createRefundPurpose(params, order);
-                const { id, typeOf } = yield RefundTransactionService.start(startRefundTransactionParams)({
+                yield RefundTransactionService.start(startRefundTransactionParams)({
                     action: repos.action,
                     paymentService: repos.paymentService,
                     product: repos.product,
                     assetTransaction: repos.assetTransaction
                 });
-                refundTransaction = { id, transactionNumber, typeOf };
+                // refundTransaction = { id, transactionNumber, typeOf };
                 yield RefundTransactionService.confirm({
                     transactionNumber,
                     potentialActions: { refund: { purpose: refundPurpose } }
@@ -111,25 +112,17 @@ function returnPayTransaction(params) {
             }
             throw error;
         }
-        // const result: factory.action.transfer.returnAction.paymentMethod.IResult = { refundTransaction };
-        const result = Object.assign({}, (typeof (refundTransaction === null || refundTransaction === void 0 ? void 0 : refundTransaction.id) === 'string') ? { refundTransaction } : undefined); // optimize(2024-04-27~)
+        const result = {
+        // ...(typeof refundTransaction?.id === 'string') ? { refundTransaction } : undefined // migrate into instrument(2024-06-17~)
+        }; // optimize(2024-04-27~)
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
-        // 潜在アクション
         yield onRefund(refundActionAttributes)({ task: repos.task });
     });
 }
 function createRefundPurpose(params, order) {
-    // const returnOrderRecipient: factory.action.IParticipantAsSeller = {
-    //     id: order.seller.id,
-    //     typeOf: order.seller.typeOf,
-    //     ...(typeof order.seller.name === 'string') ? { name: order.seller.name } : undefined
-    // };
     return {
-        // project: order.project,
         typeOf: factory.actionType.ReturnAction,
         object: Object.assign(Object.assign({}, params.purpose), { dateReturned: order.dateReturned })
-        // agent: order.project,
-        // recipient: returnOrderRecipient
     };
 }
 function refundTransactionAlreadyExists(params) {

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.d.ts

@@ -3,4 +3,4 @@ export declare function createReturnPaymentMethodActions(params: {
     order: factory.order.IOrder;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
-}): Promise<factory.action.transfer.returnAction.paymentMethod.IAttributes[]>;
+}): Promise<factory.action.transfer.returnAction.order.IPotentialReturnInvoiceAction[]>;

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -23,7 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
 const factory = require("../../../../factory");
-function createReturnPaymentMethodPotentialActions(params) {
+function createReturnInvoicePotentialActions(params) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
@@ -77,7 +77,7 @@ function createReturnPaymentMethodPotentialActions(params) {
 function createReturnPaymentMethodActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
-        const returnPaymentMethodActions = [];
+        const potentialReturnInvoiceActions = [];
         const returnPaymentMethodPurpose = {
             typeOf: order.typeOf,
             orderNumber: order.orderNumber,
@@ -92,12 +92,12 @@ function createReturnPaymentMethodActions(params) {
             case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
                 break;
             default:
-                returnPaymentMethodActions.push(...yield Promise.all(params.order.paymentMethods
+                potentialReturnInvoiceActions.push(...yield Promise.all(params.order.paymentMethods
                     .filter((paymentMethod) => {
                     return paymentMethod.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.MovieTicket;
                 })
                     .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-                    const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+                    const potentialActionsOnRefund = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                         ? { returnOrderActionParams: params.returnOrderActionParams }
                         : undefined));
                     const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
@@ -118,8 +118,8 @@ function createReturnPaymentMethodActions(params) {
                 }))));
         }
         // MovieTicket決済について
-        returnPaymentMethodActions.push(...yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params));
-        return returnPaymentMethodActions;
+        potentialReturnInvoiceActions.push(...yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params));
+        return potentialReturnInvoiceActions;
     });
 }
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
@@ -165,7 +165,7 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
             return returnPaymentMethod;
         })
             .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
-            const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
+            const potentialActionsOnRefund = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                 ? { returnOrderActionParams: params.returnOrderActionParams }
                 : undefined));
             const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.2",
+    "@chevre/factory": "4.375.0-alpha.3",
     "@cinerino/sdk": "7.2.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.35.0-alpha.2"
+  "version": "21.35.0-alpha.3"
 }