@chevre/domain 20.2.0-alpha.2 → 20.2.0-alpha.3

package/example/src/chevre/migrateEventOffersItemOfferedAvailableChannel.ts

@@ -0,0 +1,89 @@
+// 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()
+                    .add(-1, 'month')
+                    .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);

package/example/src/chevre/migrateEventOffersItemOfferedTypeOf.ts

@@ -5,11 +5,6 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 // const project = { id: String(process.env.PROJECT_ID) };
-
-const POS_CLIENT_ID = process.env.POS_CLIENT_ID;
-if (typeof POS_CLIENT_ID !== 'string') {
-    throw new Error('set POS_CLIENT_ID');
-}
 const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 
 // tslint:disable-next-line:max-func-body-length

package/lib/chevre/repo/place.js

@@ -38,9 +38,7 @@ class MongoRepository {
         const andConditions = [{ typeOf: { $eq: factory.placeType.MovieTheater } }];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
-            andConditions.push({
-                'project.id': { $eq: projectIdEq }
-            });
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         const branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof branchCodeEq === 'string') {
@@ -435,22 +433,17 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
-            if (searchConditions.project !== undefined) {
-                if (searchConditions.project.id !== undefined) {
-                    if (typeof searchConditions.project.id.$eq === 'string') {
-                        matchStages.push({
-                            $match: {
-                                'project.id': { $eq: searchConditions.project.id.$eq }
-                            }
-                        });
-                    }
-                }
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
+            const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'project.id': { $eq: projectIdEq } }
+                });
             }
             // 施設コード
-            const movieTheaterBranchCodeEq = (_c = (_b = (_a = searchConditions.containedInPlace) === null || _a === void 0 ? void 0 : _a.containedInPlace) === null || _b === void 0 ? void 0 : _b.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+            const movieTheaterBranchCodeEq = (_e = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
             if (typeof movieTheaterBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -462,7 +455,7 @@ class MongoRepository {
                 });
             }
             // スクリーンコード
-            const containedInPlaceBranchCodeEq = (_e = (_d = searchConditions.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            const containedInPlaceBranchCodeEq = (_g = (_f = searchConditions.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -474,7 +467,7 @@ class MongoRepository {
                 });
             }
             // セクションコード
-            const sectionBranchCodeEq = (_f = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _f === void 0 ? void 0 : _f.$eq;
+            const sectionBranchCodeEq = (_h = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$eq;
             if (typeof sectionBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -485,7 +478,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_g = searchConditions.name) === null || _g === void 0 ? void 0 : _g.$regex;
+            const nameCodeRegex = (_j = searchConditions.name) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -506,7 +499,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
+            const branchCodeRegex = (_k = searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -517,7 +510,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -543,7 +536,7 @@ class MongoRepository {
                                 branchCode: '$branchCode',
                                 name: '$name'
                             }
-                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -595,7 +588,7 @@ class MongoRepository {
     searchScreeningRooms(searchConditions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
             if (typeof projectIdEq === 'string') {
                 matchStages.push({
@@ -855,21 +848,16 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [];
-            if (params.project !== undefined) {
-                if (params.project.id !== undefined) {
-                    if (typeof params.project.id.$eq === 'string') {
-                        matchStages.push({
-                            $match: {
-                                'project.id': { $eq: params.project.id.$eq }
-                            }
-                        });
-                    }
-                }
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.MovieTheater } } }];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({
+                    $match: { 'project.id': { $eq: projectIdEq } }
+                });
             }
-            const containedInPlaceBranchCodeEq = (_b = (_a = params.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === null || _b === void 0 ? void 0 : _b.$eq;
+            const containedInPlaceBranchCodeEq = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -880,7 +868,7 @@ class MongoRepository {
                     }
                 });
             }
-            const containedInPlaceBranchCodeIn = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$in;
+            const containedInPlaceBranchCodeIn = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
             if (Array.isArray(containedInPlaceBranchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -934,7 +922,7 @@ class MongoRepository {
                     });
                 }
             }
-            const branchCodeIn = (_e = params.branchCode) === null || _e === void 0 ? void 0 : _e.$in;
+            const branchCodeIn = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -945,7 +933,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_f = params.branchCode) === null || _f === void 0 ? void 0 : _f.$regex;
+            const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
             if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -956,7 +944,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameRegex = (_g = params.name) === null || _g === void 0 ? void 0 : _g.$regex;
+            const nameRegex = (_j = params.name) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof nameRegex === 'string' && nameRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -977,7 +965,7 @@ class MongoRepository {
                     }
                 });
             }
-            const seatingTypeEq = (_h = params.seatingType) === null || _h === void 0 ? void 0 : _h.$eq;
+            const seatingTypeEq = (_k = params.seatingType) === null || _k === void 0 ? void 0 : _k.$eq;
             if (typeof seatingTypeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -993,7 +981,7 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
-            const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.2"
+  "version": "20.2.0-alpha.3"
 }

package/example/src/chevre/migrateEventProjectAttributes.ts

@@ -1,57 +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 },
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .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.screeningEventSeries.IEvent = doc.toObject();
-
-        const locationProjectId = (<any>event.location).project?.id;
-        if (typeof locationProjectId !== 'string') {
-            console.log('already deleted', event.id, event.startDate, event.project.id, i);
-        } else {
-            updateCount += 1;
-            console.log('deleting project...', event.id, event.startDate, event.project.id, i);
-            await eventRepo.deleteUnnecessaryProjectAttributesById({ id: event.id });
-            console.log('project deleted', event.id, event.startDate, event.project.id, i);
-        }
-    });
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);