@chevre/domain 26.0.0-alpha.9 → 26.1.0-alpha.0

package/lib/chevre/service/transaction/deleteTransaction.js

@@ -71,13 +71,13 @@ function deleteTransactionById(params) {
         let deletedReservationNumbers = [];
         let deleteActionResult;
         let deleteOrderResult;
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         try {
             const transactionTypeOf = transaction.typeOf;
             switch (transactionTypeOf) {
                 case factory_1.factory.transactionType.PlaceOrder: {
                     // 取引に対する全ての承認アクションを検索
-                    const authorizeActions = await repos.action.searchByPurpose({
+                    const authorizeActions = await repos.adminAction.searchByPurpose({
                         typeOf: factory_1.factory.actionType.AuthorizeAction,
                         purpose: {
                             typeOf: transactionTypeOf,
@@ -111,7 +111,7 @@ function deleteTransactionById(params) {
                         deleteReservationsByPlaceOrderResult.deleteCancelReservationTransactionResult;
                     deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
                     // アクション削除(2023-05-19~)
-                    deleteActionResult = await repos.action.deleteActionsByTransactionId({
+                    deleteActionResult = await repos.adminAction.deleteActionsByTransactionId({
                         project: { id: transaction.project.id },
                         transaction: { id: transaction.id, typeOf: transactionTypeOf },
                         typeOf: {
@@ -132,13 +132,13 @@ function deleteTransactionById(params) {
                     // })(repos);
                     // deleteMessagessResult = deleteMessagesByPlaceOrderResult.deleteResult;
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 }
                 // implemented(2022-06-09~)
                 case factory_1.factory.transactionType.ReturnOrder:
                     // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    await repos.adminTransaction.findByIdAndDelete({ id: transaction.id });
                     break;
                 default:
                     throw new factory_1.factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
@@ -146,7 +146,7 @@ function deleteTransactionById(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -166,6 +166,6 @@ function deleteTransactionById(params) {
             deleteOrderResult // 2026-07-10~
             // ...(deleteMessagessResult !== undefined) ? { deleteMessagessResult } : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }

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

@@ -128,7 +128,7 @@ function confirm(params, options) {
         const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
         // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
-            payTransactions = await repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: payTransactionNumbers }
             }, ['object']);

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | Omit<factory.task.voidReserveTransaction.IAttributes, 'expires'>;
 /**
  * 取引のタスクを作成する
  * 取引削除タスクを分離(2026-08-02~)

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

@@ -25,24 +25,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
         const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
-        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
-        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
-            // support scheduledTask(2026-08-02~)
-            await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
-            await repos.scheduledTask.addScheduledTasks([{
-                    ...deleteTask,
-                    expires: (0, moment_1.default)(deleteTask.runsAt)
-                        .add(deleteTransactionTaskExpiresInDays, 'days')
-                        .toDate()
-                }]);
-        }
-        else {
-            await repos.task.saveMany([
-                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
-                deleteTask
-            ]);
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
         }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

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

@@ -167,24 +167,18 @@ function exportTasksById(params) {
         }
         // search settings
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const useScheduledDeleteTransactionTask = setting?.storage?.useScheduledDeleteTransactionTask === true;
         const deleteTransactionTaskExpiresInDays = setting?.storage?.deleteTransactionTaskExpiresInDays;
-        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
-        if (useScheduledDeleteTransactionTask && typeof deleteTransactionTaskExpiresInDays === 'number' && deleteTransactionTaskExpiresInDays > 0) {
-            // support scheduledTask(2026-08-02~)
-            await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
-            await repos.scheduledTask.addScheduledTasks([{
-                    ...deleteTask,
-                    expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
-                        .add(deleteTransactionTaskExpiresInDays, 'days')
-                        .toDate()
-                }]);
-        }
-        else {
-            await repos.task.saveMany([
-                ...(0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }),
-                deleteTask
-            ]);
+        if (typeof deleteTransactionTaskExpiresInDays !== 'number') {
+            throw new factory_1.factory.errors.Internal('settings.storage.deleteTransactionTaskExpiresInDays required');
         }
+        const deleteTask = (0, factory_2.createScheduledTasks)({ transaction }, setting);
+        // support scheduledTask(2026-08-02~)
+        await repos.task.saveMany((0, factory_2.createImmediateTasks)({ transaction, taskRunsAt }));
+        await repos.scheduledTask.addScheduledTasks([{
+                ...deleteTask,
+                expires: (0, moment_timezone_1.default)(deleteTask.runsAt)
+                    .add(deleteTransactionTaskExpiresInDays, 'days')
+                    .toDate()
+            }]);
     };
 }

package/lib/chevre/service/validation/validateOrder.d.ts

@@ -1,8 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
-import type { TaskRepo } from '../../repo/task';
 export declare function validateOrder(params: {
     orderNumber: string;
     project: {
@@ -12,6 +10,4 @@ export declare function validateOrder(params: {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
 }) => Promise<void>;

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrder = validateOrder;
 // import createDebug from 'debug';
 const moment_1 = __importDefault(require("moment"));
+// import type { SettingRepo } from '../../repo/setting';
 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");
 function validateOrder(params) {
     return async (repos) => {
@@ -25,11 +25,11 @@ function validateOrder(params) {
         });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
-            payTransactions = await repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: order.project.id } },
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: order.paymentMethods.map(({ paymentMethodId }) => paymentMethodId) }
-            }, [], []);
+            }, []);
         }
         // 型検証
         if (typeof order.confirmationNumber !== 'string' || order.confirmationNumber.length === 0) {

package/lib/chevre/taskSettings.d.ts

@@ -20,10 +20,10 @@ declare class AggregationSettings {
 interface IExecuteSettings extends IMinimumExecuteSettings {
     aggregationSettings?: AggregationSettings;
 }
-interface IExecuteOptions {
-    executeById: boolean;
-    executeByName: boolean;
-}
+/**
+ * かつてはexecuteById,executeByNameといったオプションが存在したが、現時点で特に何もなし(2026-08-07)
+ */
+type IExecuteOptions = Record<string, never>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
 type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.1.0-alpha.5",
+    "@chevre/factory": "10.3.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.9"
+  "version": "26.1.0-alpha.0"
 }

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -1,147 +0,0 @@
-import { Connection } from 'mongoose';
-import { factory } from '../../factory';
-import { IModel as IActionModel } from '../mongoose/schemas/action';
-import { IModel as IActionRecipeModel } from '../mongoose/schemas/actionRecipe';
-export type IAction4transaction<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction> = T extends factory.actionType.AcceptAction ? factory.action.accept.coaOffer.IAction | factory.action.accept.pay.IAction : T extends factory.actionType.AuthorizeAction ? (factory.action.authorize.offer.eventService.IAction | factory.action.authorize.paymentMethod.any.IAction) : never;
-export type IAction<T extends factory.actionType> = T extends factory.actionType.OrderAction ? factory.action.trade.order.IAction : T extends factory.actionType.AcceptAction ? IAction4transaction<factory.actionType.AcceptAction> : T extends factory.actionType.AuthorizeAction ? factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>> : T extends factory.actionType.CheckAction ? (factory.action.check.paymentMethod.movieTicket.IAction | factory.action.check.thing.IAction) : T extends factory.actionType.CreateAction ? factory.action.create.IAction : T extends factory.actionType.AddAction ? factory.action.update.add.IAction : T extends factory.actionType.ReplaceAction ? factory.action.update.replace.IAction : T extends factory.actionType.UpdateAction ? factory.action.update.update.IAction : T extends factory.actionType.InformAction ? factory.action.interact.inform.IAction<factory.action.interact.inform.IAttributes<factory.action.interact.inform.IObject>> & {
-    error?: any;
-    purpose?: never;
-} : factory.action.IAction<factory.action.IAttributes<T, any, any>>;
-export interface ICancelActionAction {
-    typeOf: factory.actionType.CancelAction;
-    agent: factory.action.IParticipantAsPerson | factory.action.IParticipantAsProject | factory.action.IParticipantAsWebApplication;
-    endTime: Date;
-    startTime: Date;
-    sameAs?: {
-        id: string;
-        typeOf: 'Task';
-    };
-}
-export type IActionRecipe<T extends factory.recipe.RecipeCategory> = T extends factory.recipe.RecipeCategory.checkMovieTicket ? factory.action.check.paymentMethod.movieTicket.IRecipe : T extends factory.recipe.RecipeCategory.payCreditCard ? factory.action.trade.pay.IPayCreditCardRecipe : T extends factory.recipe.RecipeCategory.payMovieTicket ? factory.action.trade.pay.IPayMovieTicketRecipe : T extends factory.recipe.RecipeCategory.publishPaymentUrl ? factory.action.accept.pay.IRecipe : T extends factory.recipe.RecipeCategory.refundCreditCard ? factory.action.trade.refund.IRefundCreditCardRecipe : T extends factory.recipe.RecipeCategory.refundMovieTicket ? factory.action.trade.refund.IRefundMovieTicketRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice ? factory.action.authorize.invoice.IAuthorizeInvoiceRecipe : T extends factory.recipe.RecipeCategory.authorizeInvoice3ds ? factory.action.authorize.invoice.IAuthorizeInvoice3dsRecipe : T extends factory.recipe.RecipeCategory.acceptCOAOffer ? factory.action.accept.coaOffer.IRecipe : T extends factory.recipe.RecipeCategory.confirmCOAReserve ? factory.action.interact.confirm.reservation.IConfirmCOAReserveRecipe : T extends factory.recipe.RecipeCategory.cancelPendingCOAReserve ? factory.action.cancel.coaReserve.ICancelPendingCOAReserveRecipe : T extends factory.recipe.RecipeCategory.returnCOAReserve ? factory.action.transfer.returnAction.reserveTransaction.IReturnCOAReserveRecipe : T extends factory.recipe.RecipeCategory.sendEmailMessage ? factory.action.transfer.send.message.email.IRecipe : never;
-export type IRecipeAsDocument = factory.recipe.IRecipe & {
-    recipeFor: {
-        id: string;
-        typeOf: factory.actionType;
-    };
-    dateCreated: Date;
-    dateModified?: Date;
-};
-export type IRecipeAsActionAttributes<T extends factory.recipe.RecipeCategory> = Pick<IActionRecipe<T>, 'project' | 'recipeCategory' | 'step' | 'typeOf'>;
-export type IMinimizedPurchaseNumberAuthResult = Pick<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult, 'mkknmiNumSum' | 'resultInfo' | 'ykknmiNumSum'> & {
-    knyknrNoInfoOut: Omit<factory.action.check.paymentMethod.movieTicket.IPurchaseNumberInfo, 'ykknInfo' | 'mkknInfo'>[] | null;
-};
-export type IKeyOfProjection = keyof IAction<factory.actionType> | keyof IAction<factory.actionType.AuthorizeAction> | keyof IAction<factory.actionType.ReplaceAction> | 'identifier';
-export declare const AVAILABLE_PROJECT_FIELDS: IKeyOfProjection[];
-/**
- * アクション状態管理リポジトリ
- */
-export declare class ActionProcessRepo<TAction extends IAction<factory.actionType>, TActionRecipe extends IActionRecipe<factory.recipe.RecipeCategory>> {
-    protected readonly actionModel: IActionModel;
-    protected readonly actionRecipeModel: IActionRecipeModel;
-    constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
-    /**
-     * アクション開始
-     */
-    start<T extends TAction['typeOf']>(attributes: factory.action.IAttributes<T, any, any>, // eslint-disable-line @typescript-eslint/no-explicit-any
-    options?: {
-        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
-    }): Promise<Pick<IAction<T>, 'id' | 'typeOf' | 'startDate'>>;
-    completeWithVoid(params: {
-        typeOf: TAction['typeOf'];
-        id: string;
-        result: any;
-        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
-    }): Promise<void>;
-    /**
-     * アクション取消
-     */
-    cancelWithVoid(params: {
-        typeOf: TAction['typeOf'];
-        id: string;
-        cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
-    }): Promise<void>;
-    /**
-     * アクション失敗
-     */
-    giveUp(params: {
-        typeOf: TAction['typeOf'];
-        id: string;
-        error: Error | Error[] | unknown;
-        recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
-    }): Promise<void>;
-    /**
-     * 一定期間ActiveActionStatusのアクションをFailedActionStatusにする
-     */
-    giveUpStartDatePassedCertainPeriod(params: {
-        id?: {
-            $eq?: string;
-        };
-        error: any;
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
-    findRecipeByAction<T extends TActionRecipe['recipeCategory']>(params: {
-        project: {
-            id: string;
-        };
-        recipeFor: {
-            id: string;
-        };
-    }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null>;
-    findById(params: {
-        typeOf: TAction['typeOf'];
-        id: string;
-    }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<TAction>;
-    searchBySameAs(params: {
-        sameAs: {
-            id: {
-                $eq: string;
-            };
-        };
-        purpose?: {
-            id: {
-                $eq: string;
-            };
-        };
-        /**
-         * 1taskから複数actionが発生する可能性があるので、typeOf指定が必須
-         */
-        typeOf: {
-            $eq: TAction['typeOf'];
-        };
-    }): Promise<Pick<TAction, 'id' | 'actionStatus' | 'error' | 'purpose'>[]>;
-    private findActionStatusById;
-    /**
-     * 汎用アクション検索
-     * 継承クラスから呼ぶ想定
-     */
-    protected findAnyActions(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<TAction[]>;
-    /**
-     * 取引に対する汎用アクション検索
-     * 継承クラスから呼ぶ想定
-     * 件数はlimitされない
-     */
-    protected findAnyActionsByPurpose<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction>(params: {
-        typeOf?: T;
-        purpose: {
-            typeOf: factory.transactionType;
-            id: string;
-        };
-        object?: {
-            typeOf?: {
-                $eq?: factory.action.authorize.offer.eventService.ObjectType.SeatReservation | factory.action.authorize.paymentMethod.any.ResultType.Payment | factory.offerType.AggregateOffer;
-                $in?: (factory.action.authorize.offer.eventService.ObjectType.SeatReservation)[];
-            };
-            paymentMethodId?: {
-                $eq?: string;
-            };
-        };
-        actionStatus?: {
-            $eq?: factory.actionStatusType.CompletedActionStatus;
-        };
-        sort?: factory.action.ISortOrder;
-    }): Promise<TAction[]>;
-    protected upsertRecipe(savingRecipe: Pick<IRecipeAsDocument, 'project' | 'recipeCategory' | 'recipeFor' | 'step' | 'typeOf'>): Promise<void>;
-}