@chevre/domain 20.1.0-alpha.22 → 20.1.0-alpha.24

package/example/src/chevre/migrateCreativeWorkAdditionalProperties.ts

@@ -0,0 +1,91 @@
+// 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 creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+    // const placeRepo = new chevre.repository.Place(mongoose.connection);
+    // const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
+
+    const cursor = creativeWorkRepo.getCursor(
+        // const cursor = placeRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('creativeWorks found');
+
+    const additionalPropertyNames: string[] = [];
+    const projectIds: string[] = [];
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const creativeWork: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
+
+        const additionalPropertyNamesOnEvent = creativeWork.additionalProperty?.map((p) => p.name);
+        if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
+            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', creativeWork.project.id);
+            additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
+            projectIds.push(creativeWork.project.id);
+            additionalPropertyNamesOnEvent.forEach((name) => {
+                if (!name.match(/^[a-zA-Z]*$/)) {
+                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                }
+                // tslint:disable-next-line:no-magic-numbers
+                if (name.length < 5) {
+                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                }
+            });
+
+            // for (const additionalPropertyNameOnEvent of additionalPropertyNamesOnEvent) {
+            //     const existings = await additionalPropertyRepo.search({
+            //         project: { id: { $eq: event.project.id } },
+            //         limit: 1,
+            //         page: 1,
+            //         name: { $regex: `^${additionalPropertyNameOnEvent}$` }
+            //     });
+            //     if (existings.length > 0) {
+            //         console.log('already existed', additionalPropertyNameOnEvent, event.id, event.project.id);
+            //     } else {
+            //         updateCount += 1;
+            //         await additionalPropertyRepo.save({
+            //             attributes: {
+            //                 project: event.project,
+            //                 typeOf: 'CategoryCode',
+            //                 codeValue: additionalPropertyNameOnEvent,
+            //                 inCodeSet: {
+            //                     typeOf: 'CategoryCodeSet',
+            //                     identifier: <any>event.typeOf
+            //                 },
+            //                 name: { ja: additionalPropertyNameOnEvent }
+            //             }
+            //         });
+            //         console.log('created', additionalPropertyNameOnEvent, event.id, event.project.id);
+            //     }
+            // }
+        }
+    });
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+    console.log([...new Set(additionalPropertyNames)]);
+    console.log([...new Set(projectIds)]);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/creativeWork.js

@@ -33,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         // MongoDB検索条件
         const andConditions = [
             {
@@ -155,6 +155,15 @@ class MongoRepository {
                 });
             }
         }
+        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     /**

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

@@ -111,6 +111,12 @@ schema.index({ 'distributor.codeValue': 1, identifier: 1 }, {
         'distributor.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/place.js

@@ -107,6 +107,12 @@ schema.index({ 'containsPlace.containsPlace.containsPlace.branchCode': 1, branch
         'containsPlace.containsPlace.containsPlace.branchCode': { $exists: true }
     }
 });
+schema.index({ additionalProperty: 1, branchCode: 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/place.js

@@ -33,7 +33,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // 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;
@@ -123,6 +123,15 @@ class MongoRepository {
                 }
             });
         }
+        const additionalPropertyElemMatch = (_j = params.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: additionalPropertyElemMatch
+                }
+            });
+        }
         return andConditions;
     }
     /**

package/package.json

@@ -9,12 +9,12 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.279.0-alpha.2",
-    "@cinerino/sdk": "3.133.0",
+    "@chevre/factory": "4.279.0-alpha.3",
+    "@cinerino/sdk": "3.134.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.1.0",
+    "@surfrock/sdk": "1.2.0-alpha.0",
     "@waiter/domain": "5.1.0",
     "JSONStream": "^1.3.5",
     "aws-sdk": "^2.984.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.22"
+  "version": "20.1.0-alpha.24"
 }