@chevre/domain 24.1.0-alpha.6 → 24.1.0-alpha.60

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

@@ -12,11 +12,7 @@ const searchOffersByIds_1 = require("./searchOffersByIds");
  * 興行オファー承認
  */
 function authorize(params, options) {
-    return async (repos, settings
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => {
+    return async (repos, settings) => {
         const { noOfferSpecified } = options;
         const { transaction, event } = await validateCreateRequest(params)(repos);
         const { acceptedOffers, ticketOffers, unitPriceOffers } = await validateAcceptedOffers({
@@ -51,20 +47,27 @@ function authorize(params, options) {
                 validateEventOfferPeriod: params.validateEventOfferPeriod === true,
                 orderNumber,
                 instrument: params.instrument,
-                // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
-                // stockHoldUntilDaysAfterEventEnd,
                 ...(typeof params.object.broker?.typeOf === 'string') ? { broker: params.object.broker } : undefined
             }, options)(repos, settings);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
-            // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {
-                // if (params.options.useCreateOrderOnOfferAccepted) {
+                const minimizedAcceptedOffers = acceptedOffers4result.map((acceptOffer4result, offerIndex) => {
+                    const { priceSpecification: _priceSpecification, itemOffered, name: _name, // 名称非保管に対応(2026-06-11~)
+                    ...acceptOfferNoPriceSpec } = acceptOffer4result;
+                    const includeReservationFor = (offerIndex === 0); // ひとつめのオファーのみ含む(2026-06-04~)
+                    return {
+                        ...acceptOfferNoPriceSpec,
+                        // ...((!useAcceptedOfferNoName) && { name }), // 名称非保管に対応(2026-06-09~)
+                        itemOffered: minimizeItemOffered(itemOffered, {
+                            includeReservationFor
+                        })
+                    };
+                });
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: acceptedOffers4result
+                    acceptedOffers: minimizedAcceptedOffers
                 })(repos);
-                // }
             }
         }
         catch (error) {
@@ -81,6 +84,42 @@ function authorize(params, options) {
         return { id: action.id, result };
     };
 }
+/**
+ * 注文ドキュメントに保管するitemOfferedを最小化する
+ * 2026-05-25~
+ */
+function minimizeItemOffered(itemOffered, options) {
+    const { includeReservationFor } = options;
+    const { id, reservationNumber, typeOf, reservationFor } = itemOffered;
+    const minimizedReservation = {
+        id: reservationFor.id,
+        typeOf: reservationFor.typeOf,
+        location: {
+            branchCode: reservationFor.location.branchCode,
+            typeOf: reservationFor.location.typeOf
+        },
+        superEvent: {
+            id: reservationFor.superEvent.id,
+            typeOf: reservationFor.superEvent.typeOf,
+            location: {
+                branchCode: reservationFor.superEvent.location.branchCode,
+                typeOf: reservationFor.superEvent.location.typeOf
+            },
+            workPerformed: {
+                identifier: reservationFor.superEvent.workPerformed.identifier,
+                typeOf: reservationFor.superEvent.workPerformed.typeOf
+            }
+        },
+        startDate: reservationFor.startDate,
+        endDate: reservationFor.endDate
+    };
+    return {
+        id,
+        reservationNumber,
+        typeOf,
+        ...((includeReservationFor) && { reservationFor: minimizedReservation })
+    };
+}
 function validateCreateRequest(params) {
     return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
@@ -190,51 +229,6 @@ function validateAcceptedOffers(params) {
                 })();
             }))
             : [];
-        // reserveTransaction.startへ処理を移行(2024-07-03~)
-        // オファーIDごとにオファー適用条件を確認
-        // offerIds.forEach((offerId) => {
-        //     const acceptedOffersByOfferId = acceptedOffers.filter((o) => o.id === offerId);
-        //     const numAcceptedOffersByOfferId = acceptedOffersByOfferId.length;
-        //     let referenceQuantityValue = 1;
-        //     // 単価仕様を取り出す
-        //     const unitPriceSpec = acceptedOffersByOfferId[0].priceSpecification.priceComponent.find(
-        //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification && (!Array.isArray(spec.appliesToAddOn))
-        //     );
-        //     // 単価仕様は必ず存在するはず
-        //     if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
-        //         throw new factory.errors.Internal(`unitPriceSpec of the offer '${offerId}' not found`);
-        //     }
-        //     const unitPriceSpecReferenceQuantityValue = unitPriceSpec.referenceQuantity?.value;
-        //     if (typeof unitPriceSpecReferenceQuantityValue === 'number') {
-        //         referenceQuantityValue = unitPriceSpecReferenceQuantityValue;
-        //     }
-        //     // アイテム数が適用単位要件を満たしていなければエラー
-        //     if (numAcceptedOffersByOfferId % referenceQuantityValue !== 0) {
-        //         throw new factory.errors.Argument(
-        //             'acceptedOffers',
-        //             `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`
-        //         );
-        //     }
-        //     // 適用数量要件を満たしていなければエラー
-        //     const maxValue = unitPriceSpec.eligibleQuantity?.maxValue;
-        //     if (typeof maxValue === 'number') {
-        //         if (numAcceptedOffersByOfferId > maxValue) {
-        //             throw new factory.errors.Argument(
-        //                 'acceptedOffers',
-        //                 `Number of offer:${offerId} must be less than or equal to ${maxValue}`
-        //             );
-        //         }
-        //     }
-        //     const minValue = unitPriceSpec.eligibleQuantity?.minValue;
-        //     if (typeof minValue === 'number') {
-        //         if (numAcceptedOffersByOfferId < minValue) {
-        //             throw new factory.errors.Argument(
-        //                 'acceptedOffers',
-        //                 `Number of offer:${offerId} must be more than or equal to ${minValue}`
-        //             );
-        //         }
-        //     }
-        // });
         return { acceptedOffers, ticketOffers, unitPriceOffers };
     };
 }
@@ -246,27 +240,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         if (offer === undefined) {
             throw new factory_1.factory.errors.NotFound('Ticket Offer', `Ticket Offer ${offerWithoutDetail.id} not found`);
         }
-        // // ポイント特典入金先の指定があれば入金識別子を発行
-        // const pointAward = createPointAwardByOfferWithoutDetail({
-        //     offerWithoutDetail,
-        //     transaction: params.transaction
-        // });
         const acceptedAppliesToMovieTicket = offerWithoutDetail.priceSpecification?.appliesToMovieTicket;
-        // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
-        // const priceSpecification: IAcceptedOfferPriceSpecification = {
-        //     // 必要な属性のみに最適化(2024-04-09~)
-        //     // ...offer.priceSpecification,
-        //     typeOf: offer.priceSpecification.typeOf,
-        //     priceCurrency: offer.priceSpecification.priceCurrency,
-        //     // valueAddedTaxIncluded: offer.priceSpecification.valueAddedTaxIncluded,
-        //     priceComponent: offer.priceSpecification.priceComponent.map(({
-        //         name, accounting, id, priceCurrency, valueAddedTaxIncluded, ...necessaryComponentFields
-        //     }) => necessaryComponentFields),
-        //     // appliesToMovieTicket.identifierを連携する
-        //     ...(Array.isArray(acceptedAppliesToMovieTicket) || typeof acceptedAppliesToMovieTicket?.identifier === 'string')
-        //         ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
-        //         : undefined
-        // };
         const priceSpecification = {
             // appliesToMovieTicket.identifierを連携する
             ...(Array.isArray(acceptedAppliesToMovieTicket) || typeof acceptedAppliesToMovieTicket?.identifier === 'string')
@@ -292,7 +266,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         // itemOfferedServiceOutputを最適化(2024-04-08~)
         let itemOfferedServiceOutput;
         if (typeof serviceOutputByOfferWithoutDetail?.typeOf === 'string') {
-            const { typeOf, additionalProperty, additionalTicketText, programMembershipUsed, reservedTicket, subReservation } = serviceOutputByOfferWithoutDetail;
+            const { typeOf, additionalTicketText, programMembershipUsed, reservedTicket, subReservation } = serviceOutputByOfferWithoutDetail;
             let ticketedSeat;
             if (typeof reservedTicket?.ticketedSeat?.typeOf === 'string') {
                 ticketedSeat = {
@@ -306,36 +280,19 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 };
             }
             switch (typeOf) {
-                // case factory.reservationType.BusReservation:
-                //     const serviceOutputAsBusReservation: factory.assetTransaction.reserve.IBusReservatonAsItemOfferedServiceOutput = {
-                //         typeOf,
-                //         ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
-                //         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                //         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                //         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
-                //         ...(reservedTicket !== undefined) ? {
-                //             reservedTicket: {
-                //                 typeOf: 'Ticket',
-                //                 // チケット識別子指定拡張(2024-04-15~)
-                //                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                //                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
-                //             }
-                //         } : undefined
-                //     };
-                //     itemOfferedServiceOutput = serviceOutputAsBusReservation;
-                //     break;
                 case factory_1.factory.reservationType.EventReservation: {
                     const serviceOutputAsEventReservation = {
                         typeOf,
-                        ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                        // ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined, // 追加特性指定を廃止(2026-06-08~)
                         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
                         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
                         ...(reservedTicket !== undefined) ? {
                             reservedTicket: {
                                 typeOf: 'Ticket',
-                                // チケット識別子指定拡張(2024-04-15~)
-                                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+                                // チケット識別子のカスタム指定を廃止(2026-06-08~)
+                                // // チケット識別子指定拡張(2024-04-15~)
+                                // ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
                                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
                             }
                         } : undefined
@@ -351,15 +308,9 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         return {
             // オファーの中身を最適化する(必要最低限の情報のみに)
             id: String(offer.id),
-            // identifier: offer.identifier,
             priceSpecification,
-            // typeOf: offer.typeOf,
-            // priceCurrency: offer.priceCurrency,
             itemOffered: {
-                // typeOf: factory.product.ProductType.EventService,
                 ...(itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined,
-                // discontinue(2026-04-18~)
-                // ...(pointAward !== undefined) ? { pointAward } : undefined
             },
             addOn: acceptedAddOns,
             // 追加属性をマージ
@@ -367,9 +318,6 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
             ]
-            // ...(Array.isArray(offer.acceptedPaymentMethod)) // discontinue(2024-07-03~)
-            //     ? { acceptedPaymentMethod: offer.acceptedPaymentMethod }
-            //     : undefined
         };
     };
 }

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,5 +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' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'orderDate'> & {}): (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

@@ -62,32 +62,32 @@ function createOrder4report(params) {
     //         }
     //     })
     //     : [];
-    const customer = {
-        id: params.customer.id,
-        typeOf: params.customer.typeOf,
-        // additionalProperty: (Array.isArray(params.customer.additionalProperty))
-        //     ? params.customer.additionalProperty
-        //     : [], // discontinue(2026-05-06~)
-        // identifier: (Array.isArray(params.customer.identifier))
-        //     ? params.customer.identifier
-        //     : [] // discontinue(2026-05-06~)
-    };
+    // 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 {
-        confirmationNumber: params.confirmationNumber,
         id: params.id,
         orderNumber: params.orderNumber,
-        paymentMethods: params.paymentMethods,
-        price: params.price,
-        priceCurrency: params.priceCurrency,
+        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(),
+        // 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~)

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

@@ -13,7 +13,7 @@ import { factory } from '../../factory';
  * 冪等性を確保すること
  */
 declare function deleteOrder(params: {
-    object: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderDate' | 'orderNumber'>;
+    object: Pick<factory.order.IOrder, 'orderNumber'>;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;

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,
@@ -93,37 +93,10 @@ function deleteReservationsByOrder(order) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
-            acceptedOffers: {
-                itemOffered: { typeOf: { $in: [factory_2.factory.reservationType.EventReservation] } }
-            }
-        });
+        }, { noName: true });
         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;

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

@@ -3,7 +3,7 @@ import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;

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/onAssetTransactionStatusChanged/processing2inTransit.d.ts

@@ -1,7 +1,7 @@
 import type { OrderRepo } from '../../../repo/order';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function processing2inTransit(params: {
     project: {
         id: string;

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

@@ -7,7 +7,7 @@ import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { paymentDue2Processing } from './onAssetTransactionStatusChanged/paymentDue2Processing';
 import { processing2inTransit } from './onAssetTransactionStatusChanged/processing2inTransit';
 import { factory } from '../../factory';
-import { Settings } from '../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -9,7 +9,6 @@ exports.onOrderDelivered = onOrderDelivered;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDelivered/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDelivered(params) {

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

@@ -5,7 +5,12 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
         limit: number;
         page: number;
     };
-    deliveredAcceptedOffers: factory.order.IAcceptedOffer[];
+    deliveredAcceptedOffers: (Omit<factory.order.IAcceptedOffer, 'priceSpecification' | 'name'> & {
+        /**
+         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
+         */
+        priceSpecification?: factory.order.ITicketPriceSpecification;
+    })[];
     orderStatus: factory.orderStatus.OrderInTransit;
 };
 declare function createInformTasks(params: {

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

@@ -9,7 +9,6 @@ exports.onOrderDeliveredPartially = onOrderDeliveredPartially;
  */
 const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./onOrderDeliveredPartially/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDeliveredPartially(params) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.d.ts

@@ -1,7 +1,7 @@
 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 IOnOrderInTransitRepos {
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;

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

@@ -48,7 +48,7 @@ function createSendOrderTaskIfNotExist(params) {
         const sendOrderObject = {
             ...simpleOrder,
             acceptedOffers: {
-                limit: settings.deliverOrderLimit,
+                limit: (await settings.getByKey('deliverOrderLimit')),
                 page: 1 // page1から配送
             }
         };

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

@@ -1,7 +1,7 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;