@chevre/domain 22.13.0-alpha.3 → 22.13.0-alpha.5

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: 'blwz44aee' },
+            '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/lib/chevre/repo/event.d.ts

@@ -56,6 +56,7 @@ type IKeyOfProjection4minimizedEvent<T extends AvailableEventType> = T extends f
 type IUnset<T extends AvailableEventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
+export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf'>;
 /**
  * イベントリポジトリ
  */
@@ -128,15 +129,21 @@ export declare class EventRepo {
     }): Promise<{
         id: string;
     }>;
-    saveManyEvents<T extends AvailableEventType>(params: {
+    /**
+     * sskts専用
+     */
+    saveManyEvents(params: {
         id: string;
-        attributes: factory.event.IAttributes<T>;
-        $unset?: IUnset<T>;
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
+        $unset?: IUnset<factory.eventType.ScreeningEvent>;
         upsert: boolean;
     }[]): Promise<void>;
-    save4ttts(params: {
+    /**
+     * tttsイベントを識別子によって冪等作成する
+     */
+    saveEventByIdentifier4ttts(params: {
         oldEventId: string;
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
+        attributes: ICreatingEvent4ttts;
     }): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/event.js

@@ -553,6 +553,9 @@ class EventRepo {
             return { id: savedEventId }; // optimize(2024-07-31~)
         });
     }
+    /**
+     * sskts専用
+     */
     saveManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const bulkWriteOps = [];
@@ -586,10 +589,14 @@ class EventRepo {
             }
         });
     }
-    save4ttts(params) {
+    /**
+     * tttsイベントを識別子によって冪等作成する
+     */
+    saveEventByIdentifier4ttts(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // let doc: Document | null;
-            const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+            const { oldEventId } = params;
+            const _a = params.attributes, { project, typeOf } = _a, updateFields = __rest(_a, ["project", "typeOf"]);
+            const identifier = oldEventId;
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             const id = uniqid();
             const doc = yield this.eventModel.findOneAndUpdate({
@@ -598,13 +605,18 @@ class EventRepo {
                 // 追加特性をキーに更新
                 additionalProperty: {
                     $exists: true,
-                    $all: [{ name: 'oldEventId', value: params.oldEventId }]
+                    $all: [{ name: 'oldEventId', value: oldEventId }]
                 }
             }, 
             // upsertの場合、createがありうるので属性を除外しない
             {
-                $setOnInsert: Object.assign({ _id: id, typeOf,
-                    project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined),
+                $setOnInsert: {
+                    _id: id,
+                    typeOf,
+                    project,
+                    identifier // イベントコードを必ず追加(2025-09-03~)
+                    // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
+                },
                 $set: updateFields
             }, { upsert: true, new: true, projection: { _id: 1 } })
                 .lean()

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

@@ -5,7 +5,7 @@ import type * as COA from '@motionpicture/coa-service';
 import type { ActionRepo } from '../repo/action';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
-import type { EventRepo } from '../repo/event';
+import type { EventRepo, ICreatingEvent4ttts } from '../repo/event';
 import type { EventSeriesRepo } from '../repo/eventSeries';
 import type { MovieTheaterRepo } from '../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
@@ -63,6 +63,9 @@ export declare function createScreeningEventIdFromCOA(params: {
     screenCode: string;
     timeBegin: string;
 }): string;
+/**
+ * イベントコード指定でtttsイベントを冪等更新する
+ */
 export declare function updateEvent4ttts(params: {
     /**
      * 旧イベントID
@@ -71,14 +74,10 @@ export declare function updateEvent4ttts(params: {
     /**
      * イベント属性
      */
-    attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
+    attributes: ICreatingEvent4ttts;
     project: {
         id: string;
     };
-    /**
-     * 更新者
-     */
-    agent: factory.action.IParticipant;
 }): (repos: {
     action: ActionRepo;
     event: EventRepo;
@@ -87,4 +86,4 @@ export declare function updateEvent4ttts(params: {
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
-export {};
+export { ICreatingEvent4ttts };

package/lib/chevre/service/event.js

@@ -858,23 +858,32 @@ 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 {
-            savedEvent = yield repos.event.save4ttts({
+            savedEvent = yield repos.event.saveEventByIdentifier4ttts({
                 oldEventId: params.oldEventId,
                 attributes: params.attributes
             });
@@ -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

@@ -118,7 +118,7 @@ schedule, createDate) {
         //         return Array.isArray(m.member.hasRole) && m.member.hasRole.some((r) => AVAILABLE_ROLE_NAMES.includes(r.roleName));
         //     });
         for (const performanceInfo of targetInfo) {
-            const id = [
+            const oldEventId = [
                 // tslint:disable-next-line:no-magic-numbers
                 performanceInfo.day.slice(-6),
                 workPerformedIdentifier,
@@ -215,22 +215,22 @@ schedule, createDate) {
                 // 旧フォーマットIDを追加特性に追加(2022-09-08~)
                 additionalProperty: [
                     { name: 'tourNumber', value: String(performanceInfo.tour_number) },
-                    { name: 'oldEventId', value: String(id) }
+                    { name: 'oldEventId', value: oldEventId }
                 ],
                 // organizer追加(2023-07-12~)
                 organizer: { id: seller.id }
             };
             // domain.serviceで実装(2022-09-10~)
-            debug('updating event...', id, eventAttributes.startDate);
+            debug('updating event...', oldEventId, eventAttributes.startDate);
             yield (0, event_1.updateEvent4ttts)({
-                oldEventId: id,
+                oldEventId,
                 attributes: eventAttributes,
-                project: { id: eventAttributes.project.id },
-                agent: eventAttributes.project
+                project: { id: eventAttributes.project.id }
+                // agent: eventAttributes.project
             })(repos
             // settings
             );
-            debug('event update(updateEvent4ttts)', id, eventAttributes.startDate);
+            debug('event update(updateEvent4ttts)', oldEventId, eventAttributes.startDate);
         }
         debug(targetInfo.length, 'events updated');
     });

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