@chevre/domain 28.0.0-alpha.1 → 28.0.0-alpha.10

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

@@ -4,26 +4,25 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const factory_1 = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Transaction';
 exports.modelName = modelName;
 const schemaDefinition = {
-    project: mongoose_1.SchemaTypes.Mixed,
-    status: String,
-    typeOf: String,
-    agent: mongoose_1.SchemaTypes.Mixed,
-    recipient: mongoose_1.SchemaTypes.Mixed,
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    status: { type: String, required: true },
+    typeOf: { type: String, required: true },
+    agent: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    expires: { type: Date, required: true },
+    startDate: { type: Date, required: true },
     seller: mongoose_1.SchemaTypes.Mixed,
-    error: mongoose_1.SchemaTypes.Mixed,
     result: mongoose_1.SchemaTypes.Mixed,
     object: mongoose_1.SchemaTypes.Mixed,
-    expires: Date,
-    startDate: Date,
     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,
@@ -54,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' }
@@ -66,19 +61,6 @@ const indexes = [
         { startDate: -1 },
         { name: 'searchByStartDateDescending' }
     ],
-    [
-        { endDate: 1, startDate: -1 },
-        {
-            name: 'searchByEndDateAndStartDate',
-            partialFilterExpression: {
-                endDate: { $exists: true }
-            }
-        }
-    ],
-    [
-        { expires: 1, startDate: -1 },
-        { name: 'searchByExpiresAndStartDate' }
-    ],
     [
         { 'object.confirmationNumber': 1, startDate: -1 },
         {
@@ -99,37 +81,31 @@ const indexes = [
     ],
     [
         // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        // 返品取引廃止につきuniquePlacingOrderNumberをreIndex
+        { 'object.orderNumber': 1 },
         {
-            typeOf: 1,
-            'object.orderNumber': 1
-        },
-        {
-            name: 'uniquePlacingOrderNumber',
+            name: 'uniqueOrderNumber',
             unique: true,
             partialFilterExpression: {
-                typeOf: factory_1.factory.transactionType.PlaceOrder,
                 'object.orderNumber': { $exists: true }
             }
         }
     ],
-    [
-        { 'agent.typeOf': 1, startDate: -1 },
-        {
-            name: 'searchByAgentTypeOfAndStartDate',
-            partialFilterExpression: {
-                'agent.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'agent.id': 1, startDate: -1 },
-        {
-            name: 'searchByAgentIdAndStartDate',
-            partialFilterExpression: {
-                'agent.id': { $exists: true }
-            }
-        }
-    ],
+    // [
+    //     // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+    //     {
+    //         typeOf: 1,
+    //         'object.orderNumber': 1
+    //     },
+    //     {
+    //         name: 'uniquePlacingOrderNumber',
+    //         unique: true,
+    //         partialFilterExpression: {
+    //             typeOf: factory.transactionType.PlaceOrder,
+    //             'object.orderNumber': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'agent.identifier': 1, startDate: -1 },
         {
@@ -171,24 +147,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'tasksExportAction.actionStatus': 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportActionActionStatus',
-            partialFilterExpression: {
-                'tasksExportAction.actionStatus': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'tasksExportAction.startDate': 1, startDate: -1 },
-        {
-            name: 'searchByTasksExportActionActionStartDate',
-            partialFilterExpression: {
-                'tasksExportAction.startDate': { $exists: true }
-            }
-        }
-    ],
     // typeOf: ReturnOrder廃止につき以下廃止(2026-09-08~)
     // [
     //     { 'object.order.orderNumber': 1, startDate: -1 },
@@ -212,6 +170,59 @@ const indexes = [
     //         }
     //     }
     // ],
+    // [
+    //     { endDate: 1, startDate: -1 },
+    //     {
+    //         name: 'searchByEndDateAndStartDate',
+    //         partialFilterExpression: {
+    //             endDate: { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { expires: 1, startDate: -1 },
+    //     { name: 'searchByExpiresAndStartDate' }
+    // ],
+    // [
+    //     { 'tasksExportAction.startDate': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByTasksExportActionActionStartDate',
+    //         partialFilterExpression: {
+    //             'tasksExportAction.startDate': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 'tasksExportAction.actionStatus': 1, startDate: -1 },
+    //     {
+    //         name: 'searchByTasksExportActionActionStatus',
+    //         partialFilterExpression: {
+    //             'tasksExportAction.actionStatus': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { 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/order.js

@@ -613,7 +613,9 @@ class OrderRepo {
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [
-                    'project', 'typeOf', 'orderNumber', 'dateReturned',
+                    'project', 'typeOf', 'orderNumber',
+                    'orderStatus', // すでに変更済かどうか検証するので必要
+                    'dateReturned',
                     'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
                 ]
             });

package/lib/chevre/repo/orderInTransaction.js

@@ -5,11 +5,6 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-// import {
-//     createSchema as createTransactionSchema,
-//     IModel as ITransactionModel, modelName as transactionModelName,
-//     IDocType as ITransactionDocType
-// } from './mongoose/schemas/transaction';
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -17,7 +12,6 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
-    // private readonly transactionModel: ITransactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());

package/lib/chevre/repo/place/{hasPOS.d.ts → pos.d.ts}

@@ -12,22 +12,18 @@ interface IOperator {
 /**
  * 施設のPOSリポジトリ
  */
-export declare class HasPOSRepo {
+export declare class POSRepo {
     readonly operator: IOperator;
     private readonly civicStructureModel;
     constructor(connection: Connection, operater: IOperator);
-    search(params: {
+    findPOS(params: {
+        projectId: string;
         limit?: number;
         page?: number;
         branchCode?: {
             $eq?: string;
             $regex?: string;
         };
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
     }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name' | 'id'>[]>;
     createByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
         project: {

package/lib/chevre/repo/place/{hasPOS.js → pos.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HasPOSRepo = void 0;
+exports.POSRepo = void 0;
 const mongoose_1 = require("mongoose");
 const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
@@ -8,21 +8,15 @@ const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 /**
  * 施設のPOSリポジトリ
  */
-class HasPOSRepo {
+class POSRepo {
     operator;
     civicStructureModel;
     constructor(connection, operater) {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
-    async search(params) {
-        const matchStages = [
-            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
-        ];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-        }
+    async findPOS(params) {
+        const matchStages = [];
         const branchCodeEq = params.branchCode?.$eq;
         if (typeof branchCodeEq === 'string') {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $eq: branchCodeEq } } });
@@ -32,6 +26,13 @@ class HasPOSRepo {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
         }
         const aggregate = this.civicStructureModel.aggregate([
+            // まず施設ドキュメントで絞る
+            {
+                $match: {
+                    _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) },
+                    'project.id': { $eq: params.projectId }
+                }
+            },
             {
                 $unwind: {
                     path: '$hasPOS'
@@ -50,8 +51,8 @@ class HasPOSRepo {
         ]);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
@@ -130,4 +131,4 @@ class HasPOSRepo {
         return doc.toObject({ virtuals: true });
     }
 }
-exports.HasPOSRepo = HasPOSRepo;
+exports.POSRepo = POSRepo;

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

@@ -84,7 +84,28 @@ 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;
+    }, options: {
+        /**
+         * 将来的にcontainedInPlace最小化のためオプション採用(2026-09-17~)
+         */
+        minimizeContainedInPlace: boolean;
+    }): 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,15 @@ class ScreeningRoomRepo {
         })
             .exec();
     }
-    async searchScreeningRooms(searchConditions) {
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    async projectRoomFields(params, options) {
+        const { minimizeContainedInPlace } = options;
         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,
@@ -390,16 +395,20 @@ class ScreeningRoomRepo {
                     branchCode: '$branchCode',
                     name: '$name',
                     address: '$address',
-                    containedInPlace: {
-                        id: '$containedInPlace.id',
-                        typeOf: '$containedInPlace.typeOf',
-                        branchCode: '$containedInPlace.branchCode',
-                        name: '$containedInPlace.name'
-                    },
+                    containedInPlace: (minimizeContainedInPlace)
+                        ? {
+                            branchCode: '$containedInPlace.branchCode',
+                        }
+                        : {
+                            id: '$containedInPlace.id',
+                            typeOf: '$containedInPlace.typeOf',
+                            branchCode: '$containedInPlace.branchCode',
+                            name: '$containedInPlace.name'
+                        },
                     openSeatingAllowed: '$openSeatingAllowed',
                     additionalProperty: '$additionalProperty',
                     maximumAttendeeCapacity: '$maximumAttendeeCapacity',
-                    ...(searchConditions.$projection?.sectionCount === 1)
+                    ...(params.$projection?.sectionCount === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -410,7 +419,7 @@ class ScreeningRoomRepo {
                             }
                         }
                         : undefined,
-                    ...(searchConditions.$projection?.seatCount === 1)
+                    ...(params.$projection?.seatCount === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -429,14 +438,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
@@ -16,8 +16,8 @@ export type IPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IKey
     id: string;
 };
 type IStartedPlaceOrderFields = 'expires' | 'id' | 'startDate' | 'status';
-export type IStartedPlaceOrder = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IStartedPlaceOrderFields>;
-type IFindParams = factory.transaction.ISearchConditions<factory.transactionType.PlaceOrder>;
+export type IStartedPlaceOrder = Pick<factory.transaction.placeOrder.ITransaction, IStartedPlaceOrderFields>;
+type IFindParams = Pick<factory.transaction.placeOrder.ISearchConditions, 'agent' | 'ids' | 'limit' | 'object' | 'page' | 'project' | 'seller' | 'sort' | 'startFrom' | 'startThrough' | 'status' | 'statuses'> & {};
 /**
  * 注文取引リポジトリ
  */
@@ -34,14 +34,13 @@ export declare class PlaceOrderRepo {
     findPlaceOrderTransactions(params: Omit<IFindParams, 'result'> & {
         result?: never;
         inclusion: IKeyOfProjection[];
-    }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
+    }): Promise<(Pick<factory.transaction.placeOrder.ITransaction, IKeyOfProjection> & {
         id: string;
     })[]>;
     /**
      * 取引期限変更
      */
     updateExpires(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         expires: Date;
     }): Promise<void>;
@@ -58,39 +57,34 @@ export declare class PlaceOrderRepo {
      * 進行中の注文取引を取得する
      */
     findPlaceOrderInProgressById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<ITransactionInProgress>;
     /**
      * 特定注文取引参照
      */
     findPlaceOrderById(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }, inclusion: IKeyOfProjection[]): Promise<IPlaceOrder>;
     /**
      * 取引を開始する
      */
-    startPlaceOrder(params: factory.transaction.IStartParams<factory.transactionType.PlaceOrder>): Promise<IStartedPlaceOrder>;
+    startPlaceOrder(params: factory.transaction.placeOrder.IStartParams): Promise<IStartedPlaceOrder>;
     /**
      * 取引を確定する
      */
     confirmPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
         object: {
             orderDate: Date;
             orderNumber: string;
             confirmationNumber: string;
         };
-        result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
-        potentialActions?: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+        result: factory.transaction.placeOrder.IResult;
     }): Promise<void>;
     /**
      * 取引を中止する
      */
     cancelPlaceOrder(params: {
-        typeOf: factory.transactionType.PlaceOrder;
         id: string;
     }): Promise<void>;
 }