@chevre/domain 28.0.0-alpha.5 → 28.0.0-alpha.7

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

@@ -52,7 +52,6 @@ export declare class AdminTransactionRepo {
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -63,11 +62,9 @@ export declare class AdminTransactionRepo {
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -78,15 +75,13 @@ export declare class AdminTransactionRepo {
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<{
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -97,11 +92,9 @@ export declare class AdminTransactionRepo {
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }>, (import("mongoose").Document<unknown, Record<string, never>, {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -112,11 +105,9 @@ export declare class AdminTransactionRepo {
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     }, import("./mongoose/virtuals").IVirtuals, {}> & {
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
-        error?: any;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
@@ -127,8 +118,7 @@ export declare class AdminTransactionRepo {
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
-        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: undefined;
+        tasksExportAction?: import("@chevre/factory/lib/chevre/transaction/placeOrder").ITasksExportAction | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

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

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'endDate' | 'error' | 'expires' | 'instrument' | 'object' | 'potentialActions' | 'project' | 'result' | 'seller' | 'startDate' | 'status' | 'tasksExportAction' | 'typeOf'>;
+type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, 'agent' | 'endDate' | 'expires' | 'instrument' | 'object' | 'project' | 'result' | 'seller' | 'startDate' | 'status' | 'tasksExportAction' | 'typeOf'>;
 type IDocType = IPlaceOrder;
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

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

@@ -11,18 +11,18 @@ const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     status: { type: String, required: true },
     typeOf: { type: String, required: true },
-    agent: mongoose_1.SchemaTypes.Mixed,
+    agent: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     expires: { type: Date, required: true },
     startDate: { type: Date, required: true },
-    // recipient: SchemaTypes.Mixed, // discontinue(2026-09-09~)
     seller: mongoose_1.SchemaTypes.Mixed,
-    error: mongoose_1.SchemaTypes.Mixed,
     result: mongoose_1.SchemaTypes.Mixed,
     object: mongoose_1.SchemaTypes.Mixed,
     endDate: Date,
     tasksExportAction: mongoose_1.SchemaTypes.Mixed,
-    potentialActions: mongoose_1.SchemaTypes.Mixed,
-    instrument: mongoose_1.SchemaTypes.Mixed
+    instrument: mongoose_1.SchemaTypes.Mixed,
+    // recipient: SchemaTypes.Mixed, // discontinue(2026-09-09~)
+    // error: SchemaTypes.Mixed, // discontinue(2026-09-14~)
+    // potentialActions: SchemaTypes.Mixed, // discontinue(2026-09-14~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -53,10 +53,6 @@ const indexes = [
         { 'project.id': 1, startDate: -1 },
         { name: 'searchByProjectId-v20220721' }
     ],
-    [
-        { typeOf: 1, startDate: -1 },
-        { name: 'searchByTypeOfAndStartDate' }
-    ],
     [
         { status: 1, startDate: -1 },
         { name: 'searchByStatusAndStartDate' }
@@ -110,24 +106,6 @@ const indexes = [
     //         }
     //     }
     // ],
-    [
-        { 'agent.typeOf': 1, startDate: -1 },
-        {
-            name: 'searchByAgentTypeOfAndStartDate',
-            partialFilterExpression: {
-                'agent.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.id': 1, startDate: -1 },
-        {
-            name: 'searchByAgentIdAndStartDate',
-            partialFilterExpression: {
-                'agent.id': { $exists: true }
-            }
-        }
-    ],
     [
         { 'agent.identifier': 1, startDate: -1 },
         {
@@ -223,6 +201,28 @@ const indexes = [
     //         }
     //     }
     // ],
+    // [
+    //     { typeOf: 1, startDate: -1 },
+    //     { name: 'searchByTypeOfAndStartDate' }
+    // ],
+    // [
+    //     { 'agent.typeOf': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByAgentTypeOfAndStartDate',
+    //         partialFilterExpression: {
+    //             'agent.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'agent.id': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByAgentIdAndStartDate',
+    //         partialFilterExpression: {
+    //             'agent.id': { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/place/screeningRoom.d.ts

@@ -84,7 +84,23 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<mongo.DeleteResult>;
-    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    projectRoomFields(params: Pick<factory.place.screeningRoom.ISearchConditions, '$projection' | 'branchCode' | 'containedInPlace' | 'parentOrganization'> & {
+        /**
+         * プロジェクト指定は必須
+         */
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        limit: number;
+        page: number;
+    }): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'containedInPlace' | 'maximumAttendeeCapacity' | 'name' | 'openSeatingAllowed' | 'typeOf' | 'seatCount' | 'sectionCount'>[]>;
     findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
      * セクションと座席も含めたひとつのルームを取得する

package/lib/chevre/repo/place/screeningRoom.js

@@ -379,10 +379,14 @@ class ScreeningRoomRepo {
         })
             .exec();
     }
-    async searchScreeningRooms(searchConditions) {
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    async projectRoomFields(params) {
         const aggregate = this.placeModel.aggregate([
-            { $sort: { branchCode: factory_1.factory.sortType.Ascending } },
-            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(searchConditions),
+            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(params),
             {
                 $project: {
                     _id: 0,
@@ -399,7 +403,7 @@ class ScreeningRoomRepo {
                     openSeatingAllowed: '$openSeatingAllowed',
                     additionalProperty: '$additionalProperty',
                     maximumAttendeeCapacity: '$maximumAttendeeCapacity',
-                    ...(searchConditions.$projection?.sectionCount === 1)
+                    ...(params.$projection?.sectionCount === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -410,7 +414,7 @@ class ScreeningRoomRepo {
                             }
                         }
                         : undefined,
-                    ...(searchConditions.$projection?.seatCount === 1)
+                    ...(params.$projection?.seatCount === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -429,14 +433,16 @@ class ScreeningRoomRepo {
                         }
                         : undefined
                 }
-            }
+            },
+            { $sort: { branchCode: factory_1.factory.sortType.Ascending } }
         ]);
-        /* istanbul ignore else */
-        if (typeof searchConditions.limit === 'number' && searchConditions.limit > 0) {
-            const page = (typeof searchConditions.page === 'number' && searchConditions.page > 0) ? searchConditions.page : 1;
-            aggregate.limit(searchConditions.limit * page)
-                .skip(searchConditions.limit * (page - 1));
+        const { limit, page } = params;
+        if (typeof limit !== 'number' || limit === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('limit', 'must be number > 0');
         }
+        const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+        aggregate.skip(limit * (pageMustBePositive - 1))
+            .limit(limit);
         return aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();

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

@@ -1,6 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../../factory';
-type IKeyOfProjection = 'agent' | 'endDate' | 'expires' | 'project' | 'startDate' | 'status' | 'typeOf' | 'instrument' | 'object' | 'seller' | 'result' | 'potentialActions' | 'error' | 'tasksExportAction';
+type IKeyOfProjection = 'agent' | 'endDate' | 'expires' | 'project' | 'startDate' | 'status' | 'typeOf' | 'instrument' | 'object' | 'seller' | 'result' | 'tasksExportAction';
 export type ITransactionInProgress = Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
     /**
      * 取引ID
@@ -80,7 +80,6 @@ export declare class PlaceOrderRepo {
             confirmationNumber: string;
         };
         result: factory.transaction.placeOrder.IResult;
-        potentialActions?: factory.transaction.placeOrder.IPotentialActions;
     }): Promise<void>;
     /**
      * 取引を中止する

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

@@ -21,9 +21,9 @@ const AVAILABLE_PROJECT_FIELDS = [
     'endDate',
     'instrument',
     'result',
-    'potentialActions',
+    // 'potentialActions', // discontinue(2026-09-14~)
     // 'recipient',
-    'error',
+    // 'error', // discontinue(2026-09-14~)
     'tasksExportAction',
 ];
 /**
@@ -84,31 +84,9 @@ class PlaceOrderRepo {
         if (Array.isArray(statusIn)) {
             andConditions.push({ status: { $in: statusIn } });
         }
-        if (params.agent !== undefined) {
-            if (params.agent.typeOf !== undefined) {
-                andConditions.push({
-                    'agent.typeOf': {
-                        $exists: true,
-                        $eq: params.agent.typeOf
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.ids)) {
-                andConditions.push({
-                    'agent.id': {
-                        $exists: true,
-                        $in: params.agent.ids
-                    }
-                });
-            }
-            if (Array.isArray(params.agent.identifiers)) {
-                andConditions.push({
-                    'agent.identifier': {
-                        $exists: true,
-                        $in: params.agent.identifiers
-                    }
-                });
-            }
+        const agentIdentifierIn = params.agent?.identifiers;
+        if (Array.isArray(agentIdentifierIn)) {
+            andConditions.push({ 'agent.identifier': { $exists: true, $in: agentIdentifierIn } });
         }
         // discontinue(2026-09-11~)
         // const tasksExportActionStatusIn = params.tasksExportAction?.actionStatus?.$in;
@@ -332,7 +310,7 @@ class PlaceOrderRepo {
             'object.orderNumber': params.object.orderNumber, // add(2026-06-27~)
             'object.confirmationNumber': params.object.confirmationNumber, // add(2026-07-08~)
             result: params.result, // resultを更新
-            ...((params.potentialActions !== undefined) && { potentialActions: params.potentialActions }) // support undefined(2026-07-17~)
+            // ...((params.potentialActions !== undefined) && { potentialActions: params.potentialActions }) // support undefined(2026-07-17~)
         }, {
             new: true,
             projection: { _id: 1 }

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": "11.0.0-alpha.2",
+    "@chevre/factory": "11.0.0-alpha.3",
     "@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": "28.0.0-alpha.5"
+  "version": "28.0.0-alpha.7"
 }