@chevre/domain 22.13.0-alpha.4 → 22.13.0-alpha.6

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

@@ -0,0 +1,96 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // _id: { $eq: 'blwz44d0k' },
+            'project.id': { $eq: project.id }
+        },
+        {
+            _id: 1,
+            startDate: 1,
+            project: 1,
+            identifier: 1,
+            additionalProperty: 1,
+            typeOf: 1
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: Pick<
+            chevre.factory.event.screeningEvent.IEvent,
+            'id' | 'identifier' | 'startDate' | 'project' | 'additionalProperty' | 'typeOf'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', event.project.id, event.id, event.startDate, i);
+        const isValidProject = event.project.id.substring(0, 5) === 'ttts-';
+        if (!isValidProject) {
+            throw new Error(`${event.project.id} ${event.id} invalid project.`);
+        }
+        const eventIdentifier = event.identifier;
+        const oldEventId = event.additionalProperty?.find(({ name }) => name === 'oldEventId')?.value;
+        const tourNumber = event.additionalProperty?.find(({ name }) => name === 'tourNumber')?.value;
+        if (typeof oldEventId !== 'string' || oldEventId === '') {
+            throw new Error(`${event.project.id} ${event.id} oldEventId required: ${oldEventId}`);
+        }
+        if (typeof tourNumber !== 'string' || tourNumber === '') {
+            throw new Error(`${event.project.id} ${event.id} tourNumber required: ${tourNumber}`);
+        }
+
+        const alreadyMigrated = typeof eventIdentifier === 'string' && eventIdentifier === oldEventId;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', event.project.id, event.id, event.startDate, i);
+        } else {
+            console.log(
+                'updating... oldEventId:',
+                oldEventId, event.project.id, event.id, event.startDate, i);
+            await eventRepo.updatePartiallyById({
+                project: { id: event.project.id },
+                id: event.id,
+                attributes: {
+                    typeOf: event.typeOf,
+                    ...{
+                        identifier: oldEventId
+                    }
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                event.project.id, event.id, event.startDate, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+
+    // await eventRepo.projectEventFields<chevre.factory.eventType.ScreeningEvent>(
+    //     {
+    //         project: { id: { $eq: project.id } },
+    //         typeOf: chevre.factory.eventType.ScreeningEvent,
+    //         // id
+    //     },
+    //     ['identifier']
+    // );
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -0,0 +1,192 @@
+// tslint:disable:no-console no-magic-numbers
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const ADDITIONAL_PROPERTY_NAME = 'sampleCreateId';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const today = moment()
+        .tz('Asia/Tokyo')
+        .format('YYYY-MM-DD');
+    const identifier = `fromSamples:${moment()
+        .format('YYYY-MM-DD HH:mm')}`;
+    const settingEvent: chevre.factory.event.screeningEvent.IEvent = {
+        identifier,
+        additionalProperty: [
+            { name: ADDITIONAL_PROPERTY_NAME, value: identifier }
+        ],
+        id: 'bmcvkft5g',
+        project: {
+            id: project.id,
+            typeOf: chevre.factory.organizationType.Project
+        },
+        organizer: {
+            id: '59d20831e53ebc2b4e774466'
+        },
+        typeOf: chevre.factory.eventType.ScreeningEvent,
+        name: {
+            en: 'pet IMAX2D',
+            ja: 'ペット IMAX2D'
+        },
+        doorTime: moment(`${today}T13:00:00Z`)
+            .toDate(),
+        startDate: moment(`${today}T13:00:00Z`)
+            .toDate(),
+        endDate: moment(`${today}T14:00:00Z`)
+            .toDate(),
+        eventStatus: chevre.factory.eventStatusType.EventScheduled,
+        location: {
+            typeOf: chevre.factory.placeType.ScreeningRoom,
+            branchCode: '70',
+            name: {
+                ja: 'シネマ7',
+                en: 'CINEMA7'
+            },
+            address: {
+                ja: '',
+                en: ''
+            }
+        },
+        superEvent: {
+            typeOf: chevre.factory.eventType.ScreeningEventSeries,
+            id: 'al9s38bj6',
+            videoFormat: [
+                {
+                    typeOf: '2D',
+                    name: '2D'
+                },
+                {
+                    typeOf: 'IMAX',
+                    name: 'IMAX'
+                }
+            ],
+            soundFormat: [],
+            workPerformed: {
+                typeOf: chevre.factory.creativeWorkType.Movie,
+                identifier: '1622100',
+                id: '5bfb841d5a78d7948369980a',
+                name: {
+                    en: 'Pet',
+                    ja: 'ペット'
+                },
+                duration: 'PT2H3M'
+            },
+            location: {
+                typeOf: chevre.factory.placeType.MovieTheater,
+                id: '5bfb841d5a78d7948369979a',
+                branchCode: '118',
+                name: {
+                    ja: 'シネモーション赤坂 ',
+                    en: 'CineMotion Akasaka'
+                }
+            },
+            kanaName: 'ペット IMAX2D',
+            name: {
+                en: 'pet IMAX2D',
+                ja: 'ペット IMAX2D'
+            },
+            additionalProperty: [],
+            startDate: moment('2022-09-30T15:00:00.000Z')
+                .toDate(),
+            endDate: moment('2029-07-31T15:00:00.000Z')
+                .toDate(),
+            headline: {
+                ja: 'IMAX2D上映'
+            }
+        },
+        offers: {
+            typeOf: chevre.factory.offerType.Offer,
+            eligibleQuantity: {
+                typeOf: 'QuantitativeValue',
+                unitCode: chevre.factory.unitCode.C62,
+                maxValue: 6
+            },
+            itemOffered: {
+                id: '655dc6b02cbb99d946cb6081',
+                name: {
+                    ja: '通常興行カタログ（サブカタログ版）'
+                },
+                serviceOutput: {
+                    typeOf: chevre.factory.reservationType.EventReservation,
+                    reservedTicket: {
+                        typeOf: 'Ticket',
+                        ticketedSeat: {
+                            typeOf: chevre.factory.placeType.Seat
+                        }
+                    }
+                },
+                typeOf: chevre.factory.product.ProductType.EventService,
+                availableChannel: {
+                    typeOf: 'ServiceChannel',
+                    serviceLocation: {
+                        typeOf: chevre.factory.placeType.ScreeningRoom,
+                        branchCode: '70',
+                        name: {
+                            ja: 'シネマ7',
+                            en: 'CINEMA7'
+                        },
+                        containedInPlace: {
+                            typeOf: chevre.factory.placeType.MovieTheater,
+                            id: '5bfb841d5a78d7948369979a',
+                            branchCode: '118',
+                            name: {
+                                ja: 'シネモーション赤坂 ',
+                                en: 'CineMotion Akasaka'
+                            }
+                        }
+                    }
+                }
+            },
+            seller: {
+                typeOf: chevre.factory.organizationType.Corporation,
+                id: '59d20831e53ebc2b4e774466',
+                name: {
+                    ja: 'シネモーション赤坂',
+                    en: 'CineMotion Akasaka'
+                },
+                makesOffer: [
+                ]
+            }
+        }
+    };
+
+    const createResult = await eventRepo.upsertManyScreeningEventByIdentifier(
+        [
+            {
+                $set: settingEvent,
+                $unset: {}
+            }
+        ],
+        { update: false }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(createResult, { depth: null });
+
+    const updateResult = await eventRepo.upsertManyScreeningEventByIdentifier(
+        [
+            {
+                $set: {
+                    ...settingEvent,
+                    eventStatus: chevre.factory.eventStatusType.EventCancelled
+                },
+                $unset: {}
+            }
+        ],
+        { update: true }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(updateResult, { depth: null });
+
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -105,6 +105,24 @@ export declare class EventRepo {
             id: string;
         }[];
     } | void>;
+    /**
+     * イベントコードをキーにして冪等置換
+     */
+    upsertManyScreeningEventByIdentifier(params: {
+        $set: factory.event.screeningEvent.IEvent;
+        $unset: IUnset<factory.eventType.ScreeningEvent>;
+    }[], options: {
+        /**
+         * falseの場合setOnInsertのみ
+         * trueの場合setのみ
+         */
+        update: boolean;
+    }): Promise<{
+        bulkWriteResult: BulkWriteResult;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/event.js

@@ -482,6 +482,71 @@ 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)) {
+                params.forEach(({ $set, $unset }) => {
+                    const { project, identifier } = $set;
+                    if (typeof identifier !== 'string' || identifier.length === 0) {
+                        throw new factory.errors.ArgumentNull('identifier');
+                    }
+                    // リソースのユニークネスを保証する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 }
+                    });
+                    if (update === true) {
+                        const { maximumPhysicalAttendeeCapacity, additionalProperty, eventStatus, location, name, superEvent, offers, doorTime, endDate, startDate } = $set;
+                        const setFields = {
+                            maximumPhysicalAttendeeCapacity, additionalProperty,
+                            eventStatus, location, name, superEvent, offers,
+                            doorTime, endDate, startDate
+                        };
+                        const updateOne = {
+                            filter,
+                            update: Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
+                            upsert: false
+                        };
+                        bulkWriteOps.push({ updateOne });
+                    }
+                    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 updateOne = {
+                            filter,
+                            update: {
+                                $setOnInsert: setOnInsert
+                            },
+                            upsert: true
+                        };
+                        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 };
+            }
+        });
+    }
     /**
      * イベント部分更新
      */
@@ -595,7 +660,7 @@ class EventRepo {
     saveEventByIdentifier4ttts(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { oldEventId } = params;
-            const _a = params.attributes, { project, typeOf } = _a, updateFields = __rest(_a, ["project", "typeOf"]);
+            const _a = params.attributes, { project, typeOf, eventStatus } = _a, updateFields = __rest(_a, ["project", "typeOf", "eventStatus"]);
             const identifier = oldEventId;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const id = uniqid();
@@ -614,6 +679,7 @@ class EventRepo {
                     _id: id,
                     typeOf,
                     project,
+                    eventStatus,
                     identifier // イベントコードを必ず追加(2025-09-03~)
                     // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
                 },

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

@@ -63,6 +63,9 @@ export declare function createScreeningEventIdFromCOA(params: {
     screenCode: string;
     timeBegin: string;
 }): string;
+/**
+ * イベントコード指定でtttsイベントを冪等更新する
+ */
 export declare function updateEvent4ttts(params: {
     /**
      * 旧イベントID
@@ -75,10 +78,6 @@ export declare function updateEvent4ttts(params: {
     project: {
         id: string;
     };
-    /**
-     * 更新者
-     */
-    agent: factory.action.IParticipant;
 }): (repos: {
     action: ActionRepo;
     event: EventRepo;

package/lib/chevre/service/event.js

@@ -858,19 +858,28 @@ function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
         parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
+/**
+ * イベントコード指定でtttsイベントを冪等更新する
+ */
 function updateEvent4ttts(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const actionAttributes = Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.actionType.UpdateAction, agent: params.agent, object: {
-                id: params.oldEventId,
-                typeOf: factory.eventType.ScreeningEvent
-            } }, {
+        const updateObject = {
+            id: params.oldEventId,
+            identifier: params.oldEventId, // support identifier(2025-09-03~)
+            typeOf: factory.eventType.ScreeningEvent
+        };
+        const actionAttributes = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.actionType.UpdateAction,
+            agent: { typeOf: factory.organizationType.Project, id: params.project.id },
+            object: updateObject,
             // replacee: reservation,
             // replacer: params.attributes, // $unsetもありうるのでいったん保留
             targetCollection: {
                 id: params.oldEventId,
                 typeOf: factory.eventType.ScreeningEvent
             }
-        });
+        };
         const action = yield repos.action.start(actionAttributes);
         let savedEvent;
         try {
@@ -888,7 +897,6 @@ function updateEvent4ttts(params) {
             }
             throw error;
         }
-        // アクション完了
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: savedEvent.id } });
         yield (0, onEventChanged_1.onEventChanged)({
             id: [savedEvent.id],

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -225,8 +225,8 @@ schedule, createDate) {
             yield (0, event_1.updateEvent4ttts)({
                 oldEventId,
                 attributes: eventAttributes,
-                project: { id: eventAttributes.project.id },
-                agent: eventAttributes.project
+                project: { id: eventAttributes.project.id }
+                // agent: eventAttributes.project
             })(repos
             // settings
             );

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": "22.13.0-alpha.4"
+  "version": "22.13.0-alpha.6"
 }

package/example/src/chevre/cancelEvent.ts

@@ -1,22 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-
-    const result = await eventRepo.cancelEvent({
-        project: { id: project.id },
-        id: '7iri6w0m1h1hu5y'
-    });
-    console.log(result);
-}
-
-main()
-    .then()
-    .catch(console.error);