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

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

@@ -13,7 +13,7 @@ async function main() {
 
     const cursor = eventRepo.getCursor(
         {
-            _id: { $eq: 'blwz44aee' },
+            // _id: { $eq: 'blwz44d0k' },
             'project.id': { $eq: project.id }
         },
         {
@@ -61,16 +61,16 @@ async function main() {
             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
-            //         }
-            //     }
-            // });
+            await eventRepo.updatePartiallyById({
+                project: { id: event.project.id },
+                id: event.id,
+                attributes: {
+                    typeOf: event.typeOf,
+                    ...{
+                        identifier: oldEventId
+                    }
+                }
+            });
             updateCount += 1;
             console.log(
                 'updated.',

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

@@ -56,7 +56,9 @@ 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'>;
+export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier'> & {
+    identifier: string;
+};
 /**
  * イベントリポジトリ
  */
@@ -105,6 +107,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>;
     /**
      * イベント部分更新
      */
@@ -142,7 +162,6 @@ export declare class EventRepo {
      * tttsイベントを識別子によって冪等作成する
      */
     saveEventByIdentifier4ttts(params: {
-        oldEventId: string;
         attributes: ICreatingEvent4ttts;
     }): Promise<{
         id: string;

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 };
+            }
+        });
+    }
     /**
      * イベント部分更新
      */
@@ -594,9 +659,12 @@ 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 identifier = oldEventId;
+            // const { oldEventId } = params;
+            const _a = params.attributes, { project, typeOf, eventStatus, identifier, organizer } = _a, updateFields = __rest(_a, ["project", "typeOf", "eventStatus", "identifier", "organizer"]);
+            // const identifier = oldEventId;
+            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 doc = yield this.eventModel.findOneAndUpdate({
@@ -605,7 +673,7 @@ class EventRepo {
                 // 追加特性をキーに更新
                 additionalProperty: {
                     $exists: true,
-                    $all: [{ name: 'oldEventId', value: oldEventId }]
+                    $all: [{ name: 'oldEventId', value: identifier }]
                 }
             }, 
             // upsertの場合、createがありうるので属性を除外しない
@@ -614,6 +682,8 @@ class EventRepo {
                     _id: id,
                     typeOf,
                     project,
+                    eventStatus,
+                    organizer,
                     identifier // イベントコードを必ず追加(2025-09-03~)
                     // ...(typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined
                 },

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

@@ -5,14 +5,11 @@ 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, ICreatingEvent4ttts } from '../repo/event';
+import type { EventRepo } from '../repo/event';
 import type { EventSeriesRepo } from '../repo/eventSeries';
 import type { MovieTheaterRepo } from '../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
-import type { ProjectRepo } from '../repo/project';
 import type { SellerRepo } from '../repo/seller';
-import type { SettingRepo } from '../repo/setting';
-import type { TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 interface IImportFromCOAParams {
     project: {
@@ -38,7 +35,7 @@ interface IImportFromCOAParams {
 /**
  * イベントをインポートする
  */
-export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
+declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     action: ActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
@@ -49,13 +46,10 @@ export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     seller: SellerRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
-export declare function minimizeSuperEvent(params: {
-    superEvent: factory.event.screeningEventSeries.IEvent;
-}): factory.event.screeningEvent.ISuperEvent;
 /**
  * COA情報からイベントIDを作成する
  */
-export declare function createScreeningEventIdFromCOA(params: {
+declare function createScreeningEventIdFromCOA(params: {
     theaterCode: string;
     titleCode: string;
     titleBranchNum: string;
@@ -63,27 +57,4 @@ export declare function createScreeningEventIdFromCOA(params: {
     screenCode: string;
     timeBegin: string;
 }): string;
-/**
- * イベントコード指定でtttsイベントを冪等更新する
- */
-export declare function updateEvent4ttts(params: {
-    /**
-     * 旧イベントID
-     */
-    oldEventId: string;
-    /**
-     * イベント属性
-     */
-    attributes: ICreatingEvent4ttts;
-    project: {
-        id: string;
-    };
-}): (repos: {
-    action: ActionRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    project: ProjectRepo;
-    setting: SettingRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export { ICreatingEvent4ttts };
+export { importFromCOA, createScreeningEventIdFromCOA };

package/lib/chevre/service/event.js

@@ -10,17 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importFromCOA = importFromCOA;
-exports.minimizeSuperEvent = minimizeSuperEvent;
 exports.createScreeningEventIdFromCOA = createScreeningEventIdFromCOA;
-exports.updateEvent4ttts = updateEvent4ttts;
 const createDebug = require("debug");
 // @ts-ignore
 const difference = require("lodash.difference");
 // import { google } from 'googleapis';
 const moment = require("moment-timezone");
 const factory = require("../factory");
-// import { Settings } from '../settings';
-const onEventChanged_1 = require("./offer/onEventChanged");
 const debug = createDebug('chevre-domain:service:event');
 /**
  * イベントをインポートする
@@ -858,54 +854,3 @@ 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 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.saveEventByIdentifier4ttts({
-                oldEventId: params.oldEventId,
-                attributes: params.attributes
-            });
-        }
-        catch (error) {
-            try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: { id: savedEvent.id } });
-        yield (0, onEventChanged_1.onEventChanged)({
-            id: [savedEvent.id],
-            project: { id: params.project.id },
-            typeOf: factory.eventType.ScreeningEvent,
-            isNew: false,
-            useInform: true
-        })(repos
-        // スケジュールによるイベント作成ではendDateに変更がないのでpendingReservationsへの同期はひとまず必要なし
-        );
-    });
-}

package/lib/chevre/service/task/createEvent/createEventBySchedule/schedule2events.d.ts

@@ -0,0 +1,15 @@
+import type { ICreatingEvent4ttts } from '../../../../repo/event';
+import type { EventSeriesRepo } from '../../../../repo/eventSeries';
+import type { MemberRepo } from '../../../../repo/member';
+import type { MovieTheaterRepo } from '../../../../repo/place/movieTheater';
+import type { ScreeningRoomRepo } from '../../../../repo/place/screeningRoom';
+import type { ProductRepo } from '../../../../repo/product';
+import * as factory from '../../../../factory';
+declare function schedule2events(schedule: factory.schedule.IEventWithSchedule, createDate: Date): (repos: {
+    eventSeries: EventSeriesRepo;
+    member: MemberRepo;
+    movieTheater: MovieTheaterRepo;
+    screeningRoom: ScreeningRoomRepo;
+    product: ProductRepo;
+}) => Promise<ICreatingEvent4ttts[]>;
+export { schedule2events };