@chevre/domain 21.18.0-alpha.9 → 21.18.0

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -23,6 +24,7 @@ function call(data) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
         yield (0, payOrder_1.payOrder)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)

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

@@ -64,11 +64,6 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
-                    // case factory.offerType.Offer:
-                    //     await deleteResourcesByOffer({
-                    //         project: { id: params.project.id },
-                    //         ids: params.id
-                    //     })(repos);
                     break;
                 case 'OfferCatalog':
                     yield deleteResourcesByOfferCatalog({
@@ -86,6 +81,8 @@ function onResourceDeleted(params) {
                 case factory.product.ProductType.EventService:
                 case factory.product.ProductType.Product:
                 case factory.product.ProductType.Transportation:
+                case factory.product.ProductType.MembershipService:
+                case factory.product.ProductType.PaymentCard:
                     yield deleteResourcesByProduct({
                         project: { id: params.project.id },
                         ids: params.id,
@@ -337,7 +334,7 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.search({
+                const productsWithCatalog = yield repos.product.searchProducts({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
                 }, ['_id'], []);

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

@@ -187,7 +187,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.search({
+        const products4inform = yield repos.product.searchProducts({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const event_1 = require("../../repo/event");
+const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -29,10 +30,10 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
+            paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection)
         });
     });

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
@@ -25,6 +26,7 @@ function call(data) {
         //     throw new factory.errors.Argument('settings', 'redisClient required');
         // }
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

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

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -33,10 +34,10 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
+            paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient)

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

@@ -15,6 +15,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
+const paymentService_1 = require("../../repo/paymentService");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -32,9 +33,8 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
+            paymentService: new paymentService_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
-            // project: new ProjectRepo(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection),
             transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient)
@@ -89,6 +89,7 @@ function returnPayTransaction(params) {
                 const refundPurpose = createRefundPurpose(params, order);
                 refundTransaction = yield RefundTransactionService.start(startRefundTransactionParams)({
                     action: repos.action,
+                    paymentService: repos.paymentService,
                     product: repos.product,
                     assetTransaction: repos.assetTransaction
                 });

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

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -13,8 +13,8 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
@@ -30,10 +30,9 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
+            paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
-            product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
-            // seller: new SellerRepo(settings.connection),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -27,6 +28,7 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
+            paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),

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

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
 const ProductOfferService = require("../offer/product");
@@ -21,17 +19,15 @@ const ProductOfferService = require("../offer/product");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         const actionRepo = new action_1.MongoRepository(settings.connection);
-        const registerActionInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield ProductOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            registerActionInProgress: registerActionInProgressRepo,
             transaction: transactionRepo
         });
     });

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -13,6 +14,7 @@ import type { MongoRepository as TransactionRepo } from '../../repo/transaction'
  * 冪等性を確保すること
  */
 export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -4,7 +4,3 @@ export declare function createRegisterServiceActions(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;
-/**
- * ssktsへの互換性対応として
- * 次回メンバーシップ注文タスクを作成する
- */

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -76,89 +76,3 @@ function createRegisterServiceActionObject(params) {
         typeOf: factory.assetTransactionType.RegisterService
     };
 }
-/**
- * ssktsへの互換性対応として
- * 次回メンバーシップ注文タスクを作成する
- */
-// function createOrderProgramMembershipTask(params: {
-//     order: factory.order.IOrder;
-//     authorizeAction: factory.action.authorize.offer.product.IAction;
-// }): factory.task.IAttributes<factory.taskName.OrderProgramMembership> | undefined {
-//     let orderMembershipTask: factory.task.IAttributes<factory.taskName.OrderProgramMembership> | undefined;
-//     const acceptedOffer = params.authorizeAction.object[0];
-//     // ssktsへの互換性対応なので、限定的に(暫定対応のautomaticRenewal設定で判定)
-//     const serviceOutput = acceptedOffer.itemOffered.serviceOutput;
-//     if (acceptedOffer.itemOffered.typeOf === factory.product.ProductType.MembershipService
-//         && typeof serviceOutput?.typeOf === 'string'
-//         && serviceOutput.typeOf.length > 0
-//         && serviceOutput.automaticRenewal === true) {
-//         const memebershipFor: Pick<factory.product.IProduct, 'project' | 'typeOf' | 'id'> = {
-//             project: { typeOf: factory.organizationType.Project, id: params.order.project.id },
-//             typeOf: acceptedOffer.itemOffered.typeOf,
-//             id: String(acceptedOffer.itemOffered.id)
-//         };
-//         const orderMembershipObject: factory.task.orderProgramMembership.IAcceptedOffer = {
-//             seller: { id: String(acceptedOffer.seller.id) },
-//             typeOf: acceptedOffer.typeOf,
-//             itemOffered: {
-//                 typeOf: serviceOutput.typeOf,
-//                 name: (typeof serviceOutput.name === 'string') ? serviceOutput.name : serviceOutput.typeOf,
-//                 issuedThrough: { id: String(memebershipFor.id), typeOf: factory.product.ProductType.MembershipService }
-//             },
-//             id: String(acceptedOffer.id),
-//             identifier: String(acceptedOffer.identifier)
-//         };
-//         // 次回のメンバーシップ注文タスクを生成
-//         const orderProgramMembershipTaskData: factory.task.IData<factory.taskName.OrderProgramMembership> = {
-//             // 最低限の情報のみagentに設定
-//             agent: {
-//                 typeOf: factory.personType.Person,
-//                 id: params.order.customer.id,
-//                 // transaction.agent.identifierにissがあれば情報を引き継ぐ
-//                 identifier: (Array.isArray(params.order.customer.identifier))
-//                     ? params.order.customer.identifier
-//                     : []
-//             },
-//             object: orderMembershipObject,
-//             project: params.order.project,
-//             typeOf: factory.actionType.OrderAction
-//         };
-//         // どういう期間でいくらのオファーなのか
-//         const priceSpec = <factory.compoundPriceSpecification.IPriceSpecification<factory.priceSpecificationType>>
-//             acceptedOffer.priceSpecification;
-//         if (priceSpec === undefined) {
-//             throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification');
-//         }
-//         const unitPriceSpec =
-//             <factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>>
-//             priceSpec.priceComponent.find(
-//                 (p) => p.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-//             );
-//         if (unitPriceSpec === undefined) {
-//             throw new factory.errors.NotFound('Unit Price Specification in Order.acceptedOffers.priceSpecification');
-//         }
-//         // 期間単位としては秒のみ実装
-//         if (unitPriceSpec.referenceQuantity.unitCode !== factory.unitCode.Sec) {
-//             throw new factory.errors.NotImplemented('Only \'SEC\' is implemented for priceSpecification.referenceQuantity.unitCode ');
-//         }
-//         const referenceQuantityValue = unitPriceSpec.referenceQuantity.value;
-//         if (typeof referenceQuantityValue !== 'number') {
-//             throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
-//         }
-//         // プログラム更新日時は、今回のプログラムの所有期限
-//         const runsAt = moment(params.order.orderDate)
-//             .add(referenceQuantityValue, 'seconds')
-//             .toDate();
-//         orderMembershipTask = {
-//             data: orderProgramMembershipTaskData,
-//             executionResults: [],
-//             name: <factory.taskName.OrderProgramMembership>factory.taskName.OrderProgramMembership,
-//             numberOfTried: 0,
-//             project: params.order.project,
-//             remainingNumberOfTries: 10,
-//             runsAt: runsAt,
-//             status: factory.taskStatus.Ready
-//         };
-//     }
-//     return orderMembershipTask;
-// }

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -10,4 +10,4 @@ export declare function createOrder(params: {
     orderStatus: factory.orderStatus;
     isGift: boolean;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): factory.order.IOrder;
+}): factory.transaction.placeOrder.IOrderAsResult;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -32,7 +32,7 @@ export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderPara
     };
 };
 export declare function validateNumItems(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
     result: {
         order: IResultOrderParams;
     };

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

@@ -2,5 +2,6 @@ import * as factory from '../../../../factory';
 export type WebAPIIdentifier = factory.service.webAPI.Identifier;
 export declare function createReturnMoneyTransferActions(params: {
     order: factory.order.IOrder;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
 }): Promise<factory.task.IData<factory.taskName.ReturnMoneyTransfer>[]>;

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

@@ -32,9 +32,9 @@ function createReturnMoneyTransferActions(params) {
             priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
-        // 注文アイテムから返却アクションを作成する
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-        for (const acceptedOffer of acceptedOffers) {
+        // 注文オファーから返却アクションを作成する
+        // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        for (const acceptedOffer of params.moneyTransferAcceptedOffers) {
             if (acceptedOffer.itemOffered.typeOf === factory.actionType.MoneyTransfer) {
                 const moneyTransfer = acceptedOffer.itemOffered;
                 const transactionNumber = String((_b = (_a = moneyTransfer.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber);

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

@@ -9,4 +9,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: factory.transaction.returnOrder.ITransaction;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
 }): Promise<factory.transaction.returnOrder.IPotentialActions>;

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

@@ -34,7 +34,7 @@ function createPotentialActions(params) {
             const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
-            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
+            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, moneyTransferAcceptedOffers: params.moneyTransferAcceptedOffers, returnOrderActionParams }));
             // 返品後のEメール送信アクション
             const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             const potentialActionsOnReturnOrder = {

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

@@ -42,6 +42,7 @@ export declare function confirm(params: factory.transaction.returnOrder.IConfirm
         };
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     emailMessage?: EmailMessageRepo;
     order: OrderRepo;
     transaction: TransactionRepo;

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

@@ -172,34 +172,34 @@ function fixOrders(params) {
             project: { id: { $eq: params.project.id } },
             confirmationNumbers: [params.object.order[0].confirmationNumber],
             orderNumbers: [params.object.order[0].orderNumber]
-        }, {
-            // acceptedOffers: 0, // カスタム返品ポリシーに必要
-            customer: 0,
-            orderedItem: 0
-            // paymentMethods: 0 // 適用決済方法検証に必要
-        });
+        }, 
+        // positive projectionで検索(2023-12-08~)
+        {
+            confirmationNumber: 1, dateReturned: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
+            paymentMethods: 1, price: 1, project: 1, seller: 1, typeOf: 1
+        }
+        // {
+        //     // acceptedOffers: 0, // カスタム返品ポリシーに必要
+        //     customer: 0,
+        //     orderedItem: 0
+        //     // paymentMethods: 0 // 適用決済方法検証に必要
+        // }
+        );
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
         }
-        // const offerIds = await repos.acceptedOffer.searchAcceptedOfferIds({
-        //     project: { id: { $eq: params.project.id } },
-        //     confirmationNumbers: [params.object.order[0].confirmationNumber],
-        //     orderNumbers: [params.object.order[0].orderNumber]
-        // });
-        // const offerIds = await repos.acceptedOffer.searchAcceptedOfferIds({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const offerIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.id');
-        // const eventIds = await repos.acceptedOffer.searchReservationForIdsByOrderNumbers({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const eventIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
-        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
-            orderNumber: { $in: [params.object.order[0].orderNumber] }
+        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
+        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
+        // });
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: params.object.order[0].orderNumber },
+            project: { id: { $eq: params.project.id } }
         });
         return { acceptedOffers, eventIds, offerIds, orders };
     });
@@ -291,42 +291,40 @@ function createOrder4returnPolicy(params) {
         orderDate: params.order.orderDate,
         orderNumber: params.order.orderNumber,
         price: params.order.price,
-        acceptedOffers: (Array.isArray(params.order.acceptedOffers))
-            ? params.order.acceptedOffers.map((o) => {
-                var _a;
-                if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
-                    const reservation = o.itemOffered;
-                    const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
-                    return {
-                        itemOffered: {
-                            additionalProperty: reservation.additionalProperty,
-                            reservationFor: {
-                                doorTime: reservation.reservationFor.doorTime,
-                                endDate: reservation.reservationFor.endDate,
-                                startDate: reservation.reservationFor.startDate
-                                // superEvent: reservation.reservationFor.superEvent
-                            },
-                            reservedTicket: {
-                                ticketedSeat: reservation.reservedTicket.ticketedSeat
-                            }
+        acceptedOffers: params.order.acceptedOffers.map((o) => {
+            var _a;
+            if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+                const reservation = o.itemOffered;
+                const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+                return {
+                    itemOffered: {
+                        additionalProperty: reservation.additionalProperty,
+                        reservationFor: {
+                            doorTime: reservation.reservationFor.doorTime,
+                            endDate: reservation.reservationFor.endDate,
+                            startDate: reservation.reservationFor.startDate
+                            // superEvent: reservation.reservationFor.superEvent
                         },
-                        priceSpecification: {
-                            priceComponent: (Array.isArray(priceComponent))
-                                ? priceComponent.map((component) => {
-                                    const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
-                                    return postingComponent;
-                                })
-                                : []
+                        reservedTicket: {
+                            ticketedSeat: reservation.reservedTicket.ticketedSeat
                         }
-                    };
-                }
-                else {
-                    return {
-                        priceSpecification: o.priceSpecification
-                    };
-                }
-            })
-            : []
+                    },
+                    priceSpecification: {
+                        priceComponent: (Array.isArray(priceComponent))
+                            ? priceComponent.map((component) => {
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
+                                return postingComponent;
+                            })
+                            : []
+                    }
+                };
+            }
+            else {
+                return {
+                    priceSpecification: o.priceSpecification
+                };
+            }
+        })
     };
 }
 const TIMEOUT = 5000;
@@ -401,7 +399,7 @@ function findApplicableReturnPolicy(params) {
             if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
                 const returnPolicyByProject = yield getReturnPolicyByProject({
                     sameAs: returnPolicySameAsByPoject,
-                    order: params.orders[0] // 同時返品可能な注文数をは1
+                    order: Object.assign(Object.assign({}, params.orders[0]), { acceptedOffers: params.acceptedOffers })
                 });
                 applicalbleReturnPolicies.push(returnPolicyByProject);
             }
@@ -613,6 +611,7 @@ function validateOffersReturnPolicy(params) {
     // 決済カード取消ポリシーを確定(2023-05-23~)
     const returnFeesMovieTicket = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
+        var _a, _b;
         const unitPriceOffer = params.offers.find((offer) => offer.id === acceptedOffer.id);
         if (unitPriceOffer === undefined) {
             throw new factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
@@ -625,11 +624,11 @@ function validateOffersReturnPolicy(params) {
         if (policyByOffer === undefined) {
             throw new factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
         }
-        const movieTicketTypeChargeSpecExists = acceptedOffer.priceSpecification.priceComponent.some((component) => {
+        const movieTicketTypeChargeSpecExists = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent.some((component) => {
             return component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         });
-        if (movieTicketTypeChargeSpecExists) {
-            acceptedOffer.priceSpecification.priceComponent.forEach((component) => {
+        if (movieTicketTypeChargeSpecExists === true) {
+            (_b = acceptedOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent.forEach((component) => {
                 if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
                     if (Array.isArray(component.appliesToMovieTicket)) {
                         component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
@@ -718,12 +717,19 @@ function confirm(params) {
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const result = {};
+        const moneyTransferAcceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: transaction.object.order[0].orderNumber },
+            project: { id: { $eq: transaction.project.id } },
+            acceptedOffers: { itemOffered: { typeOf: { $in: [factory.actionType.MoneyTransfer] } } }
+        }, ['itemOffered']);
+        debug(moneyTransferAcceptedOffers.length, 'moneyTransferAcceptedOffers found.', moneyTransferAcceptedOffers);
         const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: orders,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessageOnOrderReturned: emailMessageOnOrderReturned
+            emailMessageOnOrderReturned: emailMessageOnOrderReturned,
+            moneyTransferAcceptedOffers
         });
         // ステータス変更
         yield repos.transaction.confirm({