@chevre/domain 21.18.0-alpha.15 → 21.18.0-alpha.17

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

@@ -214,12 +214,12 @@ function reservationPriceComponent2invoicePriceComponent(component) {
     }
 }
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
-    var _a, _b;
+    var _a;
     let ticketToken;
     let reservationNumber = '';
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
-    const reservationOffer = (_a = order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
+    const reservationOffer = order.acceptedOffers.find((o) => {
         var _a, _b, _c, _d;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
@@ -259,7 +259,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
             ticketToken = ticketTokenByReservationOffer;
         }
         reservationNumber = reservationOffer.itemOffered.reservationNumber;
-        const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
+        const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
         if (Array.isArray(priceComponent)) {
             priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
         }

package/lib/chevre/service/delivery/factory.d.ts

@@ -4,5 +4,7 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  * 注文から所有権を作成する
  */
 export declare function createOwnershipInfosFromOrder(params: {
-    order: Pick<factory.order.IOrder, 'acceptedOffers' | 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'>;
+    order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): IOwnershipInfo[];

package/lib/chevre/service/delivery/factory.js

@@ -11,8 +11,10 @@ const factory_2 = require("./reservation/factory");
  */
 function createOwnershipInfosFromOrder(params) {
     const ownershipInfos = [];
-    const acceptedOffers = (Array.isArray(params.order.acceptedOffers)) ? params.order.acceptedOffers : [];
-    acceptedOffers.forEach((acceptedOffer, offerIndex) => {
+    if (!Array.isArray(params.order.acceptedOffers)) {
+        throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    }
+    params.order.acceptedOffers.forEach((acceptedOffer, offerIndex) => {
         const itemOffered = acceptedOffer.itemOffered;
         let ownershipInfo;
         const ownedFrom = moment(params.order.orderDate)

package/lib/chevre/service/delivery.d.ts

@@ -4,7 +4,6 @@ import type { MongoRepository as AssetRepo } from '../repo/assetTransaction';
 import type { MongoRepository as ProductRepo } from '../repo/product';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { RedisRepository as TransactionNumberRepo } from '../repo/transactionNumber';
-import { createOwnershipInfosFromOrder } from './delivery/factory';
 /**
  * 特典付与
  */
@@ -25,4 +24,4 @@ declare function returnPointAward(params: factory.task.IData<factory.taskName.Re
     project: ProjectRepo;
     transactionNumber: TransactionNumberRepo;
 }) => Promise<void>;
-export { createOwnershipInfosFromOrder, givePointAward, returnPointAward };
+export { givePointAward, returnPointAward };

package/lib/chevre/service/delivery.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.returnPointAward = exports.givePointAward = exports.createOwnershipInfosFromOrder = void 0;
+exports.returnPointAward = exports.givePointAward = void 0;
 /**
  * 配送サービス
  * ここでいう「配送」とは、「エンドユーザーが獲得した所有権を利用可能な状態にすること」を指します。
@@ -21,8 +21,6 @@ exports.returnPointAward = exports.givePointAward = exports.createOwnershipInfos
 const moment = require("moment");
 const factory = require("../factory");
 const MoneyTransferAssetTransactionService = require("./assetTransaction/moneyTransfer");
-const factory_1 = require("./delivery/factory");
-Object.defineProperty(exports, "createOwnershipInfosFromOrder", { enumerable: true, get: function () { return factory_1.createOwnershipInfosFromOrder; } });
 const accountTransactionIdentifier_1 = require("../factory/accountTransactionIdentifier");
 /**
  * 特典付与

package/lib/chevre/service/order/createAccountingReportIfNotExist.d.ts

@@ -1,5 +1,7 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import * as factory from '../../factory';
-export declare function createAccountingReportIfNotExist(params: factory.order.IOrder): (repos: {
+export declare function createAccountingReportIfNotExist(params: factory.order.IOrder & {
+    acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

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

@@ -28,7 +28,10 @@ exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
     var _a;
-    const numItems = (Array.isArray(params.acceptedOffers)) ? params.acceptedOffers.length : 0;
+    if (!Array.isArray(params.acceptedOffers)) {
+        throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    }
+    const numItems = params.acceptedOffers.length;
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
     const acceptedOffers = (Array.isArray(params.acceptedOffers))
         ? params.acceptedOffers.map((o) => {

package/lib/chevre/service/order/deleteOrder.d.ts

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
@@ -11,6 +12,7 @@ import * as factory from '../../factory';
 declare function deleteOrder(params: {
     object: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     order: OrderRepo;

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

@@ -50,7 +50,10 @@ function deleteOrder(params) {
 exports.deleteOrder = deleteOrder;
 function deleteReservationsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
         const reservationIds = acceptedOffers.filter((o) => {
             return o.itemOffered.typeOf === factory.reservationType.EventReservation;
         })
@@ -66,7 +69,12 @@ function deleteOwnershipInfosByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 所有権作成
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+            order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
+                }) })
+        });
         const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
         if (ownershipIdentifiers.length > 0) {
             yield repos.ownershipInfo.deleteExpiredByIdentifiers({
@@ -81,7 +89,10 @@ function deleteOwnershipInfosByOrder(order) {
 function deleteEventsByOrder(order) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: order.orderNumber },
+            project: { id: { $eq: order.project.id } }
+        });
         const reservationForIds = acceptedOffers.filter((o) => {
             return (o.itemOffered.typeOf === factory.reservationType.EventReservation
                 || o.itemOffered.typeOf === factory.reservationType.BusReservation)

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

@@ -37,20 +37,18 @@ function onOrderDelivered(params) {
                     if (typeof (placeOrderTransaction === null || placeOrderTransaction === void 0 ? void 0 : placeOrderTransaction.id) === 'string') {
                         // 廃止(2023-12-07~)
                         // プロダクト登録プロセスロック解除(orderからproductIdを抽出する)
-                        // if (Array.isArray(params.order.acceptedOffers)) {
-                        //     const productIds4unlock = params.order.acceptedOffers
-                        //         .filter((o) => o.itemOffered.typeOf === factory.permit.PermitType.Permit
-                        //             && typeof o.itemOffered.issuedThrough?.id === 'string'
-                        //             && o.itemOffered.issuedThrough.id.length > 0)
-                        //         .map((o) => String((<factory.order.IPermit>o.itemOffered).issuedThrough?.id));
-                        //     await Promise.all(productIds4unlock.map(async (productId) => {
-                        //         await processUnlockRegisterMembershipService({
-                        //             agent: { id: String(params.order.customer.id) },
-                        //             product: { id: productId },
-                        //             purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
-                        //         })(repos);
-                        //     }));
-                        // }
+                        // const productIds4unlock = params.order.acceptedOffers
+                        //     .filter((o) => o.itemOffered.typeOf === factory.permit.PermitType.Permit
+                        //         && typeof o.itemOffered.issuedThrough?.id === 'string'
+                        //         && o.itemOffered.issuedThrough.id.length > 0)
+                        //     .map((o) => String((<factory.order.IPermit>o.itemOffered).issuedThrough?.id));
+                        // await Promise.all(productIds4unlock.map(async (productId) => {
+                        //     await processUnlockRegisterMembershipService({
+                        //         agent: { id: String(params.order.customer.id) },
+                        //         product: { id: productId },
+                        //         purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id }
+                        //     })(repos);
+                        // }));
                     }
                 }
                 catch (error) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -11,13 +11,19 @@ declare function getOrderWithToken(params: {
 }): Promise<IOrderWithToken>;
 declare function createInformTasks(order: IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
 declare function createConfirmReservationActionObject4COAByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>[];
 declare function createConfirmRegisterServiceActionObjectByOrder(params: {
-    order: factory.order.IOrder;
+    order: factory.order.IOrder & {
+        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    };
 }): factory.action.interact.confirm.registerService.IObject[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 export { IExternalOrder, getOrderWithToken, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };

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

@@ -115,17 +115,15 @@ function creteOrder4inform(order) {
         }) }, (typeof order.token === 'string') ? { token: order.token } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
 function createConfirmReservationActionObject4ChevreByOrder(params) {
-    const chevreReservationNumbers = (Array.isArray(params.order.acceptedOffers))
-        ? params.order.acceptedOffers.filter((o) => {
-            var _a;
-            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
-                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
-        })
-            .map((o) => {
-            return o.itemOffered.reservationNumber;
-        })
-        : [];
+    const chevreReservationNumbers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
+    })
+        .map((o) => {
+        return o.itemOffered.reservationNumber;
+    });
     return [...new Set(chevreReservationNumbers)].map((reservationNumber) => {
         return {
             potentialActions: {
@@ -145,13 +143,11 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
 exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
 function createConfirmReservationActionObject4COAByOrder(params) {
     // COA予約のみ
-    const coaReservationOffers = (Array.isArray(params.order.acceptedOffers))
-        ? params.order.acceptedOffers.filter((o) => {
-            var _a;
-            return o.itemOffered.typeOf === factory.reservationType.EventReservation
-                && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
-        })
-        : [];
+    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
+        var _a;
+        return o.itemOffered.typeOf === factory.reservationType.EventReservation
+            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
+    });
     const coaReservationNumbers = [...new Set(coaReservationOffers
             .map((o) => {
             return o.itemOffered.reservationNumber;
@@ -220,14 +216,6 @@ exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservati
 function createConfirmRegisterServiceActionObjectByOrder(params) {
     // いったん保留
     const chevreTransactionNumbers = [];
-    // const chevreReservationNumbers: string[] = (Array.isArray(params.order.acceptedOffers))
-    //     ? params.order.acceptedOffers.filter((o) => {
-    //         return o.itemOffered.typeOf === factory.permit.PermitType.Permit;
-    //     })
-    //         .map((o) => {
-    //             return (<factory.order.IPermit>o.itemOffered).identifier;
-    //         })
-    //     : [];
     return [...new Set(chevreTransactionNumbers)].map((transactionNumber) => {
         return {
             endDate: params.order.orderDate,

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

@@ -75,7 +75,6 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
         name: order.seller.name
     };
     // 注文アイテムから返却アクションを作成する
-    // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
     for (const reservationNumber of order.reservationNumbers) {
         // const reservation = acceptedOffer.itemOffered;
         // 予約番号ごとに返却アクションを作成する

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

@@ -162,8 +162,8 @@ function placeOrderWithoutTransaction(params) {
             throw error;
         }
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
-        // 経理レポートを保管
-        yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
+        // 経理レポートを保管は外部注文の場合保留(2023-12-08~)
+        // await createAccountingReportIfNotExist(order)({ accountingReport: repos.accountingReport });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;

package/lib/chevre/service/order/sendOrder.d.ts

@@ -1,3 +1,4 @@
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
@@ -5,6 +6,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
 type ISendOperation<T> = (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;

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

@@ -76,7 +76,12 @@ function sendOrder(params) {
             let ownershipInfos;
             try {
                 // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order });
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
+                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                            orderNumber: { $eq: order.orderNumber },
+                            project: { id: { $eq: order.project.id } }
+                        }) })
+                });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -38,17 +38,6 @@ function verifyToken4reservation(params) {
                     default:
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
-                // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                // const reservationExistsInOrder = acceptedOffers.some((offer) => {
-                //     return (
-                //         offer.itemOffered.typeOf === factory.reservationType.EventReservation
-                //         || offer.itemOffered.typeOf === factory.reservationType.BusReservation
-                //     )
-                //         && offer.itemOffered.id === params.reservationId;
-                // });
-                // if (!reservationExistsInOrder) {
-                //     throw new factory.errors.NotFound('AcceptedOffer');
-                // }
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);

package/lib/chevre/service/task/deleteTransaction.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 assetTransaction_1 = require("../../repo/assetTransaction");
@@ -26,6 +27,7 @@ const TransactionService = require("../transaction");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield TransactionService.deleteTransaction(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

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

@@ -64,25 +64,6 @@ function onAuthorizationCreated(params) {
                     reservationForIds = yield repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationFor.id');
-                    // const order: Pick<factory.order.IOrder, 'acceptedOffers'> = await repos.order.findByOrderNumber(
-                    //     {
-                    //         orderNumber,
-                    //         project: { id: params.project.id },
-                    //         inclusion: ['acceptedOffers'],
-                    //         exclusion: []
-                    //     }
-                    // );
-                    // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                    // reservationNumbers = acceptedOffers
-                    //     .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                    //         || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                    //     .map((o) => (<factory.order.IReservation>o.itemOffered).reservationNumber);
-                    // reservationNumbers = [...new Set(reservationNumbers)];
-                    // reservationForIds = acceptedOffers
-                    //     .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                    //         || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                    //     .map((o) => String((<factory.order.IReservation>o.itemOffered).reservationFor.id));
-                    // reservationForIds = [...new Set(reservationForIds)];
                 }
                 break;
             case 'OwnershipInfo':

package/lib/chevre/service/task/sendOrder.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 action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
@@ -24,17 +25,13 @@ function call(data) {
         // 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);
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            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/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/returnOrder.js

@@ -198,8 +198,12 @@ function fixOrders(params) {
         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 +295,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 +403,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 +615,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 +628,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) => {

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.15"
+  "version": "21.18.0-alpha.17"
 }