@chevre/domain 21.4.0-alpha.6 → 21.4.0-alpha.7

package/example/src/chevre/cleanActions.ts

@@ -5,7 +5,7 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const actionRepo = new chevre.repository.Action(mongoose.connection);
 

package/example/src/chevre/migrateEventOrganizer.ts

@@ -0,0 +1,105 @@
+// 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 EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            typeOf: {
+                $in: [
+                    chevre.factory.eventType.ScreeningEvent,
+                    chevre.factory.eventType.ScreeningEventSeries
+                ]
+            }
+            // startDate: {
+            //     $gte: moment()
+            //         // tslint:disable-next-line:no-magic-numbers
+            //         .add(-6, 'months')
+            //         .toDate()
+            // }
+        },
+        {
+            _id: 1,
+            project: 1,
+            location: 1,
+            superEvent: 1,
+            startDate: 1,
+            typeOf: 1,
+            organizer: 1
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent
+            | chevre.factory.eventType.ScreeningEventSeries> = doc.toObject();
+
+        const organizerId = event.organizer?.id;
+
+        const alreadyMigrated = typeof organizerId === 'string';
+
+        if (alreadyMigrated) {
+            console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
+        } else {
+            let movieTheaterId: string;
+            if (event.typeOf === chevre.factory.eventType.ScreeningEventSeries) {
+                movieTheaterId = event.location.id;
+            } else {
+                movieTheaterId = event.superEvent.location.id;
+            }
+            const movieTheaters = <Pick<chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom, 'parentOrganization'>[]>
+                await placeRepo.searchMovieTheaters(
+                    {
+                        limit: 1,
+                        page: 1,
+                        project: { id: { $eq: event.project.id } },
+                        id: { $eq: movieTheaterId }
+                    },
+                    ['parentOrganization'],
+                    []
+                );
+            const movieTheater = movieTheaters.shift();
+            const sellerId = movieTheater?.parentOrganization?.id;
+            console.log('movieTheater found', event.project.id, event.id, event.startDate, 'sellerId:', sellerId, i);
+            if (typeof sellerId !== 'string') {
+                throw new Error('movieTheater not found');
+            }
+            const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+                id: sellerId
+            };
+            console.log('updating event...', event.project.id, event.id, event.startDate, i);
+            await eventRepo.updatePartiallyById({
+                id: event.id,
+                attributes: <any>{
+                    typeOf: event.typeOf,
+                    organizer: newOrganizer
+                }
+            });
+            updateCount += 1;
+            console.log('updated.', event.project.id, event.id, event.startDate, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -25,7 +25,7 @@
 import { Schema } from 'mongoose';
 declare const modelName = "Event";
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     collection: string;
@@ -53,11 +53,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -77,7 +78,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
-    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;
@@ -87,11 +87,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -111,7 +112,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
-    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;
@@ -121,11 +121,12 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     kanaName?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     checkInCount: number;
     attendeeCount: number;
+    organizer: any;
     _id?: string | undefined;
     name?: any;
-    project?: any;
     alternateName?: any;
     description?: any;
     additionalProperty?: any;
@@ -145,7 +146,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     aggregateEntranceGate?: any;
     aggregateReservation?: any;
     aggregateOffer?: any;
-    organizer?: any;
     maximumAttendeeCapacity?: number | undefined;
     remainingAttendeeCapacity?: number | undefined;
     videoFormat?: any;

package/lib/chevre/repo/mongoose/schemas/event.js

@@ -7,10 +7,17 @@ const factory = require("../../../factory");
 const modelName = 'Event';
 exports.modelName = modelName;
 /**
- * イベント(公演など)スキーマ
+ * イベントスキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    organizer: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -46,7 +53,6 @@ const schema = new mongoose_1.Schema({
     aggregateEntranceGate: mongoose_1.SchemaTypes.Mixed,
     aggregateReservation: mongoose_1.SchemaTypes.Mixed,
     aggregateOffer: mongoose_1.SchemaTypes.Mixed,
-    organizer: mongoose_1.SchemaTypes.Mixed,
     coaInfo: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'events',

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.6"
+  "version": "21.4.0-alpha.7"
 }

package/example/src/chevre/migrateEventOffersItemOfferedAvailableChannel.ts

@@ -1,90 +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 EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-6, 'months')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const eventOffers = <chevre.factory.event.screeningEvent.IOffer | undefined>event.offers;
-        if (eventOffers === undefined) {
-            throw new Error('event.offers undefined');
-        }
-
-        const availableChannel = eventOffers.itemOffered.availableChannel;
-
-        const alreadyMigrated = availableChannel?.typeOf === 'ServiceChannel';
-
-        if (alreadyMigrated) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, availableChannel.serviceLocation.branchCode, i);
-        } else {
-            const newAvailableChannel: chevre.factory.reservation.IServiceChannel = {
-                typeOf: 'ServiceChannel',
-                serviceLocation: {
-                    typeOf: event.location.typeOf,
-                    branchCode: event.location.branchCode,
-                    name: event.location.name,
-                    containedInPlace: {
-                        typeOf: event.superEvent.location.typeOf,
-                        id: event.superEvent.location.id,
-                        branchCode: event.superEvent.location.branchCode,
-                        name: event.superEvent.location.name
-                    }
-                }
-            };
-            console.log(
-                'updating seller...', event.project.id, event.id, event.startDate, newAvailableChannel.serviceLocation.branchCode, i);
-            await eventRepo.updatePartiallyById({
-                id: event.id,
-                attributes: <any>{
-                    typeOf: event.typeOf,
-                    'offers.itemOffered.availableChannel': newAvailableChannel
-                }
-            });
-            updateCount += 1;
-            console.log(
-                'updated...', event.project.id, event.id, event.startDate, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);