@chevre/domain 20.1.0-alpha.27 → 20.1.0-alpha.28

package/example/src/chevre/migratePlaceAdditionalProperties.ts

@@ -0,0 +1,162 @@
+// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const cursor = placeRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            // starDate: { $gte: new Date() }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('creativeWorks found');
+
+    const additionalPropertyNames: string[] = [];
+    const additionalPropertyNamesOnSections: string[] = [];
+    const additionalPropertyNamesOnSeats: string[] = [];
+    const projectIds: string[] = [];
+    const unexpextedprojectIds: string[] = [];
+    const projectIdsOnSections: string[] = [];
+    const unexpextedprojectIdsOnSections: string[] = [];
+    const projectIdsOnSeats: string[] = [];
+    const unexpextedprojectIdsOnSeats: string[] = [];
+
+    let i = 0;
+    let updateCount = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const movieTheater: chevre.factory.place.movieTheater.IPlace = doc.toObject();
+
+        if (Array.isArray(movieTheater.containsPlace)) {
+            movieTheater.containsPlace.forEach((screeningRoom) => {
+                const additionalPropertyNamesOnResource = screeningRoom.additionalProperty?.map((p) => p.name);
+                console.log(
+                    (Array.isArray(additionalPropertyNamesOnResource)) ? additionalPropertyNamesOnResource.length : 0,
+                    'additionalPropertyNamesOnResource found',
+                    movieTheater.project.id,
+                    movieTheater.id
+                );
+                if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
+                    console.log(
+                        additionalPropertyNamesOnResource.length,
+                        'additionalPropertyNamesOnResource found',
+                        movieTheater.project.id,
+                        movieTheater.id
+                    );
+                    additionalPropertyNames.push(...additionalPropertyNamesOnResource);
+                    projectIds.push(movieTheater.project.id);
+                    additionalPropertyNamesOnResource.forEach((name) => {
+                        if (!name.match(/^[a-zA-Z]*$/)) {
+                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                            unexpextedprojectIds.push(movieTheater.project.id);
+                        }
+                        // tslint:disable-next-line:no-magic-numbers
+                        if (name.length < 5) {
+                            // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                            unexpextedprojectIds.push(movieTheater.project.id);
+                        }
+                    });
+                }
+
+                if (Array.isArray(screeningRoom.containsPlace)) {
+                    screeningRoom.containsPlace.forEach((section) => {
+                        const additionalPropertyNamesOnSection = section.additionalProperty?.map((p) => p.name);
+                        console.log(
+                            (Array.isArray(additionalPropertyNamesOnSection)) ? additionalPropertyNamesOnSection.length : 0,
+                            'additionalPropertyNamesOnSection found',
+                            movieTheater.project.id,
+                            movieTheater.id
+                        );
+                        if (Array.isArray(additionalPropertyNamesOnSection) && additionalPropertyNamesOnSection.length > 0) {
+                            console.log(
+                                additionalPropertyNamesOnSection.length,
+                                'additionalPropertyNamesOnSection found',
+                                movieTheater.project.id,
+                                movieTheater.id
+                            );
+                            additionalPropertyNamesOnSections.push(...additionalPropertyNamesOnSection);
+                            projectIdsOnSections.push(movieTheater.project.id);
+                            additionalPropertyNamesOnSection.forEach((name) => {
+                                if (!name.match(/^[a-zA-Z]*$/)) {
+                                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                                    unexpextedprojectIdsOnSections.push(movieTheater.project.id);
+                                }
+                                // tslint:disable-next-line:no-magic-numbers
+                                if (name.length < 5) {
+                                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                                    unexpextedprojectIdsOnSections.push(movieTheater.project.id);
+                                }
+                            });
+                        }
+
+                        if (Array.isArray(section.containsPlace)) {
+                            section.containsPlace.forEach((seat) => {
+                                const additionalPropertyNamesOnSeat = seat.additionalProperty?.map((p) => p.name);
+                                console.log(
+                                    (Array.isArray(additionalPropertyNamesOnSeat)) ? additionalPropertyNamesOnSeat.length : 0,
+                                    'additionalPropertyNamesOnSeat found',
+                                    movieTheater.project.id,
+                                    movieTheater.id
+                                );
+                                if (Array.isArray(additionalPropertyNamesOnSeat) && additionalPropertyNamesOnSeat.length > 0) {
+                                    console.log(
+                                        additionalPropertyNamesOnSeat.length,
+                                        'additionalPropertyNamesOnSeat found',
+                                        movieTheater.project.id,
+                                        movieTheater.id
+                                    );
+                                    additionalPropertyNamesOnSeats.push(...additionalPropertyNamesOnSeat);
+                                    projectIdsOnSeats.push(movieTheater.project.id);
+                                    additionalPropertyNamesOnSeat.forEach((name) => {
+                                        if (!name.match(/^[a-zA-Z]*$/)) {
+                                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                                            unexpextedprojectIdsOnSeats.push(movieTheater.project.id);
+                                        }
+                                        // tslint:disable-next-line:no-magic-numbers
+                                        if (name.length < 5) {
+                                            // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                                            unexpextedprojectIdsOnSeats.push(movieTheater.project.id);
+                                        }
+                                    });
+                                }
+
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    });
+    console.log(i, 'places checked');
+    console.log(updateCount, 'places updated');
+    console.log([...new Set(additionalPropertyNames)], 'screeningRooms');
+    console.log([...new Set(projectIds)], 'screeningRooms');
+    console.log([...new Set(unexpextedprojectIds)], 'screeningRooms');
+    console.log([...new Set(additionalPropertyNamesOnSections)], 'sections');
+    console.log([...new Set(projectIdsOnSections)], 'sections');
+    console.log([...new Set(unexpextedprojectIdsOnSections)], 'sections');
+    console.log([...new Set(additionalPropertyNamesOnSeats)], 'seats');
+    console.log([...new Set(projectIdsOnSeats)], 'seats');
+    console.log([...new Set(unexpextedprojectIdsOnSeats)], 'seats');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateSSKTEventCOAEndpoint.ts

@@ -0,0 +1,63 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const DELETING_PROPERTY_NAME: string = 'COA_ENDPOINT';
+
+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 },
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries }
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEvent }
+        },
+        {
+            // _id: 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> = doc.toObject();
+
+        const coaEndpointPropert = event.additionalProperty?.find((p) => p.name === DELETING_PROPERTY_NAME);
+
+        if (coaEndpointPropert !== undefined) {
+            const newAdditionalProperty: chevre.factory.propertyValue.IPropertyValue<string>[] =
+                (Array.isArray(event.additionalProperty))
+                    ? event.additionalProperty.filter((p) => {
+                        return p.name !== DELETING_PROPERTY_NAME;
+                    })
+                    : [];
+            console.log(
+                'updating event...', event.project.id, event.id, event.startDate, coaEndpointPropert.value, newAdditionalProperty, i);
+            await eventRepo.updatePartiallyById({
+                id: event.id,
+                attributes: <any>{
+                    typeOf: event.typeOf,
+                    additionalProperty: newAdditionalProperty
+                }
+            });
+            updateCount += 1;
+            console.log('event updated', event.project.id, event.id, event.startDate, i);
+        } else {
+            console.log('no property...', 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/migrateSection.ts

@@ -0,0 +1,105 @@
+// tslint:disable:no-console no-magic-numbers
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const client = redis.createClient({
+        host: <string>process.env.REDIS_HOST,
+        port: Number(process.env.REDIS_PORT),
+        password: <string>process.env.REDIS_KEY
+    });
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    const events = await eventRepo.search({
+        typeOf: chevre.factory.eventType.ScreeningEvent,
+        project: { id: { $eq: '' } },
+        startFrom: new Date()
+        // startThrough: moment().add(4, 'day').toDate()
+    });
+    console.log(events.length, 'events found');
+
+    const sectionCode = 'Default';
+    await Promise.all(events.map(async (event) => {
+        await new Promise<void>((resolve) => {
+            const key = `chevre:itemAvailability:screeningEvent:${event.id}`;
+            client.hgetall(key, async (__, reply) => {
+                if (reply !== null && Object.keys(reply).length > 0) {
+
+                    const fieldAndValues = reply;
+                    for (const field of Object.keys(fieldAndValues)) {
+                        // セクションがなければキーを更新
+                        if (field.slice(0, 7) !== sectionCode) {
+                            console.log(event.id, field);
+                            const newField = `${sectionCode}${field}`;
+                            const newValue = fieldAndValues[field];
+                            console.log('saving...', newField, newValue);
+
+                            await new Promise<void>((resolveSet) => {
+                                client.hsetnx(key, newField, newValue, (___, setReply) => {
+                                    console.log('set', setReply, newField, newValue);
+
+                                    resolveSet();
+                                });
+                            });
+
+                            // 元のフィールドを削除
+                            await new Promise<void>((resolveSet) => {
+                                client.hdel(key, field, (___, setReply) => {
+                                    console.log('deleted', setReply, field);
+
+                                    resolveSet();
+                                });
+                            });
+                        }
+                    }
+                }
+
+                resolve();
+                // if (err !== null) {
+                //     reject(err);
+                // } else {
+                //     if (reply !== null) {
+                //         client.ttl(targetKey, (ttlErr, ttl) => {
+                //             console.log('ttl:', ttl);
+                //             const args = Object.keys(reply)
+                //                 .reduce(
+                //                     (a, b) => {
+                //                         return [...a, b, reply[b]];
+                //                     },
+                //                     []
+                //                 );
+                //             console.log(args.length, 'args ready');
+
+                //             newClient.multi()
+                //                 .hmset(newKey, ...args)
+                //                 .expire(newKey, ttl)
+                //                 .exec((hmsetErr, reply) => {
+                //                     console.log('hmset result:', hmsetErr, reply);
+                //                     resolve();
+                //                 });
+                //         });
+                //     } else {
+                //         console.error('targetKey not found');
+                //     }
+                // }
+            });
+        });
+    }));
+
+    // client.keys('chevre:itemAvailability:screeningEvent:*', async (err, reply) => {
+    //     console.log(err, reply.length, 'keys found');
+    //     const targetKeys = reply;
+
+    // });
+
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/mongoose/model/categoryCode.js

@@ -14,13 +14,22 @@ const schema = new mongoose.Schema({
         type: String,
         required: true
     },
-    additionalProperty: [mongoose.SchemaTypes.Mixed]
+    additionalProperty: [mongoose.SchemaTypes.Mixed],
+    color: String,
+    image: String,
+    codeValue: {
+        type: String,
+        required: true
+    },
+    inCodeSet: mongoose.SchemaTypes.Mixed,
+    name: mongoose.SchemaTypes.Mixed,
+    paymentMethod: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'categoryCodes',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     useNestedStrict: true,
     timestamps: {
         createdAt: 'createdAt',

package/lib/chevre/repo/mongoose/model/offerCatalog.js

@@ -11,13 +11,26 @@ const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
 const schema = new mongoose.Schema({
     project: mongoose.SchemaTypes.Mixed,
     _id: String,
-    identifier: mongoose.SchemaTypes.Mixed
+    identifier: {
+        type: String,
+        required: true
+    },
+    name: mongoose.SchemaTypes.Mixed,
+    description: mongoose.SchemaTypes.Mixed,
+    alternateName: mongoose.SchemaTypes.Mixed,
+    typeOf: {
+        type: String,
+        required: true
+    },
+    itemListElement: [mongoose.SchemaTypes.Mixed],
+    itemOffered: mongoose.SchemaTypes.Mixed,
+    additionalProperty: [mongoose.SchemaTypes.Mixed]
 }, {
     collection: 'offerCatalogs',
     id: true,
     read: 'primaryPreferred',
     writeConcern: writeConcern,
-    strict: false,
+    strict: true,
     timestamps: {
         createdAt: 'createdAt',
         updatedAt: 'updatedAt'
@@ -62,6 +75,12 @@ schema.index({ 'itemOffered.serviceType.codeValue': 1, identifier: 1 }, {
         'itemOffered.serviceType.codeValue': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, identifier: 1 }, {
+    name: 'searchByAdditionalProperty',
+    partialFilterExpression: {
+        additionalProperty: { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/mongoose/model/ownershipInfo.js

@@ -5,18 +5,6 @@ const mongoose = require("mongoose");
 const modelName = 'OwnershipInfo';
 exports.modelName = modelName;
 const writeConcern = { j: true, w: 'majority', wtimeout: 10000 };
-// Arrayにも対応するためにMixedに変更(2022-07-26~)
-const ownedBySchema = mongoose.SchemaTypes.Mixed;
-const acquiredFromSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
-const typeOfGoodSchema = new mongoose.Schema({}, {
-    id: false,
-    _id: false,
-    strict: false
-});
 /**
  * 所有権スキーマ
  */
@@ -28,11 +16,11 @@ const schema = new mongoose.Schema({
         required: true
     },
     identifier: mongoose.SchemaTypes.Mixed,
-    ownedBy: ownedBySchema,
-    acquiredFrom: acquiredFromSchema,
+    ownedBy: mongoose.SchemaTypes.Mixed,
+    acquiredFrom: mongoose.SchemaTypes.Mixed,
     ownedFrom: Date,
     ownedThrough: Date,
-    typeOfGood: typeOfGoodSchema
+    typeOfGood: mongoose.SchemaTypes.Mixed
 }, {
     collection: 'ownershipInfos',
     id: true,

package/lib/chevre/repo/mongoose/model/place.js

@@ -113,6 +113,24 @@ schema.index({ additionalProperty: 1, branchCode: 1 }, {
         additionalProperty: { $exists: true }
     }
 });
+schema.index({ 'containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.additionalProperty': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.additionalProperty': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.containsPlace.additionalProperty': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceContainsPlaceAdditionalProperty',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/repo/offerCatalog.js

@@ -32,7 +32,7 @@ class MongoRepository {
         this.offerCatalogModel = connection.model(offerCatalog_1.modelName);
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -107,15 +107,15 @@ class MongoRepository {
                 }
             });
         }
-        // 互換性対応
-        // const ticketTypes = params.ticketTypes;
-        // if (Array.isArray(ticketTypes)) {
-        //     andConditions.push({
-        //         ticketTypes: {
-        //             $in: ticketTypes
-        //         }
-        //     });
-        // }
+        const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     save(params) {

package/lib/chevre/repo/place.js

@@ -435,7 +435,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             if (searchConditions.project !== undefined) {
@@ -517,6 +517,17 @@ class MongoRepository {
                     }
                 });
             }
+            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },
@@ -532,7 +543,7 @@ class MongoRepository {
                                 branchCode: '$branchCode',
                                 name: '$name'
                             }
-                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_j = searchConditions.$projection) === null || _j === void 0 ? void 0 : _j.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.containsPlace.additionalProperty' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -582,7 +593,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     searchScreeningRooms(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -671,6 +682,17 @@ class MongoRepository {
                     }
                 });
             }
+            const additionalPropertyElemMatch = (_g = searchConditions.additionalProperty) === null || _g === void 0 ? void 0 : _g.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 ...matchStages,
@@ -680,7 +702,7 @@ class MongoRepository {
                             typeOf: '$typeOf',
                             branchCode: '$branchCode',
                             name: '$name'
-                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty' }, (((_g = searchConditions.$projection) === null || _g === void 0 ? void 0 : _g.sectionCount) === 1)
+                        }, openSeatingAllowed: '$containsPlace.openSeatingAllowed', additionalProperty: '$containsPlace.additionalProperty' }, (((_h = searchConditions.$projection) === null || _h === void 0 ? void 0 : _h.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -690,7 +712,7 @@ class MongoRepository {
                                 }
                             }
                         }
-                        : undefined), (((_h = searchConditions.$projection) === null || _h === void 0 ? void 0 : _h.seatCount) === 1)
+                        : undefined), (((_j = searchConditions.$projection) === null || _j === void 0 ? void 0 : _j.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -833,7 +855,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [];
             if (params.project !== undefined) {
@@ -971,6 +993,17 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
+            const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+                matchStages.push({
+                    $match: {
+                        'containsPlace.containsPlace.containsPlace.additionalProperty': {
+                            $exists: true,
+                            $elemMatch: additionalPropertyElemMatch
+                        }
+                    }
+                });
+            }
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.279.0-alpha.4",
-    "@cinerino/sdk": "3.134.0-alpha.3",
+    "@chevre/factory": "4.279.0-alpha.5",
+    "@cinerino/sdk": "3.134.0-alpha.4",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.27"
+  "version": "20.1.0-alpha.28"
 }

package/example/src/chevre/migrateSSKTSEventCOAEndpoint.ts

@@ -1,71 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-const DEFAULT_TRANSACTION_DURATION = 900;
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const sellerRepo = new chevre.repository.Seller(mongoose.connection);
-
-    const cursor = sellerRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('sellers found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const seller: chevre.factory.seller.ISeller = doc.toObject();
-
-        const makesOffer = seller.makesOffer;
-
-        if (Array.isArray(makesOffer) && makesOffer.length > 0) {
-            const everyMakesHasTransactionDuration = makesOffer.every((offer) => {
-                const transactionDuration = offer.eligibleTransactionDuration?.maxValue;
-
-                return typeof transactionDuration === 'number';
-            });
-
-            if (everyMakesHasTransactionDuration) {
-                console.log(
-                    'already migrated...', seller.project.id, seller.id, makesOffer.length, i);
-            } else {
-                const eligibleTransactionDuration: chevre.factory.seller.IEligibleTransactionDuration = {
-                    typeOf: 'QuantitativeValue',
-                    unitCode: chevre.factory.unitCode.Sec,
-                    // tslint:disable-next-line:no-magic-numbers
-                    maxValue: (seller.project.id.slice(0, 6) === 'sskts-') ? 600 : DEFAULT_TRANSACTION_DURATION
-                };
-                console.log(
-                    'updating seller...', seller.project.id, seller.id, i);
-                await sellerRepo.save({
-                    id: seller.id,
-                    attributes: <any>{
-                        'makesOffer.$[].eligibleTransactionDuration': eligibleTransactionDuration
-                    }
-                });
-                updateCount += 1;
-                console.log(
-                    'updated...', seller.project.id, seller.id, i);
-            }
-        }
-    });
-
-    console.log(i, 'sellers checked');
-    console.log(updateCount, 'sellers updated');
-}
-
-main()
-    .then()
-    .catch(console.error);