@chevre/domain 23.0.0-alpha.2 → 23.0.0-alpha.20

package/example/src/objectId.ts

@@ -0,0 +1,12 @@
+
+// tslint:disable:no-console no-magic-numbers no-null-keyword
+import * as mongoose from 'mongoose';
+
+// const MONGOLAB_URI = String(process.env.MONGOLAB_URI);
+
+async function main() {
+    console.log(new mongoose.Types.ObjectId());
+}
+
+main()
+    .catch(console.error);

package/example/src/signPayload.ts

@@ -3,13 +3,18 @@ import * as jwt from 'jsonwebtoken';
 
 async function main(): Promise<void> {
     const payload = {
-        member: {
-            memberOf: {
-                identifier: 'bronze',
-                isTierOf: {
-                    identifier: 'DefaultMemberProgram'
-                }
-            }
+        /**
+         * アプリケーションオファーコード
+         */
+        identifier: 'LegacyReservation',
+        validFrom: '2025-10-20T00:00:00Z',
+        validThrough: '2025-10-25T00:00:00Z',
+        eligibleQuantity: { maxValue: 1 },
+        itemOffered: {
+            /**
+             * イベント識別子
+             */
+            identifier: '251025001001010900'
         }
     };
 

package/lib/chevre/errorHandler.d.ts

@@ -1,7 +1,11 @@
+/**
+ * https://www.mongodb.com/ja-jp/docs/manual/reference/error-codes/
+ */
 export declare enum MongoErrorCode {
-    DuplicateKey = 11000,
+    ConflictUpdateOperator = 40,
     MaxTimeMSExpired = 50,
-    ExceededTimeLimit = 262
+    ExceededTimeLimit = 262,
+    DuplicateKey = 11000
 }
 export declare function isMongoError(error: unknown): Promise<boolean>;
 export declare function handleMongoError(error: unknown): Promise<unknown>;

package/lib/chevre/errorHandler.js

@@ -24,11 +24,16 @@ exports.handleAWSError = handleAWSError;
 const http_status_1 = require("http-status");
 const factory_1 = require("./factory");
 let mongo;
+let mongooseError;
+/**
+ * https://www.mongodb.com/ja-jp/docs/manual/reference/error-codes/
+ */
 var MongoErrorCode;
 (function (MongoErrorCode) {
-    MongoErrorCode[MongoErrorCode["DuplicateKey"] = 11000] = "DuplicateKey";
+    MongoErrorCode[MongoErrorCode["ConflictUpdateOperator"] = 40] = "ConflictUpdateOperator";
     MongoErrorCode[MongoErrorCode["MaxTimeMSExpired"] = 50] = "MaxTimeMSExpired";
     MongoErrorCode[MongoErrorCode["ExceededTimeLimit"] = 262] = "ExceededTimeLimit";
+    MongoErrorCode[MongoErrorCode["DuplicateKey"] = 11000] = "DuplicateKey";
 })(MongoErrorCode || (exports.MongoErrorCode = MongoErrorCode = {}));
 function isMongoError(error) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -40,15 +45,21 @@ function isMongoError(error) {
 }
 function handleMongoError(error) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (mongo === undefined) {
             mongo = (yield Promise.resolve().then(() => require('mongoose'))).mongo;
         }
+        if (mongooseError === undefined) {
+            mongooseError = (yield Promise.resolve().then(() => require('mongoose'))).Error;
+        }
         let handledError = error;
         if (handledError instanceof mongo.MongoError || handledError instanceof mongo.MongoServerError) {
             switch (handledError.code) {
+                case MongoErrorCode.ConflictUpdateOperator:
+                    handledError = new factory_1.errors.Argument('', `Some updating fields conflict. code:${handledError.code} message:${handledError.message}`);
+                    break;
                 case MongoErrorCode.DuplicateKey:
                     handledError = new factory_1.errors.AlreadyInUse('', [], `Some fields already in use. code:${handledError.code} message:${handledError.message}`);
-                    // no op
                     break;
                 case MongoErrorCode.MaxTimeMSExpired:
                 case MongoErrorCode.ExceededTimeLimit:
@@ -60,6 +71,11 @@ function handleMongoError(error) {
         if (mongo.BSON.BSONError.isBSONError(handledError)) {
             handledError = new factory_1.errors.Argument('', handledError.message);
         }
+        // handle CastError(2025-10-27~)
+        // CastError: Cast to ObjectId failed for value "xxx" (type string) at path "_id" for model "xxxxxxxxxxxxx"
+        if (handledError instanceof mongooseError.CastError) {
+            handledError = new factory_1.errors.Argument(`${(_a = handledError.model) === null || _a === void 0 ? void 0 : _a.modelName}.${handledError.path}`, (handledError.reason instanceof Error) ? handledError.reason.message : handledError.message);
+        }
         return handledError;
     });
 }

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

@@ -1,31 +1,74 @@
 import { AnyExpression, Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
 type IUnset = {
     [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
 };
+type CategorySetIdentifierExceptMovieTicketType = Exclude<factory.categoryCode.CategorySetIdentifier, factory.categoryCode.CategorySetIdentifier.MovieTicketType>;
+type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: CategorySetIdentifierExceptMovieTicketType;
+    };
+};
+type IMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'paymentMethod'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+    };
+};
+type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
+type IKeyOfProjectionExceptMovieTicketType = keyof ICategoryCodeExceptMovieTicketType;
 /**
  * 区分リポジトリ
  */
 export declare class CategoryCodeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions, options?: {
+        excludeMovieTicketType?: boolean;
+    }): FilterQuery<factory.categoryCode.ICategoryCode>[];
     static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
     /**
-     * 集計検索(publicな属性検索が目的)
+     * 区分集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    findCategoryCodesByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjectionExceptMovieTicketType[]): Promise<(ICategoryCodeExceptMovieTicketType & {
+        id: string;
+    })[]>;
     /**
-     * 検索
+     * 区分検索
      */
-    projectFields(params: factory.categoryCode.ISearchConditions, 
+    projectCategoryCodeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet' | 'paymentMethod'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: CategorySetIdentifierExceptMovieTicketType;
+                $in?: CategorySetIdentifierExceptMovieTicketType[];
+            };
+        };
+    }, 
+    /**
+     * 空の場合無効
+     */
+    inclusion: IKeyOfProjection[], options?: {
+        excludeMovieTicketType?: boolean;
+    }): Promise<(ICategoryCodeExceptMovieTicketType & {
+        id: string;
+    })[]>;
+    /**
+     * 決済カード区分検索
+     */
+    projectMovieTicketTypeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+            };
+        };
+    }, 
     /**
      * 空の場合無効
      */
-    inclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+    inclusion: IKeyOfProjection[]): Promise<(IMovieTicketType & {
         id: string;
     })[]>;
     save(params: {

package/lib/chevre/repo/categoryCode.js

@@ -36,9 +36,29 @@ class CategoryCodeRepo {
         this.categoryCodeModel = connection.model(categoryCode_1.modelName, (0, categoryCode_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    static CREATE_MONGO_CONDITIONS(params) {
+    static CREATE_MONGO_CONDITIONS(params, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const excludeMovieTicketType = (options === null || options === void 0 ? void 0 : options.excludeMovieTicketType) === true;
         const andConditions = [];
+        if (excludeMovieTicketType) {
+            andConditions.push({
+                'inCodeSet.identifier': {
+                    $in: [
+                        factory.categoryCode.CategorySetIdentifier.ContentRatingType,
+                        factory.categoryCode.CategorySetIdentifier.CurrencyType,
+                        factory.categoryCode.CategorySetIdentifier.CustomerType,
+                        factory.categoryCode.CategorySetIdentifier.DistributorType,
+                        factory.categoryCode.CategorySetIdentifier.MembershipType,
+                        factory.categoryCode.CategorySetIdentifier.OfferCategoryType,
+                        factory.categoryCode.CategorySetIdentifier.PaymentMethodType,
+                        factory.categoryCode.CategorySetIdentifier.SeatingType,
+                        factory.categoryCode.CategorySetIdentifier.ServiceType,
+                        factory.categoryCode.CategorySetIdentifier.SoundFormatType,
+                        factory.categoryCode.CategorySetIdentifier.VideoFormatType
+                    ]
+                }
+            });
+        }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.project !== undefined && params.project !== null) {
@@ -99,7 +119,6 @@ class CategoryCodeRepo {
                 if (typeof params.inCodeSet.identifier.$eq === 'string') {
                     andConditions.push({
                         'inCodeSet.identifier': {
-                            $exists: true,
                             $eq: params.inCodeSet.identifier.$eq
                         }
                     });
@@ -110,7 +129,6 @@ class CategoryCodeRepo {
         if (Array.isArray(inCodeSetIdentifierIn)) {
             andConditions.push({
                 'inCodeSet.identifier': {
-                    $exists: true,
                     $in: inCodeSetIdentifierIn
                 }
             });
@@ -174,9 +192,9 @@ class CategoryCodeRepo {
         return projectStage;
     }
     /**
-     * 集計検索(publicな属性検索が目的)
+     * 区分集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions, inclusion) {
+    findCategoryCodesByAggregate(conditions, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const matchStages = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(conditions)
@@ -190,8 +208,6 @@ class CategoryCodeRepo {
                     : [],
                 { $project: projectStage }
             ]);
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             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)
@@ -201,9 +217,40 @@ class CategoryCodeRepo {
         });
     }
     /**
-     * 検索
+     * 区分検索
+     */
+    projectCategoryCodeFields(params, 
+    /**
+     * 空の場合無効
+     */
+    inclusion, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params, options);
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // 2024-08-19~
+                .exec();
+        });
+    }
+    /**
+     * 決済カード区分検索
      */
-    projectFields(params, 
+    projectMovieTicketTypeFields(params, 
     /**
      * 空の場合無効
      */
@@ -214,11 +261,6 @@ class CategoryCodeRepo {
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
-            else {
-                // if (Array.isArray(exclusion) && exclusion.length > 0) {
-                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                // }
-            }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -280,7 +322,6 @@ class CategoryCodeRepo {
                                 'project.id': { $eq: p.attributes.project.id },
                                 codeValue: { $eq: p.attributes.codeValue },
                                 'inCodeSet.identifier': {
-                                    $exists: true,
                                     $eq: p.attributes.inCodeSet.identifier
                                 }
                             },

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

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate {
@@ -63,6 +63,10 @@ export type ICreatingEvent4ttts = Pick<factory.event.screeningEvent.IAttributes,
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
+    /**
+     * イベントIDを生成する
+     */
+    static CREATE_ID(): string;
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.screeningEvent.IEvent>[];
     /**
      * 複数イベントを作成する
@@ -136,19 +140,18 @@ export declare class EventRepo {
         attributes: IAttributes4patchUpdate;
     }): Promise<void>;
     /**
-     * イベントを保管する
+     * 単一イベント編集
      */
-    saveEvent(params: {
-        id?: string;
-        attributes: factory.event.screeningEvent.IAttributes;
+    updateEventById(params: {
+        id: string;
+        attributes: factory.event.screeningEvent.IAttributes & {
+            id?: never;
+        };
         /**
          * ドキュメント作成時には無視される
          */
         $unset?: IUnset;
-        upsert: false;
-    }): Promise<{
-        id: string;
-    }>;
+    }): Promise<void>;
     /**
      * sskts専用
      */
@@ -334,7 +337,7 @@ export declare class EventRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
     }> & import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
@@ -342,7 +345,7 @@ export declare class EventRepo {
         aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+    }>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
     }> & import("@chevre/factory/lib/event/screeningEvent").IAttributes & {

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~)
             // {

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 {};