@chevre/domain 23.0.0-alpha.11 → 23.0.0-alpha.13

package/example/src/chevre/offerCatalog/updateManyOfferCatalogsByIds.ts

@@ -0,0 +1,49 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
+
+    try {
+        await offerCatalogRepo.updateManyOfferCatalogsByIds({
+            id: {
+                $in: ['xxx']
+            },
+            itemOffered: {
+                typeOf: {
+                    $eq: chevre.factory.product.ProductType.EventService
+                }
+            },
+            $push: {
+                itemListElement: {
+                    $each: [{ id: 'xxx', typeOf: chevre.factory.offerType.Offer }],
+                    $slice: 300
+                }
+            },
+            $pull: {
+                itemListElement: {
+                    $elemMatch: {
+                        id: {
+                            $in: ['xxx']
+                        }
+                    }
+                }
+            }
+        });
+    } catch (error) {
+        throw await chevre.errorHandler.handleMongoError(error);
+    }
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/product/findHasOfferCatalog.ts

@@ -10,16 +10,20 @@ async function main() {
 
     const productHasOfferCatalogRepo = await chevre.repository.ProductHasOfferCatalog.createInstance(mongoose.connection);
 
-    const offerCatalogs = (await productHasOfferCatalogRepo.findOfferCatalogs(
-        {
-            limit: 10,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            product: { id: { $in: ['656038908b1cd5ce629f5992', '60c1c0031fb182000bed5eff'] } }
-        }
-    ));
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(offerCatalogs, { depth: null });
+    try {
+        const offerCatalogs = (await productHasOfferCatalogRepo.findOfferCatalogs(
+            {
+                limit: 10,
+                page: 1,
+                project: { id: { $eq: project.id } },
+                product: { id: { $in: ['656038908b1cd5ce629f5992', '60c1c0031fb182000bed5eff'] } }
+            }
+        ));
+        // tslint:disable-next-line:no-null-keyword
+        console.dir(offerCatalogs, { depth: null });
+    } catch (error) {
+        throw await chevre.errorHandler.handleMongoError(error);
+    }
 }
 
 main()

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,15 @@ exports.handleAWSError = handleAWSError;
 const http_status_1 = require("http-status");
 const factory_1 = require("./factory");
 let mongo;
+/**
+ * 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* () {
@@ -46,9 +50,11 @@ function handleMongoError(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:

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, Document, 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>[];
     /**
      * 複数イベントを作成する

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: {
@@ -485,8 +492,7 @@ class EventRepo {
             }
             try {
                 if (params.id === undefined) {
-                    const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                    const id = uniqid();
+                    const id = EventRepo.CREATE_ID();
                     doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
                     savedEventId = id;
                 }
@@ -566,8 +572,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/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.11"
+  "version": "23.0.0-alpha.13"
 }

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -1,59 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const PROJECT_ID = process.env.PROJECT_ID;
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
-    const offerCatalogItemRepo = await chevre.repository.OfferCatalogItem.createInstance(mongoose.connection);
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-
-    const result = await (await chevre.service.offer.createService()).event.searchOfferCatalogItems({
-        event: {
-            id: 'bm0f0cadm'
-        },
-        limit: 10,
-        page: 1,
-        options: { includedInDataCatalog: { id: 'blpj322ni' } }
-    })({
-        event: eventRepo,
-        offerCatalog: offerCatalogRepo,
-        offerCatalogItem: offerCatalogItemRepo,
-        product: productRepo
-    });
-    console.log(result);
-    console.log(result.length);
-
-    // console.log('searching...');
-    // const catalogs = await catalogItemRepo.search(
-    //     {
-    //         project: { id: { $eq: PROJECT_ID } },
-    //         sort: { identifier: chevre.factory.sortType.Descending },
-    //         limit: 2,
-    //         page: 1,
-    //         itemListElement: { typeOf: { $eq: 'Offer' } }
-    //     }
-    // );
-    // console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
-    // console.log(catalogs.length);
-
-    // const numCatalogs = await catalogItemRepo.count(
-    //     {
-    //         project: { id: { $eq: PROJECT_ID } },
-    //         itemListElement: { typeOf: { $eq: 'Offer' } }
-    //     }
-    // );
-    // console.log('numCatalogs:', numCatalogs);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);