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

package/example/src/chevre/event/updateSellerMakesOffersByIdentifier.ts

@@ -0,0 +1,106 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const { EVENT_IDENTTIFIER } = process.env;
+
+async function main() {
+    if (typeof EVENT_IDENTTIFIER !== 'string') {
+        throw new Error('environment variables required');
+    }
+
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventSellerMakesOfferRepo = await chevre.repository.EventSellerMakesOffer.createInstance(mongoose.connection);
+    const availabilityEnds = moment('2025-10-26T05:20:00.000Z')
+        .toDate();
+    const availabilityStarts = moment('2025-10-23T15:00:00.000Z')
+        .toDate();
+    const validFrom = moment('2025-10-12T15:00:00.000Z')
+        .toDate();
+    const validThrough = moment('2025-10-26T05:20:00.000Z')
+        .toDate();
+    const result = await eventSellerMakesOfferRepo.updateSellerMakesOffersByEventIdentifier([
+        {
+            $set: {
+                project: { id: project.id, typeOf: chevre.factory.organizationType.Project },
+                identifier: EVENT_IDENTTIFIER,
+                offers: {
+                    seller: {
+                        makesOffer: [
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: '3eo6okferrsdpfd9j2ce1iv9k7'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            },
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: '51qbjcfr72h62m06vtv5kkhgje'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            },
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: '5h3gs22mu9j3ok7o63uog9o9i3'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            },
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: '66e7p2g713675v96nrhdm975kg'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            },
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: '7divuoimobsfgq95tp1csorjqq'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            },
+                            {
+                                typeOf: chevre.factory.offerType.Offer,
+                                availableAtOrFrom: {
+                                    id: 'ckevmf3fueqcunnideu6artt'
+                                },
+                                availabilityEnds,
+                                availabilityStarts,
+                                validFrom,
+                                validThrough
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    ]);
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import { Connection, Document, FilterQuery } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate {
@@ -140,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専用
      */
@@ -338,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 & {
@@ -346,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

@@ -480,36 +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 id = EventRepo.CREATE_ID();
-                    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)) {
@@ -522,7 +527,6 @@ class EventRepo {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return { id: savedEventId }; // optimize(2024-07-31~)
         });
     }
     /**

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

@@ -1,3 +1,4 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -18,4 +19,21 @@ export declare class EventSellerMakesOfferRepo {
             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<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
 }

package/lib/chevre/repo/eventSellerMakesOffer.js

@@ -60,5 +60,59 @@ class EventSellerMakesOfferRepo {
             }
         });
     }
+    /**
+     * イベントコードをキーにして複数編集
+     * 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');
+                    }
+                    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 };
+            }
+        });
+    }
 }
 exports.EventSellerMakesOfferRepo = EventSellerMakesOfferRepo;

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.19"
+  "version": "23.0.0-alpha.20"
 }

package/example/src/chevre/event/updateEventSellerMakesOffer.ts

@@ -1,100 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const { EVENT_ID } = process.env;
-
-async function main() {
-    if (typeof EVENT_ID !== 'string') {
-        throw new Error('environment variables required');
-    }
-
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventSellerMakesOfferRepo = await chevre.repository.EventSellerMakesOffer.createInstance(mongoose.connection);
-    const availabilityEnds = moment('2025-10-26T05:20:00.000Z')
-        .toDate();
-    const availabilityStarts = moment('2025-10-23T15:00:00.000Z')
-        .toDate();
-    const validFrom = moment('2025-10-12T15:00:00.000Z')
-        .toDate();
-    const validThrough = moment('2025-10-26T05:20:00.000Z')
-        .toDate();
-    const result = await eventSellerMakesOfferRepo.updateOffersByEventId(
-        {
-            project: { id: project.id },
-            offers: [
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: '3eo6okferrsdpfd9j2ce1iv9k7'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                },
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: '51qbjcfr72h62m06vtv5kkhgje'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                },
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: '5h3gs22mu9j3ok7o63uog9o9i3'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                },
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: '66e7p2g713675v96nrhdm975kg'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                },
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: '7divuoimobsfgq95tp1csorjqq'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                },
-                {
-                    typeOf: chevre.factory.offerType.Offer,
-                    availableAtOrFrom: {
-                        id: 'ckevmf3fueqcunnideu6artt'
-                    },
-                    availabilityEnds,
-                    availabilityStarts,
-                    validFrom,
-                    validThrough
-                }
-            ],
-            itemOffered: { id: EVENT_ID }
-        }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(result, { depth: null });
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);