@chevre/domain 24.1.0-alpha.5 → 24.1.0-alpha.51

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

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

@@ -14,8 +14,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:notification');
  * add(2025-03-13~)
  */
 function notifyAbortedTasksByEmail(params) {
-    return async (repos, settings, credentials) => {
-        const { abortedTasksWithoutReport } = settings;
+    return async (repos) => {
+        const abortedTasksWithoutReport = await repos.integrationSetting.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
             status: { $eq: factory_1.factory.taskStatus.Aborted },
             dateAborted: { $gte: params.dateAbortedGte },
@@ -30,7 +30,7 @@ function notifyAbortedTasksByEmail(params) {
             const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            })({}, credentials);
+            })(repos);
             debug('notifyResult:', notifyResult);
         }
     };

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

@@ -1,10 +1,10 @@
-import { SendGridCredentials } from '../../credentials/sendGrid';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 declare function notifyByEmail(params: {
     subject: string;
     content: string;
     logLevel: LineNotifyLogLevel;
-}): (__: Record<string, never>, credentials: {
-    sendGrid: SendGridCredentials;
+}): (repos: {
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<{
     result: import("@chevre/factory/lib/chevre/action/transfer/send/message/email").IResult;
 }>;

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

@@ -5,27 +5,22 @@ const client_1 = require("@sendgrid/client");
 const http_status_1 = require("http-status");
 const util_1 = require("util");
 const factory_1 = require("../../factory");
-// type ILineNotifyOperation<T> = (
-//     repos: undefined,
-//     credentials: {
-//         lineNotify: LINENotifyCredentials;
-//     }
-// ) => Promise<T>;
 function notifyByEmail(params) {
-    return async (__, credentials) => {
+    return async (repos) => {
         const { logLevel } = params;
         const shortSubject = params.subject;
         const message = (0, util_1.format)('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, params.content);
-        const apiKey = credentials.sendGrid.apiKey;
+        const sendGridSettings = await repos.integrationSetting.getByKey('sendGrid');
+        const apiKey = sendGridSettings?.apiKey;
         if (typeof apiKey !== 'string') {
             throw new factory_1.factory.errors.Internal('API Key not found');
         }
-        const senderName = credentials.sendGrid.alert?.sender?.name;
-        const senderEmail = credentials.sendGrid.alert?.sender?.email;
-        const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
-            ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
+        const senderName = sendGridSettings?.alert?.sender?.name;
+        const senderEmail = sendGridSettings?.alert?.sender?.email;
+        const toRecipientEmail = (Array.isArray(sendGridSettings?.alert?.toRecipient))
+            ? sendGridSettings.alert?.toRecipient.at(0)?.email
             : undefined;
         if (typeof senderName !== 'string') {
             throw new factory_1.factory.errors.Internal('senderName not found');

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

@@ -1,8 +1,8 @@
-import { SendGridCredentials } from '../../credentials/sendGrid';
 import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { MessageRepo } from '../../repo/message';
 import type { ProjectRepo } from '../../repo/project';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 /**
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
@@ -14,7 +14,6 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
     action: ActionRepo;
     message: MessageRepo;
     project: ProjectRepo;
-}, credentials: {
-    sendGrid: SendGridCredentials;
+    integrationSetting: IntegrationSettingRepo;
 }) => Promise<void>;
 export { sendEmailMessage };

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

@@ -15,12 +15,13 @@ function createSendEmailMessageActionAttributes(params) {
     };
 }
 function createMailData(params) {
-    return async (repos, credentials) => {
+    return async (repos) => {
         const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['settings']
         });
-        let apiKey = credentials.sendGrid.apiKey;
+        const sendGridSettings = await repos.integrationSetting.getByKey('sendGrid');
+        let apiKey = sendGridSettings?.apiKey;
         // プロジェクト固有のSendGrid設定があれば、そちらを使用
         if (typeof project.settings?.sendgridApiKey === 'string' && project.settings.sendgridApiKey.length > 0) {
             apiKey = project.settings.sendgridApiKey;
@@ -71,8 +72,8 @@ function createMailData(params) {
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
-    return async (repos, credentials) => {
-        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos, credentials);
+    return async (repos) => {
+        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos);
         // add recipe(2025-03-12~)
         let recipe = (0, factory_2.createSendEmailMessageRecipe)({
             mailData,

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

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+import type { IMinimizedAcceptedOffer, OrderInTransactionRepo } from '../../repo/orderInTransaction';
 interface IAcceptOfferOperationRepos {
     orderInTransaction: OrderInTransactionRepo;
 }
@@ -10,7 +10,12 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: IMinimizedAcceptedOffer[] | (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.IOptimizedAcceptedOffer, '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,20 +302,20 @@ function responseBody2acceptedOffers4result(params) {
  * 注文データの予約を生成する
  */
 function createReservation(params) {
-    // const { itemOffered, event, reservationFor } = params;
     const { itemOffered } = params;
     const event = params.reservationFor;
     let reservationItem;
+    const ticketType = {
+        typeOf: itemOffered.reservedTicket.ticketType.typeOf,
+        id: itemOffered.reservedTicket.ticketType.id,
+        identifier: itemOffered.reservedTicket.ticketType.identifier,
+        name: itemOffered.reservedTicket.ticketType.name,
+        description: itemOffered.reservedTicket.ticketType.description,
+        ...((Array.isArray(itemOffered.reservedTicket.ticketType.additionalProperty)) && { additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty })
+    };
     const reservedTicket = {
         typeOf: itemOffered.reservedTicket.typeOf,
-        ticketType: {
-            typeOf: itemOffered.reservedTicket.ticketType.typeOf,
-            id: itemOffered.reservedTicket.ticketType.id,
-            identifier: itemOffered.reservedTicket.ticketType.identifier,
-            name: itemOffered.reservedTicket.ticketType.name,
-            description: itemOffered.reservedTicket.ticketType.description,
-            additionalProperty: itemOffered.reservedTicket.ticketType.additionalProperty
-        },
+        ticketType,
         ...(typeof itemOffered.reservedTicket.identifier === 'string')
             ? { identifier: itemOffered.reservedTicket.identifier }
             : undefined, // チケット識別子追加(2024-04-15~)
@@ -367,19 +367,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,11 +1,11 @@
 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';
 import type { EventRepo } from '../../../repo/event';
 import type { EventOfferRepo } from '../../../repo/eventOffer';
-import { EventSeriesRepo } from '../../../repo/eventSeries';
+import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
@@ -67,6 +67,10 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
+    /**
+     * 2026-06-04~
+     */
+    useAcceptedOfferNoReservationFor: boolean;
 }
 /**
  * 興行オファー承認

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,26 @@ 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 useAcceptedOfferNoReservationFor = options.useAcceptedOfferNoReservationFor === true;
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: acceptedOffers4result
+                    acceptedOffers: acceptedOffers4result.map((acceptOffer4result, offerIndex) => {
+                        const { priceSpecification: _priceSpecification, itemOffered, ...acceptOfferNoPriceSpec } = acceptOffer4result;
+                        const includeReservationFor = !useAcceptedOfferNoReservationFor
+                            || (useAcceptedOfferNoReservationFor && offerIndex === 0); // useAcceptedOfferNoReservationForの場合、ひとつめのオファーのみ含む(2026-06-04~)
+                        return {
+                            ...acceptOfferNoPriceSpec,
+                            itemOffered: minimizeItemOffered(itemOffered, {
+                                includeReservationFor
+                            })
+                        };
+                    })
                 })(repos);
-                // }
             }
         }
         catch (error) {
@@ -81,6 +83,51 @@ 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 }),
+        // useAcceptedOfferNoReservedTicketでない場合のみreservedTicket保管(2026-06-03~)
+        // ...((!useAcceptedOfferNoReservedTicket) && {
+        //     reservedTicket: {
+        //         typeOf: reservedTicket.typeOf,
+        //         // useAcceptedOfferNoTicketedSeatでない場合のみ座席保管(2026-06-01~)
+        //         ...((!useAcceptedOfferNoTicketedSeat && typeof reservedTicket.ticketedSeat?.typeOf === 'string') && { ticketedSeat: reservedTicket.ticketedSeat }),
+        //         ...((typeof reservedTicket.identifier === 'string') && { identifier: reservedTicket.identifier })
+        //     }
+        // })
+    };
+}
 function validateCreateRequest(params) {
     return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({

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.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 }
-            });
-        }
-    };
-}