@chevre/domain 25.2.0-alpha.2 → 25.2.0-alpha.21

package/lib/chevre/repo/action/actionProcess.js

@@ -19,9 +19,9 @@ exports.AVAILABLE_PROJECT_FIELDS = [
     'endDate',
     'purpose',
     'potentialActions',
-    'amount',
-    'fromLocation',
-    'toLocation',
+    // 'amount', // discontinue(2026-07-08~)
+    // 'fromLocation', // discontinue(2026-07-08~)
+    // 'toLocation', // discontinue(2026-07-08~)
     'instrument',
     'location',
     'replacer',
@@ -322,60 +322,60 @@ class ActionProcessRepo {
                 startDate: { $lte: startDateLte }
             });
         }
-        const fromLocationTypeOfIn = params.fromLocation?.typeOf?.$in;
-        if (Array.isArray(fromLocationTypeOfIn)) {
-            andConditions.push({
-                'fromLocation.typeOf': {
-                    $exists: true,
-                    $in: fromLocationTypeOfIn
-                }
-            });
-        }
-        const fromLocationAccountNumberIn = params.fromLocation?.accountNumber?.$in;
-        if (Array.isArray(fromLocationAccountNumberIn)) {
-            andConditions.push({
-                'fromLocation.accountNumber': {
-                    $exists: true,
-                    $in: fromLocationAccountNumberIn
-                }
-            });
-        }
-        const fromLocationAccountTypeIn = params.fromLocation?.accountType?.$in;
-        if (Array.isArray(fromLocationAccountTypeIn)) {
-            andConditions.push({
-                'fromLocation.accountType': {
-                    $exists: true,
-                    $in: fromLocationAccountTypeIn
-                }
-            });
-        }
-        const toLocationTypeOfIn = params.toLocation?.typeOf?.$in;
-        if (Array.isArray(toLocationTypeOfIn)) {
-            andConditions.push({
-                'toLocation.typeOf': {
-                    $exists: true,
-                    $in: toLocationTypeOfIn
-                }
-            });
-        }
-        const toLocationAccountNumberIn = params.toLocation?.accountNumber?.$in;
-        if (Array.isArray(toLocationAccountNumberIn)) {
-            andConditions.push({
-                'toLocation.accountNumber': {
-                    $exists: true,
-                    $in: toLocationAccountNumberIn
-                }
-            });
-        }
-        const toLocationAccountTypeIn = params.toLocation?.accountType?.$in;
-        if (Array.isArray(toLocationAccountTypeIn)) {
-            andConditions.push({
-                'toLocation.accountType': {
-                    $exists: true,
-                    $in: toLocationAccountTypeIn
-                }
-            });
-        }
+        // const fromLocationTypeOfIn = params.fromLocation?.typeOf?.$in;
+        // if (Array.isArray(fromLocationTypeOfIn)) {
+        //     andConditions.push({
+        //         'fromLocation.typeOf': {
+        //             $exists: true,
+        //             $in: fromLocationTypeOfIn
+        //         }
+        //     });
+        // }
+        // const fromLocationAccountNumberIn = params.fromLocation?.accountNumber?.$in;
+        // if (Array.isArray(fromLocationAccountNumberIn)) {
+        //     andConditions.push({
+        //         'fromLocation.accountNumber': {
+        //             $exists: true,
+        //             $in: fromLocationAccountNumberIn
+        //         }
+        //     });
+        // }
+        // const fromLocationAccountTypeIn = params.fromLocation?.accountType?.$in;
+        // if (Array.isArray(fromLocationAccountTypeIn)) {
+        //     andConditions.push({
+        //         'fromLocation.accountType': {
+        //             $exists: true,
+        //             $in: fromLocationAccountTypeIn
+        //         }
+        //     });
+        // }
+        // const toLocationTypeOfIn = params.toLocation?.typeOf?.$in;
+        // if (Array.isArray(toLocationTypeOfIn)) {
+        //     andConditions.push({
+        //         'toLocation.typeOf': {
+        //             $exists: true,
+        //             $in: toLocationTypeOfIn
+        //         }
+        //     });
+        // }
+        // const toLocationAccountNumberIn = params.toLocation?.accountNumber?.$in;
+        // if (Array.isArray(toLocationAccountNumberIn)) {
+        //     andConditions.push({
+        //         'toLocation.accountNumber': {
+        //             $exists: true,
+        //             $in: toLocationAccountNumberIn
+        //         }
+        //     });
+        // }
+        // const toLocationAccountTypeIn = params.toLocation?.accountType?.$in;
+        // if (Array.isArray(toLocationAccountTypeIn)) {
+        //     andConditions.push({
+        //         'toLocation.accountType': {
+        //             $exists: true,
+        //             $in: toLocationAccountTypeIn
+        //         }
+        //     });
+        // }
         const purposeTypeOfIn = params.purpose?.typeOf?.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({

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

@@ -9,6 +9,10 @@ export { ICancelActionAction };
  */
 type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction>;
 type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds | factory.recipe.RecipeCategory.payCreditCard | factory.recipe.RecipeCategory.payMovieTicket | factory.recipe.RecipeCategory.refundCreditCard | factory.recipe.RecipeCategory.refundMovieTicket>>;
+export interface IDeleteActionResult {
+    identifier: string;
+    deletedCount?: number;
+}
 /**
  * アクションリポジトリ
  */
@@ -50,15 +54,20 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
         orderNumber: string;
         sort?: factory.action.ISortOrder;
     }): Promise<IAction<factory.actionType>[]>;
+    /**
+     * 注文番号から、注文に対するアクションを削除する
+     */
+    deleteActionsByOrderNumber(params: {
+        project: {
+            id: string;
+        };
+        orderNumber: string;
+    }): Promise<IDeleteActionResult[]>;
     deleteByProject(params: {
         project: {
             id: string;
         };
     }): Promise<void>;
-    /**
-     * イベントと入場ゲート指定で予約使用アクションを集計する
-     * discontinue(2024-12-26~)
-     */
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */
@@ -78,20 +87,18 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
     /**
      * 取引からアクションを削除する
      */
-    deleteByPurpose(params: {
+    deleteActionsByTransactionId(params: {
         project: {
             id: string;
         };
-        purpose: {
+        transaction: {
             typeOf: factory.transactionType;
             id: string;
         };
         typeOf: {
             $in: factory.actionType[];
         };
-    }): Promise<{
-        deletedCount?: number;
-    } | null>;
+    }): Promise<IDeleteActionResult[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/chevre/action").IAction<import("@chevre/factory/lib/chevre/action").IAttributes<factory.actionType, any, any>>, "id"> & {
         identifier?: string;
     } & {

package/lib/chevre/repo/action.js

@@ -312,130 +312,68 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
             .lean() // 2024-08-26~
             .exec();
     }
+    /**
+     * 注文番号から、注文に対するアクションを削除する
+     */
+    async deleteActionsByOrderNumber(params) {
+        const { project, orderNumber } = params;
+        if (typeof project.id !== 'string' || project.id === '') {
+            throw new factory_1.factory.errors.ArgumentNull('project.id');
+        }
+        if (typeof orderNumber !== 'string' || orderNumber === '') {
+            throw new factory_1.factory.errors.ArgumentNull('orderNumber');
+        }
+        const filters = [
+            {
+                identifier: 'byObject',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'object.orderNumber': { $exists: true, $eq: orderNumber }
+                }
+            },
+            {
+                identifier: 'byPurpose',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'purpose.orderNumber': { $exists: true, $eq: orderNumber }
+                }
+            },
+            {
+                identifier: 'byAbout',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'about.orderNumber': { $exists: true, $eq: orderNumber }
+                }
+            },
+            {
+                identifier: 'byInstrument',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    'instrument.orderNumber': { $exists: true, $eq: orderNumber }
+                }
+            },
+        ];
+        return Promise.all(filters.map(async ({ identifier, filter }) => {
+            return this.actionModel.deleteMany(filter)
+                .exec()
+                .then((result) => {
+                return {
+                    identifier,
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result?.deletedCount
+                };
+            });
+        }));
+    }
     async deleteByProject(params) {
         await this.actionModel.deleteMany({
             'project.id': { $eq: params.project.id }
         })
             .exec();
     }
-    // public async reCompleteAuthorizeEventOfferAction(params: {
-    //     id: string;
-    //     object: factory.action.authorize.offer.eventService.IObject;
-    //     result: factory.action.authorize.offer.eventService.IResult;
-    // }): Promise<void> {
-    //     return this.actionModel.findOneAndUpdate(
-    //         {
-    //             // typeOf: factory.actionType.AuthorizeAction,
-    //             _id: { $eq: params.id },
-    //             // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
-    //             // actionStatus: factory.actionStatusType.CompletedActionStatus
-    //             actionStatus: { $eq: factory.actionStatusType.ActiveActionStatus }
-    //         },
-    //         {
-    //             $set: {
-    //                 actionStatus: factory.actionStatusType.CompletedActionStatus,
-    //                 object: params.object,
-    //                 result: params.result,
-    //                 endDate: new Date()
-    //             }
-    //         },
-    //         { new: true, projection: { _id: 1 } }
-    //     )
-    //         .lean<{ _id: ObjectId }>()
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //         });
-    // }
-    // public async updateById(params: {
-    //     id: string;
-    //     update: any;
-    // }): Promise<void> {
-    //     await this.actionModel.updateOne(
-    //         { _id: { $eq: params.id } },
-    //         params.update
-    //     )
-    //         .exec();
-    // }
-    // public async findByIdAndUpdate(params: {
-    //     id: string;
-    //     update: UpdateQuery<IAction<factory.actionType>>;
-    // }): Promise<void> {
-    //     await this.actionModel.findOneAndUpdate(
-    //         { _id: { $eq: params.id } },
-    //         params.update,
-    //         { projection: { _id: 1 } }
-    //     )
-    //         .lean<{ _id: ObjectId }>()
-    //         .exec()
-    //         .then((doc) => {
-    //             if (doc === null) {
-    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
-    //             }
-    //         });
-    // }
-    /**
-     * イベントと入場ゲート指定で予約使用アクションを集計する
-     * discontinue(2024-12-26~)
-     */
-    // public async countUseActionsByEntranceGate(params: {
-    //     event: { id: string };
-    //     entranceGateIdentifier: string;
-    // }): Promise<IUseActionCountByOffer[]> {
-    //     return this.actionModel.aggregate([
-    //         {
-    //             $match: {
-    //                 actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-    //             }
-    //         },
-    //         {
-    //             $match: {
-    //                 typeOf: { $eq: factory.actionType.UseAction }
-    //             }
-    //         },
-    //         {
-    //             $match: {
-    //                 'object.typeOf': {
-    //                     $exists: true,
-    //                     $eq: factory.reservationType.EventReservation
-    //                 }
-    //             }
-    //         },
-    //         {
-    //             $match: {
-    //                 'object.reservationFor.id': {
-    //                     $exists: true,
-    //                     $eq: params.event.id
-    //                 }
-    //             }
-    //         },
-    //         {
-    //             $match: {
-    //                 'location.identifier': {
-    //                     $exists: true,
-    //                     $eq: params.entranceGateIdentifier
-    //                 }
-    //             }
-    //         },
-    //         {
-    //             $group: {
-    //                 _id: '$object.id',
-    //                 object: { $first: '$object' }
-    //             }
-    //         },
-    //         {
-    //             $group: {
-    //                 _id: '$object.reservedTicket.ticketType.id',
-    //                 useActionCount: {
-    //                     $sum: 1
-    //                 }
-    //             }
-    //         }
-    //     ])
-    //         .exec();
-    // }
     /**
      * 開始日時を一定期間過ぎたアクションを削除する
      */
@@ -473,69 +411,50 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     /**
      * 取引からアクションを削除する
      */
-    async deleteByPurpose(params) {
-        return this.actionModel.deleteMany({
-            'project.id': { $eq: params.project.id },
-            typeOf: { $in: params.typeOf.$in },
-            'purpose.id': { $exists: true, $eq: params.purpose.id },
-            'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf }
-        })
-            .exec()
-            .then((result) => {
-            return {
-                // n: result?.n,
-                // opTime: result.opTime,
-                // ok: result?.ok,
-                // operationTime,
-                deletedCount: result?.deletedCount
-            };
-        });
+    async deleteActionsByTransactionId(params) {
+        const { project, transaction } = params;
+        if (typeof project.id !== 'string' || project.id === '') {
+            throw new factory_1.factory.errors.ArgumentNull('project.id');
+        }
+        if (typeof transaction.id !== 'string' || transaction.id === '') {
+            throw new factory_1.factory.errors.ArgumentNull('transaction.id ');
+        }
+        const filters = [
+            {
+                identifier: 'byPurpose',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    typeOf: { $in: params.typeOf.$in },
+                    'purpose.id': { $exists: true, $eq: transaction.id },
+                    'purpose.typeOf': { $exists: true, $eq: transaction.typeOf }
+                }
+            },
+            // instrumentによるアクション削除にも対応(2026-07-10~)
+            {
+                identifier: 'byInstrument',
+                filter: {
+                    'project.id': { $eq: project.id },
+                    // typeOf: { $in: params.typeOf.$in }, // typOfでフィルターしない
+                    'instrument.id': { $exists: true, $eq: transaction.id },
+                    'instrument.typeOf': { $exists: true, $eq: transaction.typeOf }
+                }
+            }
+        ];
+        return Promise.all(filters.map(async ({ identifier, filter }) => {
+            return this.actionModel.deleteMany(filter)
+                .exec()
+                .then((result) => {
+                return {
+                    identifier,
+                    // n: result?.n,
+                    // opTime: result.opTime,
+                    // ok: result?.ok,
+                    // operationTime,
+                    deletedCount: result?.deletedCount
+                };
+            });
+        }));
     }
-    // public async saveActionWithEndDate(savingAction: Omit<factory.action.authorize.invoice.IAction, 'id'>) {
-    //     const { sameAs, typeOf, project, agent, object, ...updateFields } = savingAction;
-    //     const filter: FilterQuery<factory.recipe.IRecipe> = {
-    //         'project.id': { $eq: project.id },
-    //         // 'agent.id': { $exists: true, $eq: agent.id },
-    //         // 'object.typeOf': { $exists: true, $eq: object.typeOf },
-    //         'object.paymentMethodId': { $exists: true, $eq: object.paymentMethodId },
-    //         typeOf: { $eq: typeOf },
-    //         'sameAs.id': { $exists: true, $eq: sameAs.id }
-    //     };
-    //     const setOnInsert: AnyKeys<IAction<factory.actionType>> = { typeOf, project, agent, object, sameAs };
-    //     const setKeys: AnyKeys<IAction<factory.actionType>> = updateFields;
-    //     const update: UpdateQuery<IAction<factory.actionType>> = {
-    //         $setOnInsert: setOnInsert,
-    //         $set: setKeys
-    //     };
-    //     return this.actionModel.updateOne<HydratedDocument<IRecipeAsDocument>>(
-    //         filter,
-    //         update,
-    //         {
-    //             upsert: true,
-    //             includeResultMetadata: true
-    //         }
-    //     )
-    //         .exec();
-    // }
-    // public async findRecipeByAction<T extends factory.recipe.RecipeCategory>(params: {
-    //     project: { id: string };
-    //     recipeFor: { id: string };
-    // }): Promise<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'> | null> {
-    //     return this.actionRecipeModel.findOne(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             'recipeFor.id': { $eq: params.recipeFor.id }
-    //         },
-    //         { step: 1, recipeCategory: 1 }
-    //         // { lean: true }
-    //     )
-    //         .lean<Pick<IActionRecipe<T>, 'step' | 'recipeCategory'>>()
-    //         .exec();
-    //     // if (result === null) {
-    //     //     throw new factory.errors.NotFound(this.actionRecipeModel.modelName);
-    //     // }
-    //     // return result;
-    // }
     getCursor(conditions, projection) {
         return this.actionModel.find(conditions, projection)
             .sort({ startDate: factory_1.factory.sortType.Descending })

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

@@ -21,9 +21,9 @@ const schemaDefinition = {
     endDate: Date,
     purpose: mongoose_1.SchemaTypes.Mixed,
     potentialActions: mongoose_1.SchemaTypes.Mixed,
-    amount: mongoose_1.SchemaTypes.Mixed,
-    fromLocation: mongoose_1.SchemaTypes.Mixed,
-    toLocation: mongoose_1.SchemaTypes.Mixed,
+    // amount: SchemaTypes.Mixed, // discontinue(2026-07-08~)
+    // fromLocation: SchemaTypes.Mixed, // discontinue(2026-07-08~)
+    // toLocation: SchemaTypes.Mixed, // discontinue(2026-07-08~)
     instrument: mongoose_1.SchemaTypes.Mixed,
     location: mongoose_1.SchemaTypes.Mixed, // add location(2022-11-11~)
     replacer: mongoose_1.SchemaTypes.Mixed, // add replacer(2024-03-19~)
@@ -221,15 +221,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'object.event.id': 1, startDate: -1 },
-        {
-            name: 'searchByObjectEventId',
-            partialFilterExpression: {
-                'object.event.id': { $exists: true }
-            }
-        }
-    ],
+    // 承認アクションのobject.event廃止につき検索条件も廃止(2026-07-07~)
+    // [
+    //     { 'object.event.id': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByObjectEventId',
+    //         partialFilterExpression: {
+    //             'object.event.id': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'about.id': 1, startDate: -1 },
         {
@@ -329,60 +330,60 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'fromLocation.typeOf': 1, startDate: -1 },
-        {
-            name: 'searchByFromLocationTypeOf',
-            partialFilterExpression: {
-                'fromLocation.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'fromLocation.accountNumber': 1, startDate: -1 },
-        {
-            name: 'searchByFromLocationAccountNumber',
-            partialFilterExpression: {
-                'fromLocation.accountNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'fromLocation.accountType': 1, startDate: -1 },
-        {
-            name: 'searchByFromLocationAccountType',
-            partialFilterExpression: {
-                'fromLocation.accountType': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'toLocation.typeOf': 1, startDate: -1 },
-        {
-            name: 'searchByToLocationTypeOf',
-            partialFilterExpression: {
-                'toLocation.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'toLocation.accountNumber': 1, startDate: -1 },
-        {
-            name: 'searchByToLocationAccountNumber',
-            partialFilterExpression: {
-                'toLocation.accountNumber': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'toLocation.accountType': 1, startDate: -1 },
-        {
-            name: 'searchByToLocationAccountType',
-            partialFilterExpression: {
-                'toLocation.accountType': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     { 'fromLocation.typeOf': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByFromLocationTypeOf',
+    //         partialFilterExpression: {
+    //             'fromLocation.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'fromLocation.accountNumber': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByFromLocationAccountNumber',
+    //         partialFilterExpression: {
+    //             'fromLocation.accountNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'fromLocation.accountType': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByFromLocationAccountType',
+    //         partialFilterExpression: {
+    //             'fromLocation.accountType': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'toLocation.typeOf': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByToLocationTypeOf',
+    //         partialFilterExpression: {
+    //             'toLocation.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'toLocation.accountNumber': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByToLocationAccountNumber',
+    //         partialFilterExpression: {
+    //             'toLocation.accountNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'toLocation.accountType': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByToLocationAccountType',
+    //         partialFilterExpression: {
+    //             'toLocation.accountType': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'instrument.transactionNumber': 1, startDate: -1 },
         {

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

@@ -7,6 +7,10 @@ type IDocType = Omit<factory.order.IOrder, 'id'> & {
      * 注文取引IDとして再定義(2026-06-22~)
      */
     identifier?: string;
+    /**
+     * 外部URL決済の場合に発行される決済方法IDとして定義(2026-07-12~)
+     */
+    paymentMethodId?: string;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -27,6 +27,7 @@ const schemaDefinition = {
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed],
     identifier: { type: String, required: true }, // 注文取引IDとして再定義(2026-06-22~)
+    paymentMethodId: { type: String, required: false }, // 注文取引から移行(2026-07-12~)
     // 以下廃止(2026-06-13~)
     // identifier: SchemaTypes.Mixed, // 廃止するためにMixed化(2026-06-12~)
     // isGift: Boolean,