@chevre/domain 23.0.0-alpha.9 → 23.0.0

package/lib/chevre/repo/event.js

@@ -21,11 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventRepo = void 0;
+const mongoose_1 = require("mongoose");
+const uniqid = require("uniqid");
+const errorHandler_1 = require("../errorHandler");
 const factory = require("../factory");
 const EventFactory = require("../factory/event");
-const event_1 = require("./mongoose/schemas/event");
-const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
+const event_1 = require("./mongoose/schemas/event");
+const USE_OBJECT_ID_AS_EVENT_ID = process.env.USE_OBJECT_ID_AS_EVENT_ID === '1';
 const AVAILABLE_PUBLIC_PROJECT_FIELDS = [
     'additionalProperty', 'aggregateReservation', 'attendeeCount', 'checkInCount', 'coaInfo',
     // 'description',
@@ -41,6 +44,13 @@ class EventRepo {
     constructor(connection) {
         this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
     }
+    /**
+     * イベントIDを生成する
+     */
+    static CREATE_ID() {
+        // implement using ObjectId(2025-10-17~)
+        return (USE_OBJECT_ID_AS_EVENT_ID) ? new mongoose_1.Types.ObjectId().toHexString() : uniqid();
+    }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
@@ -260,9 +270,8 @@ class EventRepo {
      */
     createManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const insertingDocs = params.attributes.map((p) => {
-                return Object.assign({ _id: uniqid() }, p);
+                return Object.assign({ _id: EventRepo.CREATE_ID() }, p);
             });
             try {
                 yield this.eventModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
@@ -292,7 +301,6 @@ class EventRepo {
     upsertManyByAdditionalProperty(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { update } = options;
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const additionalProperties = [];
             const { events, additionalPropertyFilter, eventSeries, screeningRoom } = params;
@@ -347,7 +355,7 @@ class EventRepo {
                         maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
                         eventStatus, superEvent } = creatingEventParams, // <-上書き可能な属性を限定的に
                         setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
-                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() });
+                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: EventRepo.CREATE_ID() });
                         bulkWriteOps.push({
                             updateOne: {
                                 filter,
@@ -389,7 +397,6 @@ class EventRepo {
     upsertManyScreeningEventByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { update } = options;
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
@@ -423,7 +430,7 @@ class EventRepo {
                     }
                     else {
                         const { id, coaInfo, description, maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation } = $set, setOnInsertFields = __rest($set, ["id", "coaInfo", "description", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation"]);
-                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { identifier, _id: uniqid() });
+                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { identifier, _id: EventRepo.CREATE_ID() });
                         const updateOne = {
                             filter,
                             update: {
@@ -473,37 +480,41 @@ class EventRepo {
         });
     }
     /**
-     * イベントを保管する
+     * 単一イベント編集
      */
-    saveEvent(params) {
+    updateEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let savedEventId;
             let doc;
-            const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+            const _a = params.attributes, { identifier, project, typeOf, organizer, aggregateReservation, maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, coaInfo } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf", "organizer", "aggregateReservation", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "coaInfo"])
+            // maximumPhysicalAttendeeCapacity, additionalProperty,
+            // eventStatus, location, name, superEvent, offers,
+            // doorTime, endDate, startDate
+            ;
             if (typeof typeOf !== 'string' || typeOf.length === 0) {
                 throw new factory.errors.ArgumentNull('attributes.typeOf');
             }
+            if (typeof params.id !== 'string' || params.id === '') {
+                throw new factory.errors.ArgumentNull('id');
+            }
             try {
-                if (params.id === undefined) {
-                    const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                    const id = uniqid();
-                    doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
-                    savedEventId = id;
-                }
-                else {
-                    // const upsert: boolean = params.upsert === true;
-                    const upsert = false; // always false(2025-05-15~)
-                    doc = yield this.eventModel.findOneAndUpdate({
-                        _id: { $eq: params.id },
-                        typeOf: { $eq: typeOf }
-                    }, Object.assign({ 
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        $setOnInsert: Object.assign({ typeOf,
-                            project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
-                        .lean()
-                        .exec();
-                    savedEventId = params.id;
-                }
+                doc = yield this.eventModel.findOneAndUpdate({
+                    _id: { $eq: params.id },
+                    typeOf: { $eq: typeOf }
+                }, Object.assign({ 
+                    // 編集のためのみのメソッドになったので、setOnInsertは廃止(2025-10-27~)
+                    // 上書き禁止属性を除外(2022-08-24~)
+                    // $setOnInsert: {
+                    //     typeOf,
+                    //     project,
+                    //     ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
+                    // },
+                    $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), {
+                    upsert: false,
+                    new: true,
+                    projection: { _id: 1 }
+                })
+                    .lean()
+                    .exec();
             }
             catch (error) {
                 if (yield (0, errorHandler_1.isMongoError)(error)) {
@@ -516,7 +527,6 @@ class EventRepo {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return { id: savedEventId }; // optimize(2024-07-31~)
         });
     }
     /**
@@ -566,8 +576,7 @@ class EventRepo {
             if (typeof identifier !== 'string' || identifier.length === 0) {
                 throw new factory.errors.ArgumentNull('identifier');
             }
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const id = uniqid();
+            const id = EventRepo.CREATE_ID();
             const doc = yield this.eventModel.findOneAndUpdate(
             // 全イベントにidentifierを保証したので、additionalPropertyによるフィルターからidentifierによるフィルターへ変更(2025-09-05~)
             // {
@@ -646,6 +655,22 @@ class EventRepo {
                 .exec();
         });
     }
+    findByAdditionalProperty(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const query = this.eventModel.find({
+                'project.id': { $eq: params.project.id },
+                additionalProperty: { $eq: params.additionalProperty }
+            }, { _id: 1 });
+            // if (typeof params.limit === 'number' && params.limit > 0) {
+            //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            //     query.limit(params.limit)
+            //         .skip(params.limit * (page - 1));
+            // }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        });
+    }
     /**
      * apiで公開属性を検索する(2024-10-13~)
      */

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

@@ -1,54 +1,39 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IAggregateMakesOfferResult = Pick<factory.event.screeningEvent.ISellerMakesOffer, 'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'> & {
-    itemOffered: {
-        serviceOutput: {
-            reservationFor: {
-                /**
-                 * イベントID
-                 */
-                id: string;
-            };
-        };
-    };
-};
 /**
- * イベントの販売者makesOfferリポジトリ
+ * イベントのアプリケーションオファーリポジトリ
  */
 export declare class EventSellerMakesOfferRepo {
     private readonly eventModel;
     constructor(connection: Connection);
     /**
-     * 指定クライアントのオファーを集計する(2024-10-09~)
+     * 単一イベントのmakesOfferを更新する
      */
-    aggregateMakesOffer(conditions: {
-        limit?: number;
-        page?: number;
+    updateOffersByEventId(params: {
         project: {
-            id: {
-                $eq: string;
-            };
-        };
-        /**
-         * アプリケーション(指定必須)
-         */
-        availableAtOrFrom: {
-            id: {
-                $eq: string;
-            };
+            id: string;
         };
+        offers: factory.event.screeningEvent.ISellerMakesOffer[];
         itemOffered: {
-            serviceOutput: {
-                reservationFor: {
-                    /**
-                     * イベントID
-                     */
-                    id: {
-                        $in?: string[];
-                    };
-                };
+            id: string;
+        };
+    }): Promise<void>;
+    /**
+     * イベントコードをキーにして複数編集
+     * 2025-10-27~
+     */
+    updateSellerMakesOffersByEventIdentifier(params: {
+        $set: Pick<factory.event.screeningEvent.IAttributes, 'project'> & {
+            identifier: string;
+            offers: {
+                seller: Pick<factory.event.screeningEvent.ISeller, 'makesOffer'>;
             };
         };
-    }): Promise<IAggregateMakesOfferResult[]>;
+    }[]): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
 }
-export {};

package/lib/chevre/repo/eventSellerMakesOffer.js

@@ -11,62 +11,107 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSellerMakesOfferRepo = void 0;
 const factory = require("../factory");
-const settings_1 = require("../settings");
+// import { MONGO_MAX_TIME_MS } from '../settings';
 const event_1 = require("./mongoose/schemas/event");
+// type IMatchStage = PipelineStage.Match;
+// type IAggregateMakesOfferResult = Pick<
+//     factory.event.screeningEvent.ISellerMakesOffer,
+//     'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'
+// > & {
+//     itemOffered: {
+//         serviceOutput: {
+//             reservationFor: {
+//                 /**
+//                  * イベントID
+//                  */
+//                 id: string;
+//             };
+//         };
+//     };
+// };
 /**
- * イベントの販売者makesOfferリポジトリ
+ * イベントのアプリケーションオファーリポジトリ
  */
 class EventSellerMakesOfferRepo {
     constructor(connection) {
         this.eventModel = connection.model(event_1.modelName, (0, event_1.createSchema)());
     }
     /**
-     * 指定クライアントのオファーを集計する(2024-10-09~)
+     * 単一イベントのmakesOfferを更新する
      */
-    aggregateMakesOffer(conditions) {
+    updateOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { availableAtOrFrom } = conditions;
-            if (typeof ((_a = availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === null || _a === void 0 ? void 0 : _a.$eq) !== 'string' || availableAtOrFrom.id.$eq === '') {
-                throw new factory.errors.ArgumentNull('availableAtOrFrom.id.$eq');
-            }
-            const matchStages = [
-                { $match: { 'project.id': { $eq: conditions.project.id.$eq } } },
-                { $match: { 'offers.seller.makesOffer.availableAtOrFrom.id': { $exists: true, $eq: availableAtOrFrom.id.$eq } } }
-            ];
-            const reservationForIdIn = conditions.itemOffered.serviceOutput.reservationFor.id.$in;
-            if (Array.isArray(reservationForIdIn)) {
-                matchStages.push({ $match: { _id: { $in: reservationForIdIn } } });
+            const { offers, itemOffered, project } = params;
+            const updateQuery = {
+                $set: {
+                    'offers.seller.makesOffer': offers
+                }
+            };
+            const updateFilter = {
+                _id: { $eq: itemOffered.id },
+                'project.id': { $eq: project.id }
+            };
+            const queryOptions = { upsert: false, new: false, projection: { _id: 1 } };
+            const doc = yield this.eventModel.findOneAndUpdate(updateFilter, updateQuery, queryOptions)
+                .lean()
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            const aggregate = this.eventModel.aggregate([
-                { $unwind: '$offers.seller.makesOffer' },
-                ...matchStages,
-                { $sort: { _id: factory.sortType.Ascending } },
-                {
-                    $project: {
-                        _id: 0,
-                        availabilityEnds: '$offers.seller.makesOffer.availabilityEnds',
-                        availabilityStarts: '$offers.seller.makesOffer.availabilityStarts',
-                        validFrom: '$offers.seller.makesOffer.validFrom',
-                        validThrough: '$offers.seller.makesOffer.validThrough',
-                        itemOffered: {
-                            serviceOutput: {
-                                reservationFor: {
-                                    id: { $toString: '$_id' }
-                                }
-                            }
-                        }
+        });
+    }
+    /**
+     * イベントコードをキーにして複数編集
+     * 2025-10-27~
+     */
+    updateSellerMakesOffersByEventIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            const queryFilters = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set }) => {
+                    const { project, identifier, offers } = $set;
+                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                        throw new factory.errors.ArgumentNull('identifier');
                     }
-                }
-            ]);
-            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-                aggregate.limit(conditions.limit * page)
-                    .skip(conditions.limit * (page - 1));
+                    const sellerMakesOffer = offers.seller.makesOffer;
+                    if (!Array.isArray(sellerMakesOffer)) {
+                        throw new factory.errors.Argument('offers.seller.makesOffer', 'offers.seller.makesOffer must be an array');
+                    }
+                    // リソースのユニークネスを保証するfilter
+                    const filter = {
+                        'project.id': { $eq: project.id },
+                        identifier: { $exists: true, $eq: identifier }
+                    };
+                    queryFilters.push({
+                        'project.id': { $eq: project.id },
+                        identifier: { $exists: true, $eq: identifier }
+                    });
+                    const setFields = {
+                        'offers.seller.makesOffer': sellerMakesOffer
+                    };
+                    const updateQuery = {
+                        $set: setFields
+                    };
+                    const updateOne = {
+                        filter,
+                        update: updateQuery,
+                        upsert: false
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedEvents };
             }
-            return aggregate
-                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
         });
     }
 }

package/lib/chevre/repo/issuer.js

@@ -32,17 +32,21 @@ class IssuerRepo {
         this.issuerModel = connection.model(issuer_1.modelName, (0, issuer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const identifiereEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
-        if (typeof identifiereEq === 'string') {
-            andConditions.push({ identifier: { $eq: identifiereEq } });
+        const identifierEq = (_c = params.identifier) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
         }
-        const idEq = (_d = params.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        const identifierIn = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$in;
+        if (Array.isArray(identifierIn)) {
+            andConditions.push({ identifier: { $in: identifierIn } });
+        }
+        const idEq = (_e = params.id) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }

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

@@ -4,26 +4,19 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'CategoryCode';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
     color: String,
     image: String,
-    codeValue: {
-        type: String,
-        required: true
-    },
+    codeValue: { type: String, required: true },
     inCodeSet: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    name: mongoose_1.SchemaTypes.Mixed,
-    paymentMethod: mongoose_1.SchemaTypes.Mixed
+    name: mongoose_1.SchemaTypes.Mixed
+    // paymentMethod: SchemaTypes.Mixed // discontinue(2025-11-08~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -76,15 +69,16 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'paymentMethod.typeOf': 1, codeValue: 1 },
-        {
-            name: 'searchByPaymentMethodTypeOf',
-            partialFilterExpression: {
-                'paymentMethod.typeOf': { $exists: true }
-            }
-        }
-    ],
+    // discontinue(2025-11-08~)
+    // [
+    //     { 'paymentMethod.typeOf': 1, codeValue: 1 },
+    //     {
+    //         name: 'searchByPaymentMethodTypeOf',
+    //         partialFilterExpression: {
+    //             'paymentMethod.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ],
     [
         { 'project.id': 1, codeValue: 1 },
         {
@@ -100,37 +94,49 @@ const indexes = [
             }
         }
     ],
-    // add unique index(2024-11-14~)
+    // 決済カード区分をコレクション分離したので、reIndex unique index(2025-11-05~)
     [
         {
             'project.id': 1,
-            'inCodeSet.identifier': 1,
+            'inCodeSet.identifier': 1, // ssktsでのみ区分分類をまたいで重複がある
             codeValue: 1
         },
         {
             unique: true,
-            name: 'uniqueByCodeValueAndInCodeSet',
-            partialFilterExpression: {
-                // tslint:disable-next-line:no-null-keyword
-                'paymentMethod.typeOf': null
-            }
-        }
-    ],
-    [
-        {
-            'project.id': 1,
-            'paymentMethod.typeOf': 1,
-            codeValue: 1
-        },
-        {
-            unique: true,
-            name: 'uniqueByCodeValueAndPaymentMethod',
-            partialFilterExpression: {
-                'inCodeSet.identifier': { $eq: factory.categoryCode.CategorySetIdentifier.MovieTicketType },
-                'paymentMethod.typeOf': { $exists: true }
-            }
+            name: 'uniqueByCodeValue'
         }
     ]
+    // add unique index(2024-11-14~)
+    // [
+    //     {
+    //         'project.id': 1,
+    //         'inCodeSet.identifier': 1,
+    //         codeValue: 1
+    //     },
+    //     {
+    //         unique: true,
+    //         name: 'uniqueByCodeValueAndInCodeSet',
+    //         partialFilterExpression: {
+    //             // tslint:disable-next-line:no-null-keyword
+    //             'paymentMethod.typeOf': null
+    //         }
+    //     }
+    // ],
+    // [
+    //     {
+    //         'project.id': 1,
+    //         'paymentMethod.typeOf': 1,
+    //         codeValue: 1
+    //     },
+    //     {
+    //         unique: true,
+    //         name: 'uniqueByCodeValueAndPaymentMethod',
+    //         partialFilterExpression: {
+    //             'inCodeSet.identifier': { $eq: factory.movieTicketType.CategorySetIdentifier.MovieTicketType },
+    //             'paymentMethod.typeOf': { $exists: true }
+    //         }
+    //     }
+    // ]
 ];
 exports.indexes = indexes;
 /**

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

@@ -0,0 +1,10 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import * as factory from '../../../factory';
+type IDocType = factory.movieTicketType.IMovieTicketType;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "MovieTicketType";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IModel, IDocType, indexes, modelName };