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

package/lib/chevre/repo/mongoose/schemas/reservation.js

@@ -8,49 +8,25 @@ const settings_1 = require("../../../settings");
 const modelName = 'Reservation';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
-    provider: {
-        type: mongoose_1.SchemaTypes.Mixed,
-        required: true
-    },
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    provider: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     _id: String,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     additionalTicketText: String,
-    bookingAgent: mongoose_1.SchemaTypes.Mixed,
     bookingTime: Date,
     broker: mongoose_1.SchemaTypes.Mixed,
-    // cancelReservationUrl: String,
-    // checkinUrl: String,
-    // confirmReservationUrl: String,
     modifiedTime: Date,
-    // modifyReservationUrl: String,
-    numSeats: Number,
     previousReservationStatus: String,
-    price: mongoose_1.SchemaTypes.Mixed,
-    priceCurrency: String,
     programMembershipUsed: mongoose_1.SchemaTypes.Mixed,
     reservationFor: mongoose_1.SchemaTypes.Mixed,
-    reservationNumber: {
-        type: String,
-        required: true
-    },
-    reservationStatus: {
-        type: String,
-        required: true
-    },
+    reservationNumber: { type: String, required: true },
+    reservationStatus: { type: String, required: true },
     reservedTicket: mongoose_1.SchemaTypes.Mixed,
     subReservation: mongoose_1.SchemaTypes.Mixed,
     underName: mongoose_1.SchemaTypes.Mixed,
     checkedIn: { type: Boolean, default: false },
     attended: { type: Boolean, default: false },
-    additionalProperty: mongoose_1.SchemaTypes.Mixed,
-    issuedThrough: mongoose_1.SchemaTypes.Mixed
+    // additionalProperty: SchemaTypes.Mixed, // 完全に廃止(2026-06-09~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -109,15 +85,6 @@ const indexes = [
         { attended: 1, bookingTime: -1 },
         { name: 'searchByAttended-v3' }
     ],
-    [
-        { useActionExists: 1, bookingTime: -1 },
-        {
-            name: 'searchByUseActionExists',
-            partialFilterExpression: {
-                useActionExists: { $exists: true }
-            }
-        }
-    ],
     [
         { additionalTicketText: 1, bookingTime: -1 },
         {
@@ -127,24 +94,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { additionalProperty: 1, bookingTime: -1 },
-        {
-            name: 'searchByAdditionalProperty-v3',
-            partialFilterExpression: {
-                additionalProperty: { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'price.priceComponent.appliesToMovieTicket.identifier': 1, bookingTime: -1 },
-        {
-            name: 'searchByPriceComponentAppliesToMovieTicketIdentifier',
-            partialFilterExpression: {
-                'price.priceComponent.appliesToMovieTicket.identifier': { $exists: true }
-            }
-        }
-    ],
     [
         { 'reservationFor.typeOf': 1, bookingTime: -1 },
         {
@@ -271,42 +220,42 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'reservedTicket.ticketType.id': 1, bookingTime: -1 },
-        {
-            name: 'searchByReservedTicketTicketTypeId-v3',
-            partialFilterExpression: {
-                'reservedTicket.ticketType.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'reservedTicket.ticketType.category.id': 1, bookingTime: -1 },
-        {
-            name: 'searchByReservedTicketTicketTypeCategoryId-v3',
-            partialFilterExpression: {
-                'reservedTicket.ticketType.category.id': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'reservedTicket.ticketType.category.codeValue': 1, bookingTime: -1 },
-        {
-            name: 'searchByReservedTicketTicketTypeCategoryCodeValue-v3',
-            partialFilterExpression: {
-                'reservedTicket.ticketType.category.codeValue': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'reservedTicket.dateIssued': 1, bookingTime: -1 },
-        {
-            name: 'reservedTicketDateIssued',
-            partialFilterExpression: {
-                'reservedTicket.dateIssued': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'reservedTicket.ticketType.id': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByReservedTicketTicketTypeId-v3',
+    //         partialFilterExpression: {
+    //             'reservedTicket.ticketType.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'reservedTicket.ticketType.category.id': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByReservedTicketTicketTypeCategoryId-v3',
+    //         partialFilterExpression: {
+    //             'reservedTicket.ticketType.category.id': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'reservedTicket.ticketType.category.codeValue': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByReservedTicketTicketTypeCategoryCodeValue-v3',
+    //         partialFilterExpression: {
+    //             'reservedTicket.ticketType.category.codeValue': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'reservedTicket.dateIssued': 1, bookingTime: -1 },
+    //     {
+    //         name: 'reservedTicketDateIssued',
+    //         partialFilterExpression: {
+    //             'reservedTicket.dateIssued': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'broker.id': 1, bookingTime: -1 },
         {
@@ -316,60 +265,60 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'broker.name': 1, bookingTime: -1 },
-        {
-            name: 'searchByBrokerName',
-            partialFilterExpression: {
-                'broker.name': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'broker.familyName': 1, bookingTime: -1 },
-        {
-            name: 'searchByBrokerFamilyName',
-            partialFilterExpression: {
-                'broker.familyName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'broker.givenName': 1, bookingTime: -1 },
-        {
-            name: 'searchByBrokerGivenName',
-            partialFilterExpression: {
-                'broker.givenName': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'broker.identifier': 1, bookingTime: -1 },
-        {
-            name: 'searchByBrokerIdentifier',
-            partialFilterExpression: {
-                'broker.identifier': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'programMembershipUsed.identifier': 1, bookingTime: -1 },
-        {
-            name: 'searchByProgramMembershipUsedIdentifier',
-            partialFilterExpression: {
-                'programMembershipUsed.identifier': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'programMembershipUsed.issuedThrough.serviceType.codeValue': 1, bookingTime: -1 },
-        {
-            name: 'searchByMembershipUsedServiceType',
-            partialFilterExpression: {
-                'programMembershipUsed.issuedThrough.serviceType.codeValue': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'broker.name': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByBrokerName',
+    //         partialFilterExpression: {
+    //             'broker.name': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'broker.familyName': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByBrokerFamilyName',
+    //         partialFilterExpression: {
+    //             'broker.familyName': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'broker.givenName': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByBrokerGivenName',
+    //         partialFilterExpression: {
+    //             'broker.givenName': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'broker.identifier': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByBrokerIdentifier',
+    //         partialFilterExpression: {
+    //             'broker.identifier': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'programMembershipUsed.identifier': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByProgramMembershipUsedIdentifier',
+    //         partialFilterExpression: {
+    //             'programMembershipUsed.identifier': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'programMembershipUsed.issuedThrough.serviceType.codeValue': 1, bookingTime: -1 },
+    //     {
+    //         name: 'searchByMembershipUsedServiceType',
+    //         partialFilterExpression: {
+    //             'programMembershipUsed.issuedThrough.serviceType.codeValue': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'underName.id': 1, bookingTime: -1 },
         {

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -147,6 +147,85 @@ export interface IServiceOutputIdentifierSetting {
      */
     version: string;
 }
+interface ICOAIntegrationSettings {
+    timeoutReserve: number;
+    timeoutMaster: number;
+}
+interface IGMOIntegrationSettings {
+    timeout: number;
+    timeoutBackground: number;
+}
+interface ISurfrockSettings {
+    /**
+     * 着券時タイムアウト
+     */
+    timeoutPay: number;
+    /**
+     * 着券取消時タイムアウト
+     */
+    timeoutRefund: number;
+    /**
+     * 認証時タイムアウト
+     */
+    timeoutCheck: number;
+    /**
+     * 決済と返金の最小間隔(ms)
+     */
+    minIntervalBetweenPayAndRefund: number;
+    /**
+     * surfrockクライアント認証情報保管期限
+     * 0の場合、保管しない
+     */
+    credentialsExpireInSeconds?: number;
+}
+export interface ISendGridAlert {
+    sender?: {
+        name: string;
+        email: string;
+    };
+    toRecipient?: [
+        {
+            email: string;
+        }
+    ];
+}
+export interface ISendGridSettings {
+    apiKey: string;
+    alert?: ISendGridAlert;
+}
+interface IHubOnOrderStatusChanged {
+    informOrder2hub: factory.project.IInformParams[];
+}
+interface IHubOnReservationStatusChanged {
+    informReservation2hub: factory.project.IInformParams[];
+}
+interface IHubOnTaskStatusChanged {
+    informTask2hub: factory.project.IInformParams[];
+}
+export interface IHubSettings {
+    onOrderStatusChanged: IHubOnOrderStatusChanged;
+    onReservationStatusChanged: IHubOnReservationStatusChanged;
+    onTaskStatusChanged: IHubOnTaskStatusChanged;
+}
+export interface IIntegrationSettings {
+    abortedTasksWithoutReport: string[];
+    numTryConfirmReserveTransaction: number;
+    deliverOrderLimit: number;
+    coa: ICOAIntegrationSettings;
+    gmo: IGMOIntegrationSettings;
+    movieticketReserve: ISurfrockSettings;
+    /**
+     * SendGrid認証情報
+     * 2026-05-29~
+     */
+    sendGrid?: ISendGridSettings;
+    /**
+     * hubへの連携設定
+     * 2026-06-02~
+     */
+    hub?: IHubSettings;
+    useExperimentalFeature: boolean;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
     jwt?: IJWTSetting;
@@ -180,6 +259,11 @@ export interface ISetting {
     useMongo4confirmationNumberFrom?: Date;
     useMongo4orderNumberFrom?: Date;
     useMongo4transactionNumberFrom?: Date;
+    /**
+     * 外部連携設定
+     * 環境変数から移行(2026-05-23~)
+     */
+    integration?: IIntegrationSettings;
 }
 type IDocType = ISetting;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -31,7 +31,8 @@ const schemaDefinition = {
     useMongoAsStockHolderProjects: [String],
     useMongo4confirmationNumberFrom: { type: Date, required: false },
     useMongo4orderNumberFrom: { type: Date, required: false },
-    useMongo4transactionNumberFrom: { type: Date, required: false }
+    useMongo4transactionNumberFrom: { type: Date, required: false },
+    integration: { type: mongoose_1.SchemaTypes.Mixed, required: false } // 2026-05-23~
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/order.d.ts

@@ -17,12 +17,6 @@ interface IAggregation {
     maxPrice: number;
     minPrice: number;
 }
-interface IGlobalAggregateOrder {
-    orderCount: number;
-    aggregateProject: {
-        projectCount: number;
-    };
-}
 interface IAggregateOrder {
     aggregation: IAggregation;
 }
@@ -32,13 +26,14 @@ interface IAggregateOrder {
 export type IOrderOnStatusChanged = Pick<IOrderWithoutAcceptedOffers & {
     id: string;
 }, 'id' | 'orderNumber' | 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'name' | 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf'>;
+type ISearchConditions = Pick<factory.order.ISearchConditions, 'acceptedOffers' | 'broker' | 'confirmationNumbers' | 'customer' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'paymentMethods' | 'project' | 'provider' | 'seller'>;
 /**
  * 注文リポジトリ
  */
 export declare class OrderRepo {
     private readonly orderModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: Omit<factory.order.ISearchConditions, 'limit' | 'page' | 'sort'>): FilterQuery<factory.order.IOrder>[];
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.order.IOrder>[];
     /**
      * なければ作成する
      */
@@ -159,6 +154,7 @@ export declare class OrderRepo {
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.order.IOrder>;
         $unset: any;
+        arrayFilters?: any[];
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateOrder(params: {
         project?: {
@@ -171,81 +167,5 @@ export declare class OrderRepo {
             $lte: Date;
         };
     }): Promise<IAggregateOrder>;
-    aggregateOrderOfSeat(params: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        acceptedOffers: {
-            itemOffered: {
-                reservationFor: {
-                    location: {
-                        branchCode: string;
-                    };
-                    superEvent: {
-                        location: {
-                            branchCode: string;
-                        };
-                    };
-                };
-                reservedTicket: {
-                    ticketedSeat: {
-                        seatNumber: string;
-                    };
-                };
-            };
-        };
-        customer?: {
-            email?: {
-                $in?: string[];
-            };
-        };
-    }): Promise<{
-        aggregation: Pick<IAggregation, 'orderCount'> & {
-            sumGraceTime?: number;
-            emailCount?: number;
-        };
-    }>;
-    aggregateOrderOfCustomerByProject(params: {
-        project?: {
-            id: {
-                $eq: string;
-            };
-        };
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        customer: {
-            email: {
-                $eq: string;
-            };
-        };
-    }): Promise<{
-        aggregation: Pick<IAggregation, 'orderCount'> & {
-            sumGraceTime?: number;
-            emailCount?: number;
-        };
-    }>;
-    aggregateOrderOfCustomerGlobally(params: {
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        customer: {
-            email: {
-                $eq: string;
-            };
-        };
-    }): Promise<{
-        aggregation: IGlobalAggregateOrder & {
-            sumGraceTime?: never;
-        };
-    }>;
 }
 export {};