@chevre/domain 24.1.0-alpha.2 → 24.1.0-alpha.20

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = deleteOrder;
-const factory_1 = require("../delivery/factory");
-const factory_2 = require("../../factory");
+// import { createOwnershipInfosFromOrder } from '../delivery/factory';
+const factory_1 = require("../../factory");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -20,24 +20,24 @@ function deleteOrder(params) {
             return;
         }
         if (typeof order.id !== 'string') {
-            throw new factory_2.factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
+            throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${params.object.orderNumber}`);
         }
         // 注文アイテムの予約を削除
         await deleteReservationsByOrder(order)(repos);
-        // 所有権削除
-        try {
-            await deleteOwnershipInfosByOrder(order)(repos);
-        }
-        catch (error) {
-            console.error('deleteOwnershipInfosByOrder throws', error);
-        }
+        // 所有権は所有期限でcleanされるので、注文削除時連動はひとまず廃止(2026-05-17~)
+        // // 所有権削除
+        // try {
+        //     await deleteOwnershipInfosByOrder(order)(repos);
+        // } catch (error) {
+        //     console.error('deleteOwnershipInfosByOrder throws', error);
+        // }
         // 経理レポート削除
         await repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
         // メモ削除(2024-02-15~)
         await repos.note.deleteNotesByAbout({
             about: {
                 id: order.id,
-                typeOf: factory_2.factory.order.OrderType.Order
+                typeOf: factory_1.factory.order.OrderType.Order
             }
         });
         // 注文削除
@@ -49,7 +49,7 @@ function deleteOrder(params) {
 function deletePersonIfNecessary(order) {
     return async (repos) => {
         // 代理注文を除く
-        const isCustomerPerson = order.customer.typeOf === factory_2.factory.personType.Person
+        const isCustomerPerson = order.customer.typeOf === factory_1.factory.personType.Person
             && typeof order.broker?.typeOf !== 'string';
         if (isCustomerPerson) {
             const ordersByPerson = await repos.order.projectFields({
@@ -60,12 +60,12 @@ function deletePersonIfNecessary(order) {
             if (ordersByPerson.length === 0) {
                 const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
                 if (typeof setting?.userPoolIdNew !== 'string') {
-                    throw new factory_2.factory.errors.NotFound('setting.userPoolIdNew');
+                    throw new factory_1.factory.errors.NotFound('setting.userPoolIdNew');
                 }
                 const deletePersonTask = {
-                    project: { typeOf: factory_2.factory.organizationType.Project, id: order.project.id },
-                    name: factory_2.factory.taskName.DeletePerson,
-                    status: factory_2.factory.taskStatus.Ready,
+                    project: { typeOf: factory_1.factory.organizationType.Project, id: order.project.id },
+                    name: factory_1.factory.taskName.DeletePerson,
+                    status: factory_1.factory.taskStatus.Ready,
                     runsAt: new Date(),
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
@@ -74,8 +74,8 @@ function deletePersonIfNecessary(order) {
                         id: order.customer.id,
                         agent: {
                             id: order.project.id,
-                            typeOf: factory_2.factory.organizationType.Project,
-                            name: factory_2.factory.organizationType.Project
+                            typeOf: factory_1.factory.organizationType.Project,
+                            name: factory_1.factory.organizationType.Project
                         },
                         physically: true,
                         userPoolId: setting.userPoolIdNew,
@@ -94,7 +94,7 @@ function deleteReservationsByOrder(order) {
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
             acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory_2.factory.reservationType.EventReservation] } }
+            // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
         });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
@@ -103,27 +103,3 @@ function deleteReservationsByOrder(order) {
         }
     };
 }
-function deleteOwnershipInfosByOrder(order) {
-    return async (repos) => {
-        const now = new Date();
-        const ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-            order: {
-                ...order,
-                acceptedOffers: await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                    orderNumber: { $eq: order.orderNumber },
-                    project: { id: { $eq: order.project.id } }
-                })
-            },
-            offerIndexBase: 0
-        });
-        const ownershipIdentifiers = ownershipInfos.map((o) => String(o.identifier));
-        if (ownershipIdentifiers.length > 0) {
-            await repos.ownershipInfo.deleteExpiredByIdentifiers({
-                project: { id: order.project.id },
-                identifiers: ownershipIdentifiers,
-                // 所有期限切れのもの(ownedThroughの存在しないものは削除してはいけない)
-                ownedThrough: { $lte: now }
-            });
-        }
-    };
-}

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js

@@ -55,28 +55,26 @@ function paymentDue2Processing(params) {
             }
         }
         if (params.useOnOrderStatusChanged) {
-            // 全acceptedOffersを検索(2023-12-08~)
-            // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber(
-            //     {
-            //         orderNumber: { $eq: order.orderNumber },
-            //         project: { id: { $eq: params.project.id } }
-            //     },
-            //     ['itemOffered', 'offeredThrough']
-            // );
             const { numAcceptedOffers } = await repos.acceptedOffer.countByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
-            const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+            // const itemOfferedTypeOfs = await repos.acceptedOffer.distinctValues(
+            //     { orderNumber: { $in: [params.orderNumber] } },
+            //     'acceptedOffers.itemOffered.typeOf'
+            // ) as factory.order.IItemOffered['typeOf'][];
             const serialNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
             const offeredThroughIdentifier = (await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
-            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 'itemOfferedTypeOfs:', itemOfferedTypeOfs, 'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
+            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 
+            // 'itemOfferedTypeOfs:', itemOfferedTypeOfs,
+            'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
             await (0, onOrderStatusChanged_1.onOrderProcessing)({
                 order: {
                     ...order,
                     // acceptedOffers,
                     numAcceptedOffers,
-                    itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    // itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    itemOfferedTypeOf: factory_1.factory.reservationType.EventReservation, // EventReservationしか存在しないので固定でよし
                     serialNumbers,
                     offeredThroughIdentifier,
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する

package/lib/chevre/service/order/placeOrder/factory/orderedItem.d.ts

@@ -3,6 +3,6 @@ import { factory } from '../../../../factory';
  * 受入オファーを注文アイテムに変換する
  */
 declare function acceptedOffers2orderedItem(params: {
-    eventReservationAcceptedOffers: factory.order.IAcceptedOffer[];
+    eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[];
 }): factory.order.IOrderedItem[];
 export { acceptedOffers2orderedItem };

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

@@ -9,11 +9,6 @@ function acceptedOffers2orderedItem(params) {
     // 予約がある場合
     const { reservationOrderItems } = createReservationAcceptedOffers(params);
     // 通貨転送がある場合
-    // const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
-    // プロダクトがある場合
-    // const { productOrderItems } = createProductItems(params);
-    // return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
-    // return [...reservationOrderItems, ...productOrderItems];
     return reservationOrderItems;
 }
 function createReservationAcceptedOffers(params) {

package/lib/chevre/service/order/placeOrder/factory.d.ts

@@ -1,7 +1,7 @@
 import type { IPlacingOrder } from '../../../repo/orderInTransaction';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
-type IOrderAcceptedOffer = factory.order.IAcceptedOffer;
+type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>;
 declare function createPaymentMethods(params: {
     authorizePaymentActions: Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[];
 }): {

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

@@ -94,10 +94,7 @@ function sendOrder(params) {
                 case factory_2.factory.personType.Person:
                     createOwnerships = true; // Personのみに限定(2026-03-15~)
                     break;
-                // case factory.creativeWorkType.WebApplication:
-                //     break;
                 default:
-                // createOwnerships = true;
             }
             try {
                 const offerIndexBase = (limit * (page - 1));

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

@@ -61,7 +61,8 @@ function confirmReservation(params) {
                             ...rawReservation.reservedTicket,
                             ticketType: ticketTypeByTransaction
                         },
-                        reservationFor: reserveTransaction.object.reservationFor // reservationForは予約取引から参照する(2026-04-05~)
+                        reservationFor: reserveTransaction.object.reservationFor, // reservationForは予約取引から参照する(2026-04-05~)
+                        issuedThrough: reserveTransaction.object.issuedThrough // issuedThroughは予約取引から補完する(2026-05-08~)
                     };
                 });
                 confirmedReservations = confirmedReservations.map((r) => {
@@ -189,25 +190,24 @@ params, options) {
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         const subReservations = reserveTransaction.object.subReservation;
-                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        // const issuedThrough = reserveTransaction.object.issuedThrough;
                         if (Array.isArray(subReservations)
                             && typeof reservationFor?.typeOf === 'string'
-                            && typeof issuedThrough?.typeOf === 'string') {
-                            // confirmManyに変更(2023-06-13~)
-                            const confirmManyIfNotExistResult = await repos.reservation.confirmManyIfNotExist({
+                        // && typeof issuedThrough?.typeOf === 'string'
+                        ) {
+                            await repos.reservation.confirmManyIfNotExist({
                                 bookingTime: reserveTransaction.startDate, // startDateに設定(2024-04-08~)
                                 project: { id: reserveTransaction.project.id },
                                 provider: (typeof reserveTransaction.object.provider?.id === 'string')
                                     ? reserveTransaction.object.provider
                                     : { id: reserveTransaction.agent.id, typeOf: factory_1.factory.organizationType.Corporation },
                                 subReservation: subReservations,
-                                issuedThrough,
+                                // issuedThrough,
                                 reservationFor,
                                 reservationNumber: reserveTransaction.object.reservationNumber,
                                 underName,
                                 broker: reserveTransaction.object.broker
                             });
-                            debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
                         }
                     }
                     else {

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

@@ -21,7 +21,8 @@ function createCancelPendingReservationAction(params) {
         const reservationPackage = {
             typeOf: factory_1.factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
-            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            // discontinue reservationFor(2026-05-09~)
+            // reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
                 : factory_1.factory.reservationStatusType.ReservationPending

package/lib/chevre/service/reserve/findByCode.d.ts

@@ -5,7 +5,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
+        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };

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

@@ -39,7 +39,7 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, ['itemOffered'])).shift();
+                    })).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

package/lib/chevre/service/reserve/findReservations.d.ts

@@ -5,11 +5,14 @@ import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../
  * 予約検索レスポンスとしての予約
  * 予約ドキュメントに予約取引の情報を補完する
  */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'priceCurrency' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough' | 'numSeats'> & {
+    price?: factory.assetTransaction.reserve.IPrice;
+    priceCurrency?: factory.priceCurrency.JPY;
     underName?: factory.assetTransaction.reserve.IUnderName;
     reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;
+    issuedThrough?: factory.assetTransaction.reserve.IIssuedThrough;
+    numSeats?: number;
 };
 /**
  * 予約を検索する

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

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findReservations = findReservations;
 const debug_1 = __importDefault(require("debug"));
+// import { isDeepStrictEqual } from 'util';
+const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
 /**
  * 予約を検索する
@@ -18,9 +20,12 @@ function findReservations(params, options) {
         }
         else {
             const requirePrice = Object.keys(inclusion).includes('price');
+            const requirePriceCurrency = Object.keys(inclusion).includes('priceCurrency');
             const requireUnderName = Object.keys(inclusion).includes('underName');
             const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
             const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
+            const requireIssuedThrough = Object.keys(inclusion).includes('issuedThrough');
+            const requireNumSeats = Object.keys(inclusion).includes('numSeats');
             const reservationIds = rawReservations.map(({ id }) => id);
             const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
                 ids: reservationIds
@@ -33,6 +38,8 @@ function findReservations(params, options) {
                 const underNameByTransaction = subReservationByTransaction?.underName;
                 const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
                 const reservationForByTransaction = subReservationByTransaction?.reservationFor;
+                const issuedThroughByTransaction = subReservationByTransaction?.issuedThrough;
+                const numSeatsByTransaction = subReservationByTransaction?.numSeats;
                 // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
                 // // 予約取引から参照した属性と全く等しいはず
                 // if (requirePrice) {
@@ -48,10 +55,11 @@ function findReservations(params, options) {
                 //         console.error('reservationForMatched: false!!!', reservation.id);
                 //     }
                 // }
-                const { reservationFor, reservedTicket, ...rawReservation4result } = reservation; // eslint-disable-line @typescript-eslint/no-unused-vars
+                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
                 return {
                     ...rawReservation4result, // 予約ドキュメントはそのまま返す
                     ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
+                    ...(requirePriceCurrency) ? { priceCurrency: factory_1.factory.priceCurrency.JPY } : undefined, // 必要あらば固定値を補完(2026-05-08~)
                     ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
                     ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
                         ? {
@@ -63,7 +71,13 @@ function findReservations(params, options) {
                         : undefined,
                     ...(requireReservationFor && reservationForByTransaction !== undefined)
                         ? { reservationFor: reservationForByTransaction }
-                        : undefined, // reservationForがあれば上書き(2026-04-06~)
+                        : undefined, // reservationForがあれば上書き(2026-04-06~),
+                    ...(requireIssuedThrough && issuedThroughByTransaction !== undefined)
+                        ? { issuedThrough: issuedThroughByTransaction }
+                        : undefined, // issuedThroughがあれば上書き(2026-05-09~)
+                    ...(requireNumSeats && numSeatsByTransaction !== undefined)
+                        ? { numSeats: numSeatsByTransaction }
+                        : undefined, // issuedThroughがあれば上書き(2026-05-09~)
                 };
             });
         }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -5,13 +5,14 @@ import { factory } from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
+    price?: factory.assetTransaction.reserve.IPrice;
     underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
     reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
-        ticketType: factory.reservation.eventReservation.ITicketType;
+        ticketType: factory.assetTransaction.reserve.ITicketType;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
 /**
  * 予約確定後のアクション

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -98,22 +98,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { additionalProperty, additionalTicketText, 
-                // attended, checkedIn,
-                id, modifiedTime, 
-                // numSeats,
-                price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
                 return {
-                    // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
                     reservedTicket,
                     ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
-                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
                     ...(price !== undefined) ? { price } : undefined,
                     ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                     ...(Array.isArray(subReservation)) ? { subReservation } : undefined

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

@@ -11,14 +11,18 @@ function searchByOrder(params) {
             page: params.page,
             project: { id: { $eq: params.project.id } },
             orderNumber: { $eq: params.orderNumber },
-            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
-        }, ['itemOffered']);
+            acceptedOffers: {
+                itemOffered: {
+                // typeOf: { $in: [reservationType] }
+                }
+            }
+        });
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;
             }
             else {
-                // 検索条件にreservationTypeを含めているので、ありえないケース
+                // EventReservationしか存在しないので、ありえないケース
                 throw new factory_1.factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -20,7 +20,7 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: Pick<factory.action.consume.use.reservation.ITicketAsInstrument, 'ticketToken'> | factory.action.consume.use.reservation.IInstrument[];
+    instrument: factory.action.consume.use.reservation.IInstrument[];
     location?: {
         identifier?: string;
     };

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

@@ -16,7 +16,6 @@ function useReservation(params) {
     return async (repos) => {
         const reservationId = params.object.id;
         let ticketToken;
-        // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
                 if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
@@ -24,9 +23,8 @@ function useReservation(params) {
                     break;
                 }
             }
-        }
-        else {
-            ticketToken = params?.instrument?.ticketToken;
+            // } else {
+            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -34,36 +32,34 @@ function useReservation(params) {
         // 予約検索
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: [
+                // 'issuedThrough',
+                // 'reservedTicket',
+                'project', 'reservationFor', 'reservationNumber', 'typeOf'
+            ]
         });
-        if (typeof reservation.issuedThrough.id !== 'string') {
-            // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-            throw new factory_1.factory.errors.Internal('reservation.issuedThrough.id must be string');
-        }
-        const { reservedTicket } = reservation;
-        // optimize(2024-05-07~)
+        // if (typeof reservation.issuedThrough.id !== 'string') {
+        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
+        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+        // }
+        // const { reservedTicket } = reservation;
+        // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: {
-                typeOf: reservedTicket.typeOf,
-                // discontinue ticketType(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     typeOf: reservedTicket.ticketType.typeOf,
-                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                // },
-                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            }
+            // discontinue issuedThrough,reservedTicket(2026-05-06~)
+            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            // reservedTicket: {
+            //     typeOf: reservedTicket.typeOf,
+            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
+            // }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
             {
-                // ...(typeof token === 'string') ? { token } : undefined, // discontinue token(2024-10-03~)
                 ...(typeof ticketToken === 'string') ? { ticketToken } : undefined,
                 typeOf: 'Ticket'
             },

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

@@ -137,7 +137,7 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, ['itemOffered', 'offeredThrough']);
+        });
         return {
             ...order,
             acceptedOffers

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

@@ -27,9 +27,12 @@ function createAccountingReport(params) {
             orderNumber: data.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
-                'orderNumber', 'project', 'customer', 'confirmationNumber',
-                'paymentMethods', 'orderedItem', 'price', 'priceCurrency', 'seller', 'broker', 'typeOf', 'orderDate'
-            ] // explicit projection(2024-07-25~)
+                'orderNumber', 'project', 'paymentMethods', 'seller', 'typeOf', 'orderDate'
+                // 'customer', 'confirmationNumber',
+                // 'orderedItem',
+                // 'broker',
+                // 'price', 'priceCurrency',
+            ]
         });
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -37,7 +40,6 @@ function createAccountingReport(params) {
             orderDate: order.orderDate
         };
         const actionObject = {
-            // ...params,
             mainEntity: { orderNumber: simpleOrder.orderNumber },
             typeOf: 'Report'
         };
@@ -51,13 +53,9 @@ function createAccountingReport(params) {
         };
         const action = await repos.action.start(actionAttributes);
         try {
-            const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: data.object.mainEntity.orderNumber },
-                project: { id: { $eq: params.project.id } }
-            });
             await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
                 ...order,
-                acceptedOffers
+                // acceptedOffers
             })(repos);
         }
         catch (error) {

package/lib/chevre/service/task/payment/payByTask.js

@@ -71,13 +71,13 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
                     itemOffered: {
-                        typeOf: { $in: [factory_1.factory.reservationType.EventReservation] },
+                        // typeOf: { $in: [factory.reservationType.EventReservation] }, // EventReservationしか存在しないので不要(2026-05-12~)
                         // movieTicketsに結合されたイベントID,座席コードで絞る
                         reservationFor: { id: { $in: [reservationForId] } },
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
                     }
                 }
-            }, ['itemOffered', 'priceSpecification']);
+            });
         }
         return {
             ...orderWithoutAcceptedOffers,

package/lib/chevre/service/task/useReservation.d.ts

@@ -1,6 +1,6 @@
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.useReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.useReservation.ITask, IExecutableTaskKeys>): IOperationExecute<void>;

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

@@ -12,25 +12,15 @@ const useReservation_1 = require("../reserve/useReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
-        let instrument;
-        // support array(2025-02-17~)
-        if (Array.isArray(data.instrument)) {
-            instrument = data.instrument;
-        }
-        else {
-            if (data.instrument?.typeOf === 'Ticket') {
-                instrument = [data.instrument];
-            }
-        }
+        const { data, project } = params;
         await (0, useReservation_1.useReservation)({
-            project: data.project,
+            project,
             agent: data.agent,
             object: data.object,
-            instrument,
-            // ...(typeof data.instrument?.typeOf === 'string') ? { instrument: data.instrument } : undefined,
-            ...(typeof data.location?.typeOf === 'string') ? { location: data.location } : undefined
+            instrument: data.instrument,
+            ...(typeof data.location?.identifier === 'string') ? { location: data.location } : undefined
         })({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -39,8 +29,6 @@ function call(data) {
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }