@chevre/domain 25.2.0-alpha.4 → 25.2.0-alpha.41

package/lib/chevre/repo/transaction/placeOrder.js

@@ -186,22 +186,6 @@ class PlaceOrderRepo {
             .lean()
             .exec();
     }
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    async findInProgressPaymentMethodId(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, { 'object.paymentMethods': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
-        }
-        return doc.object.paymentMethods;
-    }
     // /**
     //  * 取引の注文番号を検索する
     //  */
@@ -226,22 +210,31 @@ class PlaceOrderRepo {
     //     }
     //     return doc.object.orderNumber;
     // }
-    /**
-     * 取引の確認番号を検索する
-     */
-    async findInProgressConfirmationNumberById(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            status: { $in: params.status.$in }
-        }, { 'object.confirmationNumber': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
-        }
-        return doc.object.confirmationNumber;
-    }
+    // /**
+    //  * 取引の確認番号を検索する
+    //  */
+    // public async findInProgressConfirmationNumberById(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    // }): Promise<string | undefined> {
+    //     const doc = await this.transactionModel.findOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             typeOf: { $eq: factory.transactionType.PlaceOrder },
+    //             status: { $in: params.status.$in }
+    //         },
+    //         { 'object.confirmationNumber': 1 }
+    //     )
+    //         .lean<{ object: Pick<factory.transaction.placeOrder.IObject, 'confirmationNumber'> }>() // 2024-08-26~
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(
+    //             this.transactionModel.modelName,
+    //             `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`
+    //         );
+    //     }
+    //     return doc.object.confirmationNumber;
+    // }
     /**
      * 取引期限変更
      */
@@ -263,47 +256,6 @@ class PlaceOrderRepo {
             throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
     }
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    async updateObject(params) {
-        const doc = await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            typeOf: { $eq: params.typeOf },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, {
-            $set: {
-                ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
-            }
-        }, {
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec();
-        if (doc === null) {
-            throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
-        }
-    }
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    async findByIdAndUpdateInProgress(params) {
-        await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, params.update, {
-            // new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory_1.factory.errors.ArgumentNull(this.transactionModel.modelName);
-            }
-        });
-    }
     /**
      * 進行中取引のobjectに注文番号を保管する
      */
@@ -316,15 +268,22 @@ class PlaceOrderRepo {
             .exec();
         return { modifiedCount: result.modifiedCount };
     }
-    async saveConfirmationNumberIfNotExist(params) {
-        await this.transactionModel.updateOne({
-            _id: { $eq: params.id },
-            // status: { $eq: factory.transactionStatusType.InProgress },
-            status: { $in: params.status.$in },
-            'object.confirmationNumber': { $exists: false }
-        }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
-            .exec();
-    }
+    // public async saveConfirmationNumberIfNotExist(params: {
+    //     id: string;
+    //     status: { $in: factory.transactionStatusType[] };
+    //     confirmationNumber: string;
+    // }): Promise<void> {
+    //     await this.transactionModel.updateOne(
+    //         {
+    //             _id: { $eq: params.id },
+    //             // status: { $eq: factory.transactionStatusType.InProgress },
+    //             status: { $in: params.status.$in },
+    //             'object.confirmationNumber': { $exists: false }
+    //         },
+    //         { $set: { 'object.confirmationNumber': params.confirmationNumber } }
+    //     )
+    //         .exec();
+    // }
     /**
      * 進行中の注文取引を取得する
      */
@@ -441,8 +400,9 @@ class PlaceOrderRepo {
             endDate,
             'object.orderDate': params.object.orderDate, // add(2026-06-15~)
             'object.orderNumber': params.object.orderNumber, // add(2026-06-27~)
+            'object.confirmationNumber': params.object.confirmationNumber, // add(2026-07-08~)
             result: params.result, // resultを更新
-            potentialActions: params.potentialActions // resultを更新
+            ...((params.potentialActions !== undefined) && { potentialActions: params.potentialActions }) // support undefined(2026-07-17~)
         }, {
             new: true,
             projection: { _id: 1 }

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

@@ -144,7 +144,7 @@ export declare class TransactionRepo {
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -182,7 +182,7 @@ export declare class TransactionRepo {
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/transactionNumberCounter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionNumberCounterRepo = void 0;
-// import { RedisClientType } from 'redis';
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
@@ -10,44 +9,11 @@ const MAX_RETRY_INCREMENT = 1;
  * 取引番号カウンターリポジトリ
  */
 class TransactionNumberCounterRepo {
-    // private readonly redisClient: RedisClientType;
     transactionNumberModel;
     constructor(params) {
         const { connection } = params;
-        // this.redisClient = redisClient;
         this.transactionNumberModel = connection.model(transactionNumber_1.modelName, (0, transactionNumber_1.createSchema)());
     }
-    // public async incrementByRedis(params: {
-    //     identifier: string;
-    //     includedInDataCatalog: {
-    //         identifier: DataCatalogIdentifier;
-    //     };
-    //     expires: Date;
-    // }): Promise<number> {
-    //     // const now = moment();
-    //     const { expires } = params;
-    //     const key = `${params.includedInDataCatalog.identifier}:${params.identifier}`;
-    //     // const TTL = moment(expires)
-    //     //     .diff(now, 'seconds');
-    //     const [incrReply, expireAtReply] = await this.redisClient.multi()
-    //         .incr(key)
-    //         // .expire(key, TTL)
-    //         .expireAt(key, expires)
-    //         .exec();
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else: please write tests */
-    //     if (typeof incrReply !== 'number') {
-    //         // 基本的にありえないフロー
-    //         throw new factory.errors.Internal('transaction number not incremented unexpectedly');
-    //     }
-    //     // expireAtReplyの検証も追加する(2023-04-19~)
-    //     const expiredSet = expireAtReply === 1 || <any>expireAtReply === true;
-    //     if (!expiredSet) {
-    //         // 基本的にありえないフロー
-    //         throw new factory.errors.Internal('transaction number expiration not set unexpectedly');
-    //     }
-    //     return incrReply;
-    // }
     async incrementByMongo(params) {
         const now = new Date();
         const dataFeedExpires = params.expires;

package/lib/chevre/repo/transactionProcess.js

@@ -16,10 +16,8 @@ const DEFAULT_LOCK_EXPIRES = 120;
 class TransactionProcessRepo {
     concurrentLockRepo;
     options;
-    // private readonly redisClient: RedisClientType;
     constructor(redisClient, options) {
         this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
-        // this.redisClient = redisClient;
         this.options = options;
     }
     static CREATE_REDIS_KEY(params) {
@@ -44,16 +42,6 @@ class TransactionProcessRepo {
         catch (_error) {
             throw new factory_1.factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
         }
-        // const results = await this.redisClient.multi()
-        //     .setNX(key, '1')
-        //     .expire(key, ttl)
-        //     .exec();
-        // debug('locked,', params.id, results);
-        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-        //     return;
-        // } else {
-        //     throw new factory.errors.AlreadyInUse(params.typeOf, [], 'Another transaction process in progress');
-        // }
     }
     async unlock(params) {
         const key = TransactionProcessRepo.CREATE_REDIS_KEY(params);
@@ -62,7 +50,6 @@ class TransactionProcessRepo {
             about: { identifier: key, typeOf: 'Thing' },
             audience: { identifier: '1', typeOf: 'Audience' }
         });
-        // await this.redisClient.del([key]);
     }
 }
 exports.TransactionProcessRepo = TransactionProcessRepo;

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js

@@ -167,7 +167,7 @@ function publishPaymentUrl(params, options) {
         }
         const actionResult = {
             paymentMethodId: result.paymentMethodId,
-            paymentUrl: result.paymentUrl
+            // paymentUrl: result.paymentUrl // result.paymentUrlは廃止(2026-07-14~)
         };
         await repos.acceptPayAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;

package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts

@@ -20,7 +20,7 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
          */
         id: string;
     }[];
-    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+    instrument: factory.action.trade.pay.IPayTransactionInstrument[];
 }, options: {
     checkedAction: {
         id: string;

package/lib/chevre/service/assetTransaction/pay/start/factory.js

@@ -82,7 +82,8 @@ function createStartParams(params, options) {
             break;
         }
         default:
-        // no op
+            // no op
+            throw new factory_1.factory.errors.NotImplemented(`paymentServiceType: ${params.paymentServiceType} not implemented`);
     }
     // const informPaymentParams = createInformPaymentParams({
     //     paymentService: <factory.service.paymentService.IService | undefined>params.paymentService
@@ -122,12 +123,10 @@ function createStartParams(params, options) {
             : paymentMethodType,
         amount: paymentMethodAmount, // MonetaryAmount対応(2023-08-14~)
         identifier: paymentMethodType, // 追加(2023-08-29~)
+        totalPaymentDue,
         ...(typeof params.object.paymentMethod?.description === 'string')
             ? { description: params.object.paymentMethod?.description }
             : undefined,
-        ...(totalPaymentDue !== undefined)
-            ? { totalPaymentDue: totalPaymentDue }
-            : undefined,
         ...(typeof accountId === 'string') ? { accountId: accountId } : undefined,
         ...(typeof params.object.paymentMethod?.method === 'string')
             ? { method: params.object.paymentMethod?.method }

package/lib/chevre/service/assetTransaction/pay/start.d.ts

@@ -44,7 +44,7 @@ export { IPaymentAgencyTransaction };
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+    instrument: factory.action.trade.pay.IPayTransactionInstrument[];
 }, options: {
     pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
     /**

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

@@ -5,11 +5,9 @@ export interface ILineNotifyMessage {
     subject: string;
     content: string;
 }
-export declare function task2lineNotify(params: {
-    task: factory.task.ITask<factory.taskName>;
-}): ILineNotifyMessage;
 export declare function tasks2lineNotify(params: {
-    tasks: factory.task.ITask<factory.taskName>[];
+    tasks: Pick<factory.task.ITask<factory.taskName>, 'id' | 'executionResults' | 'project' | 'name' | 'runsAt'>[];
+    limit: number;
 }): ILineNotifyMessage;
 export declare function createSendEmailMessageRecipe(params: {
     mailData?: MailData;

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

@@ -4,37 +4,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ABORT_REPORT_SUBJECT = void 0;
-exports.task2lineNotify = task2lineNotify;
 exports.tasks2lineNotify = tasks2lineNotify;
 exports.createSendEmailMessageRecipe = createSendEmailMessageRecipe;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../factory");
 exports.ABORT_REPORT_SUBJECT = 'tasks aborted';
-function task2lineNotify(params) {
-    const task = params.task;
-    const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-    let lastError = lastExecutionResult?.error;
-    if (typeof lastError === 'string') {
-        lastError = { message: lastError, name: 'Error' };
-    }
-    const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
-    const content = `project:${task.project?.id}
-id:${task.id}
-name:${task.name}
-runsAt:${(0, moment_1.default)(task.runsAt)
-        .toISOString()}
-lastTriedAt:${(0, moment_1.default)(task.lastTriedAt)
-        .toISOString()}
-numberOfTried:${task.numberOfTried}
-lastMessage:${lastMessage}`;
-    return {
-        subject: exports.ABORT_REPORT_SUBJECT,
-        content: content
-    };
-}
+// function task2lineNotify(params: {
+//     task: factory.task.ITask<factory.taskName>;
+// }): ILineNotifyMessage {
+//     const task = params.task;
+//     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
+//     let lastError = lastExecutionResult?.error;
+//     if (typeof lastError === 'string') {
+//         lastError = { message: lastError, name: 'Error' };
+//     }
+//     const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
+//     const content = `project:${task.project?.id}
+// id:${task.id}
+// name:${task.name}
+// runsAt:${moment(task.runsAt)
+//             .toISOString()}
+// lastTriedAt:${moment((task.lastTriedAt as Date))
+//             .toISOString()}
+// numberOfTried:${task.numberOfTried}
+// lastMessage:${lastMessage}`;
+//     return {
+//         subject: ABORT_REPORT_SUBJECT,
+//         content: content
+//     };
+// }
 const MAX_LAST_MESSAGE_LENGTH = 60;
 function tasks2lineNotify(params) {
-    const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
+    const abortedTasksCount = (params.tasks.length >= params.limit) ? `over ${params.tasks.length}` : params.tasks.length;
+    const subject = `${abortedTasksCount} ${exports.ABORT_REPORT_SUBJECT}`;
     let content;
     // あまりに通知タスク数が多いケースに対応
     if (params.tasks.length > 10) {

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

@@ -1,13 +1,19 @@
 import type { TaskRepo } from '../../repo/task';
 import type { IntegrationSettingRepo } from '../../repo/setting/integration';
+interface INotifyAbortedTasksRepos {
+    task: TaskRepo;
+    integrationSetting: IntegrationSettingRepo;
+}
 /**
  * 中止されたタスクリストをEメールで通知する
  * add(2025-03-13~)
  */
 declare function notifyAbortedTasksByEmail(params: {
     dateAbortedGte: Date;
-}): (repos: {
-    task: TaskRepo;
-    integrationSetting: IntegrationSettingRepo;
-}) => Promise<void>;
-export { notifyAbortedTasksByEmail };
+    dateAbortedLte: Date;
+    /**
+     * 中止タスクがあまりに多いと性能に影響するので、現実的にタスク数を制限する
+     */
+    limit: number;
+}): (repos: INotifyAbortedTasksRepos) => Promise<void>;
+export { notifyAbortedTasksByEmail, INotifyAbortedTasksRepos };

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

@@ -17,16 +17,24 @@ function notifyAbortedTasksByEmail(params) {
     return async (repos) => {
         const abortedTasksWithoutReport = await repos.integrationSetting.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
+            limit: params.limit,
+            page: 1,
             status: { $eq: factory_1.factory.taskStatus.Aborted },
-            dateAborted: { $gte: params.dateAbortedGte },
+            dateAborted: {
+                $gte: params.dateAbortedGte,
+                $lte: params.dateAbortedLte,
+            },
             // 中止を報告しないタスク以外にフィルター
             ...(abortedTasksWithoutReport.length > 0)
                 ? { name: { $nin: abortedTasksWithoutReport } }
                 : undefined
-        }, []);
+        }, ['executionResults', 'name', 'project', 'runsAt']);
         if (abortedTasks.length > 0) {
             // 開発者へ報告
-            const message = (0, factory_2.tasks2lineNotify)({ tasks: abortedTasks });
+            const message = (0, factory_2.tasks2lineNotify)({
+                tasks: abortedTasks,
+                limit: params.limit
+            });
             const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -1,5 +1,4 @@
 import { factory } from '../../../../factory';
-import { IMinimizedIndividualEvent } from '../../../../factory/event';
 declare function createReserveTransactionStartParams(params: {
     project: {
         id: string;
@@ -13,7 +12,6 @@ declare function createReserveTransactionStartParams(params: {
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
-    event: Pick<IMinimizedIndividualEvent, 'id'>;
     instrument: {
         /**
          * 予約取引番号
@@ -21,8 +19,6 @@ declare function createAuthorizeSeatReservationActionAttributes(params: {
         transactionNumber: string;
     };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-}, options: {
-    useLegacyAuthorizeOfferObject: boolean;
 }): factory.action.authorize.offer.eventService.IAttributes;
 declare function acceptedOffers2amount(params: {
     acceptedOffers: Pick<IResultAcceptedOffer, 'priceSpecification' | 'id'>[];
@@ -31,7 +27,9 @@ declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
     ticketOffers: factory.product.ITicketOffer[];
-}): factory.action.authorize.offer.eventService.IResult;
+}): factory.action.authorize.offer.eventService.IResult & {
+    onlyPrice?: boolean;
+};
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 export type IResultAcceptedOffer = Omit<factory.order.IOptimizedAcceptedOffer, 'priceSpecification'> & {
     itemOffered: factory.order.IEventReservation;