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

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateMovieTicket.d.ts

@@ -18,4 +18,4 @@ authorizedMovieTickets: IMovieTicket4validate[],
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -5,7 +5,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
@@ -14,7 +14,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -99,7 +99,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -288,7 +291,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -141,13 +141,11 @@ function fixOrders(params) {
         const eventIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
-        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

package/lib/chevre/service/validation/validateOrder.js

@@ -10,47 +10,6 @@ const factory_1 = require("../../factory");
 const factory_2 = require("../offer/event/authorize/factory");
 // import { acceptedOffers2amount as acceptedOffers2amount4product } from '../offer/product/factory';
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-// const debug = createDebug('chevre-domain:service:validation');
-// type ICreatingCheckEventTask = Pick<
-//     factory.task.checkResource.IAttributes,
-//     'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description'
-// > & {
-//     description: string;
-// };
-// function createCheckEventTasks(params: {
-//     order: Pick<factory.order.IOrder, 'orderNumber' | 'typeOf'>;
-//     project: { id: string };
-//     reservationForIds: string[];
-// }): ICreatingCheckEventTask[] {
-//     const { order, project, reservationForIds } = params;
-//     const runsAt = new Date();
-//     return reservationForIds.map((reservationForId) => {
-//         const object: factory.task.checkResource.IResourceAsEvent = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
-//         const data: factory.task.checkResource.IData = {
-//             object,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             typeOf: factory.actionType.CheckAction
-//         };
-//         const description: string = util.format(
-//             '%s:%s:%s:%s',
-//             order.typeOf,
-//             order.orderNumber,
-//             factory.eventType.ScreeningEvent,
-//             reservationForId
-//         );
-//         return {
-//             description,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             name: factory.taskName.CheckResource,
-//             status: factory.taskStatus.Ready,
-//             runsAt,
-//             remainingNumberOfTries: 3,
-//             numberOfTried: 0,
-//             executionResults: [],
-//             data
-//         };
-//     });
-// }
 function validateOrder(params) {
     return async (repos) => {
         const order = await repos.order.projectFieldsByOrderNumber({
@@ -63,7 +22,8 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({
@@ -101,14 +61,8 @@ function validateOrder(params) {
                     throw new Error(`invalid acceptedOffer.priceSpecification.priceComponent [${typeof priceSpecification.priceComponent}]`);
                 }
             }
-            // 旧メンバーシップ&ペイメントカードを例外として除外(互換性維持対応をしていないため)
-            if ((0, moment_1.default)(order.orderDate)
-                .isAfter((0, moment_1.default)('2023-09-30T15:00:00Z'))
-            // || typeOf !== factory.permit.PermitType.Permit
-            ) {
-                if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
-                    throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
-                }
+            if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
+                throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
             }
         });
         let reservationForIds = [];
@@ -176,21 +130,8 @@ function validateOrder(params) {
                 }
                 break;
             }
-            // case factory.permit.PermitType.Permit: {
-            //     numOrderedItemExpected = acceptedOffers.length;
-            //     const permitAcceptedOffers = acceptedOffers as factory.order.IAcceptedOffer<factory.order.IPermit>[];
-            //     priceExpected = acceptedOffers2amount4product({
-            //         acceptedOffers: permitAcceptedOffers
-            //     });
-            //     break;
-            // }
-            // case factory.actionType.MoneyTransfer:
-            //     break;
             default:
-                if ((0, moment_1.default)(order.orderDate)
-                    .isAfter((0, moment_1.default)('2024-02-01T15:00:00Z'))) {
-                    throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
-                }
+                throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
         }
         // orderedItem検証
         if (order.orderedItem.length !== numOrderedItemExpected) {
@@ -225,20 +166,5 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
-        // useMongoAsStockHolderProjectsの場合のイベント検証タスク作成を廃止(もう十分検証したので)(2025-07-11~)
-        // add check event task(2025-05-01~)
-        // const setting = <Pick<ISetting, 'useMongoAsStockHolderProjects'> | null>
-        //     await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
-        // const useMongoAsStockHolderProjects = setting?.useMongoAsStockHolderProjects;
-        // if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
-        //     const creatingCheckResourceTask = createCheckEventTasks({
-        //         order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
-        //         project: { id: params.project.id },
-        //         reservationForIds
-        //     });
-        //     if (creatingCheckResourceTask.length > 0) {
-        //         await repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
-        //     }
-        // }
     };
 }

package/lib/chevre/settings.d.ts

@@ -1,8 +1,13 @@
+import type { Connection } from 'mongoose';
 interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
      */
-    timeout: number;
+    timeoutPay: number;
+    /**
+     * 着券取消時タイムアウト
+     */
+    timeoutRefund: number;
     /**
      * 認証時タイムアウト
      */
@@ -22,7 +27,8 @@ interface IOptions {
     numTryConfirmReserveTransaction: number;
     deliverOrderLimit: number;
     coa: {
-        timeout: number;
+        timeoutReserve: number;
+        timeoutMaster: number;
     };
     gmo: {
         timeout: number;
@@ -31,26 +37,19 @@ interface IOptions {
     movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
 }
+interface IDBOptions {
+    connection: Connection;
+}
 /**
  * domain settings
  */
 declare class Settings {
-    readonly abortedTasksWithoutReport: string[];
-    readonly numTryConfirmReserveTransaction: number;
-    readonly deliverOrderLimit: number;
-    readonly coa: {
-        timeout: number;
-    };
-    readonly gmo: {
-        timeout: number;
-        timeoutBackground: number;
-    };
-    readonly movieticketReserve: ISurfrockSettings;
-    readonly useExperimentalFeature: boolean;
+    private readonly options;
+    constructor(options: IDBOptions);
     /**
-     * 通知設定
+     * 設定名称から設定を参照する
      */
-    constructor(options: IOptions);
+    getByKey<T extends keyof IOptions>(key: T): Promise<IOptions[T]>;
 }
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;

package/lib/chevre/settings.js

@@ -1,31 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
+const factory_1 = require("./factory");
+const defaultOptions = {
+    abortedTasksWithoutReport: [
+        factory_1.factory.taskName.ImportEventCapacitiesFromCOA,
+        factory_1.factory.taskName.ImportEventsFromCOA,
+        factory_1.factory.taskName.ImportOffersFromCOA,
+    ],
+    numTryConfirmReserveTransaction: 10,
+    deliverOrderLimit: 10,
+    coa: {
+        timeoutReserve: 20000,
+        timeoutMaster: 30000
+    },
+    gmo: {
+        timeout: 4000,
+        timeoutBackground: 6000
+    },
+    movieticketReserve: {
+        timeoutPay: 5000,
+        timeoutRefund: 5000,
+        timeoutCheck: 4000,
+        minIntervalBetweenPayAndRefund: 10000,
+        credentialsExpireInSeconds: 600
+    },
+    useExperimentalFeature: false
+};
 /**
  * domain settings
  */
 class Settings {
-    abortedTasksWithoutReport;
-    numTryConfirmReserveTransaction;
-    deliverOrderLimit;
-    coa;
-    gmo;
-    movieticketReserve;
-    useExperimentalFeature;
+    // private readonly settingModel: IModel;
+    options;
+    constructor(options
+    // options: IOptions & IDBOptions
+    ) {
+        const { connection: _connection, // ひとまず使用しない
+        // ...restOptions
+         } = options;
+        // this.settingModel = connection.model<IDocType, IModel>(modelName, createSchema());
+        this.options = defaultOptions;
+        // this.options = restOptions; // defaultOptionsでひとまず固定化(2026-05-23~)
+    }
     /**
-     * 通知設定
+     * 設定名称から設定を参照する
      */
-    // public readonly notification: IWebhookSettings; // migrate to SettingRepo(2024-12-11~)
-    constructor(options) {
-        const { abortedTasksWithoutReport, numTryConfirmReserveTransaction, deliverOrderLimit, coa, gmo, movieticketReserve, useExperimentalFeature } = options;
-        this.abortedTasksWithoutReport = abortedTasksWithoutReport;
-        this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
-        this.deliverOrderLimit = deliverOrderLimit;
-        this.coa = coa;
-        this.gmo = gmo;
-        this.movieticketReserve = movieticketReserve;
-        this.useExperimentalFeature = useExperimentalFeature;
-        // this.notification = notification;
+    async getByKey(key) {
+        // const projection: Record<string, AnyExpression> = {
+        //     _id: 0,
+        //     [key]: 1
+        //     // id: { $toString: '$_id' },
+        // };
+        // // とりあえず設定コレクションを参照するが、値を使用しない(2026-05-21~)
+        // await this.settingModel.findOne(
+        //     { 'project.id': { $eq: '*' } },
+        //     projection
+        // )
+        //     .lean()
+        //     .exec();
+        return this.options[key];
     }
 }
 exports.Settings = Settings;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "8.1.0-alpha.0",
+    "@chevre/factory": "8.2.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.3"
+  "version": "24.1.0-alpha.30"
 }