@chevre/domain 24.1.0-alpha.3 → 24.1.0-alpha.31

package/lib/chevre/service/assetTransaction/reserve/start/factory/createReservation.js

@@ -328,27 +328,17 @@ function createReservation(params) {
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory_1.factory.eventType.ScreeningEvent) {
         return {
-            // project: params.project, // 廃止(2024-04-08~)
             typeOf: factory_1.factory.reservationType.EventReservation,
             id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
             additionalProperty: params.additionalProperty,
-            // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
-            // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
             numSeats: 1,
             price: price4reservation,
             priceCurrency: factory_1.factory.priceCurrency.JPY,
-            // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
             reservedTicket: params.reservedTicket,
-            // underName: { // 廃止(2024-04-08~)
-            //     typeOf: params.agent.typeOf,
-            //     name: params.agent.name
-            // },
-            // checkedIn: false, // 廃止(2024-04-08~)
-            // attended: false, // 廃止(2024-04-08~)
             ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
             ...(Array.isArray(params.subReservation))
                 ? {
@@ -362,8 +352,6 @@ function createReservation(params) {
                     })
                 }
                 : undefined,
-            // reservationPackage保管に移行(2023-06-06~)
-            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
             ...(typeof params.programMembershipUsed?.identifier === 'string')
                 ? { programMembershipUsed: params.programMembershipUsed }
                 : undefined

package/lib/chevre/service/assetTransaction/reserve/start/factory/price.d.ts

@@ -14,4 +14,4 @@ export declare function createPrice(params: {
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: IAcceptedAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;
-}): factory.reservation.eventReservation.IPrice;
+}): factory.assetTransaction.reserve.IPrice;

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';

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

@@ -5,7 +5,12 @@ export type IOwnershipInfo = factory.ownershipInfo.IOwnershipInfo<factory.owners
  */
 export declare function createOwnershipInfosFromOrder(params: {
     order: Pick<factory.order.IOrder, 'orderDate' | 'project' | 'customer' | 'orderNumber' | 'seller'> & {
-        acceptedOffers: factory.order.IAcceptedOffer[];
+        acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+            /**
+             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+             */
+            priceSpecification?: factory.order.ITicketPriceSpecification;
+        })[];
     };
     offerIndexBase: number;
 }): IOwnershipInfo[];

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

@@ -43,7 +43,7 @@ function createOwnershipInfosFromOrder(params) {
                         ownershipInfo = (0, factory_2.createReservationOwnershipInfo)({
                             project: params.order.project,
                             ownedBy: ownedBy,
-                            acceptedOffer: { ...acceptedOffer, itemOffered },
+                            acceptedOffer,
                             ownedFrom: ownedFrom,
                             identifier: identifier,
                             acquiredFrom: acquiredFrom

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

@@ -6,9 +6,7 @@ export declare function createReservationOwnershipInfo(params: {
         id: string;
     };
     ownedBy: factory.ownershipInfo.IOwner[];
-    acceptedOffer: factory.order.IAcceptedOffer & {
-        itemOffered: factory.order.IReservation;
-    };
+    acceptedOffer: Pick<factory.order.IAcceptedOffer, 'itemOffered'>;
     ownedFrom: Date;
     identifier: string;
     acquiredFrom: factory.ownershipInfo.IAcquiredFrom;

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

@@ -19,31 +19,14 @@ function createReservationOwnershipInfo(params) {
     else {
         throw new factory_1.factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`); // eslint-disable-line @typescript-eslint/no-explicit-any
     }
-    // let bookingService = params.acceptedOffer.offeredThrough;
-    // if (bookingService === undefined) {
-    //     // デフォルトブッキングサービスはChevre
-    //     bookingService = {
-    //         typeOf: 'WebAPI',
-    //         identifier: factory.service.webAPI.Identifier.Chevre
-    //     };
-    // }
     let typeOfGood;
     if (itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
         typeOfGood = {
             typeOf: itemOffered.typeOf,
             id: itemOffered.id,
             reservationNumber: itemOffered.reservationNumber,
-            // bookingService: bookingService,
             ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
         };
-        // } else if (itemOffered.typeOf === factory.reservationType.BusReservation) {
-        //     typeOfGood = {
-        //         typeOf: itemOffered.typeOf,
-        //         id: itemOffered.id,
-        //         reservationNumber: itemOffered.reservationNumber,
-        //         bookingService: bookingService,
-        //         ...(typeof itemOffered.issuedThrough?.typeOf === 'string') ? { issuedThrough: itemOffered.issuedThrough } : undefined
-        //     };
     }
     else {
         throw new factory_1.factory.errors.NotImplemented(`itemOffered.typeOf '${itemOffered.typeOf}' not implemented`); // eslint-disable-line @typescript-eslint/no-explicit-any

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts

@@ -1,6 +1,6 @@
 import { SendGridCredentials } from '../../credentials/sendGrid';
 import type { TaskRepo } from '../../repo/task';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 /**
  * 中止されたタスクリストをEメールで通知する
  * add(2025-03-13~)
@@ -9,7 +9,7 @@ declare function notifyAbortedTasksByEmail(params: {
     dateAbortedGte: Date;
 }): (repos: {
     task: TaskRepo;
-}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
+}, settings: Settings, credentials: {
     sendGrid: SendGridCredentials;
 }) => Promise<void>;
 export { notifyAbortedTasksByEmail };

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js

@@ -15,7 +15,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:notification');
  */
 function notifyAbortedTasksByEmail(params) {
     return async (repos, settings, credentials) => {
-        const { abortedTasksWithoutReport } = settings;
+        const abortedTasksWithoutReport = await settings.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
             status: { $eq: factory_1.factory.taskStatus.Aborted },
             dateAborted: { $gte: params.dateAbortedGte },

package/lib/chevre/service/offer/any.d.ts

@@ -10,7 +10,12 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[];
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -23,7 +23,7 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
-    acceptedOffers: IResultAcceptedOffer[];
+    acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];
 }): number;
 declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
@@ -32,8 +32,11 @@ declare function acceptedOffers2authorizeResult(params: {
     ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
-export type IResultAcceptedOffer = factory.order.IAcceptedOffer & {
-    itemOffered: factory.order.IReservation;
+export type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    itemOffered: factory.order.IEventReservation;
+    offeredThrough: factory.offer.IOfferedThrough;
+    serialNumber: string;
+    priceSpecification?: factory.order.ITicketPriceSpecification;
 };
 declare function responseBody2acceptedOffers4result(params: {
     issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -302,7 +302,6 @@ function responseBody2acceptedOffers4result(params) {
  * 注文データの予約を生成する
  */
 function createReservation(params) {
-    // const { itemOffered, event, reservationFor } = params;
     const { itemOffered } = params;
     const event = params.reservationFor;
     let reservationItem;
@@ -367,19 +366,17 @@ function createReservation(params) {
         if (params.issuedThrough.typeOf !== factory_1.factory.product.ProductType.EventService) {
             throw new factory_1.factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory_1.factory.product.ProductType.EventService}`);
         }
+        const { additionalProperty, additionalTicketText, programMembershipUsed } = itemOffered;
         reservationItem = {
             typeOf: itemOffered.typeOf,
-            additionalProperty: itemOffered.additionalProperty,
-            additionalTicketText: itemOffered.additionalTicketText,
             id: itemOffered.id,
             issuedThrough: params.issuedThrough,
             reservationNumber: params.reservationNumber,
             reservationFor,
             reservedTicket,
-            // 使用メンバーシップがあれば追加
-            ...(typeof itemOffered.programMembershipUsed?.typeOf === 'string')
-                ? { programMembershipUsed: itemOffered.programMembershipUsed }
-                : undefined
+            ...((Array.isArray(additionalProperty)) && { additionalProperty }),
+            ...((typeof additionalTicketText === 'string') && { additionalTicketText }),
+            ...((typeof programMembershipUsed?.typeOf === 'string') && { programMembershipUsed }) // 使用メンバーシップがあれば追加
         };
     }
     else {

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/event';

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -67,6 +67,12 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
+    /**
+     * 価格仕様なしのacceptedOfferを採用するかどうか
+     * 実験的に導入
+     * 2026-005-19~
+     */
+    useAcceptedOfferNoPriceSpec?: boolean;
 }
 /**
  * 興行オファー承認

package/lib/chevre/service/offer/event/authorize.js

@@ -58,13 +58,21 @@ function authorize(params, options) {
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {
-                // if (params.options.useCreateOrderOnOfferAccepted) {
+                const useAcceptedOfferNoPriceSpec = options.useAcceptedOfferNoPriceSpec === true;
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: acceptedOffers4result
+                    acceptedOffers: acceptedOffers4result.map((acceptOffer4result) => {
+                        // support useAcceptedOfferNoPriceSpec(2026-05-19~)
+                        if (useAcceptedOfferNoPriceSpec) {
+                            const { priceSpecification: _priceSpecification, ...acceptOfferNoPriceSpec } = acceptOffer4result;
+                            return acceptOfferNoPriceSpec;
+                        }
+                        else {
+                            return acceptOffer4result;
+                        }
+                    })
                 })(repos);
-                // }
             }
         }
         catch (error) {

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../../repo/setting/integration';
 import type { ActionRepo } from '../../../../repo/action';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -1,6 +1,6 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ActionRepo } from '../../../repo/action';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -1,6 +1,6 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { ActionRepo } from '../../../repo/action';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -21,9 +21,7 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
 export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
 };
-type IResultAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'itemOffered'> & {
-    itemOffered: factory.order.ICOAEventReservation;
-};
+type IResultAcceptedOffer = factory.order.ICOAAcceptedOffer;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */

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

@@ -1,7 +1,5 @@
 import { AccountingReportRepo } from '../../repo/accountingReport';
 import { factory } from '../../factory';
-export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'customer' | 'confirmationNumber' | 'paymentMethods' | 'orderedItem' | 'price' | 'priceCurrency' | 'seller' | 'broker' | 'typeOf' | 'orderDate'> & {
-    acceptedOffers: factory.order.IAcceptedOffer[];
-}): (repos: {
+export declare function createAccountingReportIfNotExist(params: Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'project' | 'paymentMethods' | 'seller' | 'typeOf' | 'orderDate'> & {}): (repos: {
     accountingReport: AccountingReportRepo;
 }) => Promise<void>;

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

@@ -19,84 +19,79 @@ function createAccountingReportIfNotExist(params) {
 }
 // 最適化(2023-06-30~)
 function createOrder4report(params) {
-    if (!Array.isArray(params.acceptedOffers)) {
-        throw new factory_1.factory.errors.ArgumentNull('order.acceptedOffers');
-    }
-    const numItems = params.acceptedOffers.length;
-    // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
-    const acceptedOffers = (Array.isArray(params.acceptedOffers))
-        ? params.acceptedOffers.map((o) => {
-            if (o.itemOffered.typeOf === factory_1.factory.reservationType.EventReservation) {
-                let itemOffered = o.itemOffered;
-                const reservationFor = itemOffered.reservationFor;
-                itemOffered = {
-                    ...itemOffered,
-                    reservationFor: {
-                        ...reservationFor,
-                        ...(reservationFor.doorTime !== undefined)
-                            ? {
-                                doorTime: (0, moment_timezone_1.default)(reservationFor.doorTime)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.endDate !== undefined)
-                            ? {
-                                endDate: (0, moment_timezone_1.default)(reservationFor.endDate)
-                                    .toDate()
-                            }
-                            : undefined,
-                        ...(reservationFor.startDate !== undefined)
-                            ? {
-                                startDate: (0, moment_timezone_1.default)(reservationFor.startDate)
-                                    .toDate()
-                            }
-                            : undefined
-                    }
-                };
-                return {
-                    ...o,
-                    itemOffered
-                };
-            }
-            else {
-                return o;
-            }
-        })
-        : [];
-    const customer = {
-        // ...createMaskedCustomer(params),
-        id: params.customer.id,
-        typeOf: params.customer.typeOf,
-        additionalProperty: (Array.isArray(params.customer.additionalProperty))
-            ? params.customer.additionalProperty
-            : [],
-        identifier: (Array.isArray(params.customer.identifier))
-            ? params.customer.identifier
-            : []
-    };
+    // if (!Array.isArray(params.acceptedOffers)) {
+    //     throw new factory.errors.ArgumentNull('order.acceptedOffers');
+    // }
+    // const numItems: number = params.acceptedOffers.length;
+    // // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
+    // const acceptedOffers = (Array.isArray(params.acceptedOffers))
+    //     ? params.acceptedOffers.map((o) => {
+    //         if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+    //             let itemOffered = o.itemOffered;
+    //             const reservationFor = itemOffered.reservationFor;
+    //             itemOffered = {
+    //                 ...itemOffered,
+    //                 reservationFor: {
+    //                     ...reservationFor,
+    //                     ...(reservationFor.doorTime !== undefined)
+    //                         ? {
+    //                             doorTime: moment(reservationFor.doorTime)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.endDate !== undefined)
+    //                         ? {
+    //                             endDate: moment(reservationFor.endDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined,
+    //                     ...(reservationFor.startDate !== undefined)
+    //                         ? {
+    //                             startDate: moment(reservationFor.startDate)
+    //                                 .toDate()
+    //                         }
+    //                         : undefined
+    //                 }
+    //             } as factory.order.IReservation;
+    //             return {
+    //                 ...o,
+    //                 itemOffered
+    //             };
+    //         } else {
+    //             return o;
+    //         }
+    //     })
+    //     : [];
+    // const customer: factory.report.accountingReport.IOptimizedCustomer = {
+    //     id: params.customer.id,
+    //     typeOf: params.customer.typeOf,
+    //     additionalProperty: (Array.isArray(params.customer.additionalProperty))
+    //         ? params.customer.additionalProperty
+    //         : [],
+    //     identifier: (Array.isArray(params.customer.identifier))
+    //         ? params.customer.identifier
+    //         : []
+    // };
     return {
-        // ...params,
-        confirmationNumber: params.confirmationNumber,
         id: params.id,
         orderNumber: params.orderNumber,
-        orderedItem: params.orderedItem,
-        paymentMethods: params.paymentMethods,
-        price: params.price,
-        priceCurrency: params.priceCurrency,
-        seller: params.seller,
+        paymentMethods: params.paymentMethods.map(({ paymentMethodId }) => ({ paymentMethodId })),
+        seller: {
+            id: params.seller.id,
+            name: params.seller.name,
+            typeOf: params.seller.typeOf
+        },
         typeOf: params.typeOf,
-        customer,
         orderDate: (0, moment_timezone_1.default)(params.orderDate)
             .toDate(),
-        acceptedOffers,
-        numItems,
-        ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined
-        // ...(params.dateReturned !== null && params.dateReturned !== undefined)
-        //     ? {
-        //         dateReturned: moment(params.dateReturned)
-        //             .toDate()
-        //     }
-        //     : undefined
+        // confirmationNumber: params.confirmationNumber, // discontinue(2026-05-06~)
+        // price: params.price, // discontinue(2026-05-06~)
+        // priceCurrency: params.priceCurrency, // discontinue(2026-05-06~)
+        // customer, // discontinue(2026-05-06~)
+        // numItems, // discontinue(2026-05-06~)
+        // orderedItem: params.orderedItem, // discontinue(2026-05-06~)
+        // acceptedOffers, // discontinue(2026-05-06~)
+        // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined // discontinue(2026-05-06~)
     };
 }
 function createAccountingReport(params) {

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,36 +94,13 @@ 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] } }
             }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });
         }
     };
 }
-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/onPayTransactionConfirmed.d.ts

@@ -5,7 +5,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onReserveTransactionConfirmed.d.ts

@@ -5,7 +5,7 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IOnReserveTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;