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

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

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAdditionalProperty = createAdditionalProperty;
 exports.createAdditionalTicketText = createAdditionalTicketText;
 exports.createReservation = createReservation;
 exports.createReservedTicket = createReservedTicket;
@@ -16,14 +15,15 @@ const price_1 = require("./price");
 const debug = (0, debug_1.default)('chevre-domain:service:assetTransaction');
 function createTicketIdentifier(params) {
     // チケット識別子の規定値を作成
-    let ticketIdentifier = (typeof params.ticketedSeat?.seatNumber === 'string')
+    const ticketIdentifier = (typeof params.ticketedSeat?.seatNumber === 'string')
         ? (0, util_1.format)('%s:%s:%s', params.reservationFor.id, params.ticketedSeat.seatSection, params.ticketedSeat.seatNumber)
         : (0, util_1.format)('%s:%s', params.reservationFor.id, params.id);
-    // 指定があれば採用
-    const ticketIdentifierByRequest = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.identifier;
-    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
-        ticketIdentifier = ticketIdentifierByRequest;
-    }
+    // チケット識別子のカスタム指定を廃止(2026-06-08~)
+    // // 指定があれば採用
+    // const ticketIdentifierByRequest = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.identifier;
+    // if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+    //     ticketIdentifier = ticketIdentifierByRequest;
+    // }
     return ticketIdentifier;
 }
 function createReservedTicket(params) {
@@ -295,16 +295,18 @@ function validateAppliesToMovieTicket(params) {
         // Arrayでないケースは廃止(2022-09-10~)
     }
 }
-/**
- * 追加特性を生成する
- */
-function createAdditionalProperty(params) {
-    let additionalProperty = params.acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
-    if (!Array.isArray(additionalProperty)) {
-        additionalProperty = [];
-    }
-    return additionalProperty;
-}
+// /**
+//  * 追加特性を生成する
+//  */
+// function createAdditionalProperty(params: {
+//     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
+// }): factory.propertyValue.IPropertyValue<string>[] {
+//     let additionalProperty = params.acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
+//     if (!Array.isArray(additionalProperty)) {
+//         additionalProperty = [];
+//     }
+//     return additionalProperty;
+// }
 /**
  * 追加チケットテキストを生成する
  */
@@ -328,27 +330,15 @@ 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~)
+            // additionalProperty: params.additionalProperty, // discontinue(2026-06-07~)
             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' | 'name'> & {
+            /**
+             * 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,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,23 +302,24 @@ 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
-        },
-        ...(typeof itemOffered.reservedTicket.identifier === 'string')
-            ? { identifier: itemOffered.reservedTicket.identifier }
-            : undefined, // チケット識別子追加(2024-04-15~)
+        ticketType,
+        identifier: itemOffered.reservedTicket.identifier, // チケット識別子必須化(2026-06-08~)
+        // ...(typeof itemOffered.reservedTicket.identifier === 'string')
+        //     ? { identifier: itemOffered.reservedTicket.identifier }
+        //     : undefined, // チケット識別子追加(2024-04-15~)
         ...(itemOffered.reservedTicket.ticketedSeat !== undefined)
             ? { ticketedSeat: itemOffered.reservedTicket.ticketedSeat }
             : undefined
@@ -367,19 +368,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';