@chevre/domain 21.5.0-alpha.4 → 21.5.0-alpha.5

package/example/src/chevre/countDelayedTransactions.ts

@@ -4,7 +4,7 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 export async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
 
     const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
     const transactionRepo = new chevre.repository.Transaction(mongoose.connection);

package/example/src/chevre/migrateMovieAvailabilityStarts.ts

@@ -0,0 +1,70 @@
+// 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: false });
+
+    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+
+    const cursor = creativeWorkRepo.getCursor(
+        {
+            'offers.availabilityEnds': { $exists: true }
+        },
+        {}
+    );
+    console.log('creativeWorks found');
+
+    let i = 0;
+    let updateCount = 0;
+    let datePublishedUndefinedCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
+
+        const availabilityEnds = movie.offers.availabilityEnds;
+        let availabilityStarts = movie.offers.availabilityStarts;
+        const createdAt: Date = (<any>movie).createdAt;
+        if (!(createdAt instanceof Date)) {
+            throw new Error('createdAt not Date');
+        }
+        const alreadyMigrated = availabilityStarts instanceof Date;
+
+        if (alreadyMigrated) {
+            console.log('already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+        } else {
+            if (movie.datePublished === undefined) {
+                console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
+                // throw new Error('movie.datePublished undefined');
+                datePublishedUndefinedCount += 1;
+            }
+
+            availabilityStarts = (movie.datePublished !== undefined)
+                ? moment(movie.datePublished)
+                    .toDate()
+                : moment(createdAt)
+                    .toDate();
+            console.log('updating movie...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+            await creativeWorkRepo.saveMovie(<any>{
+                id: String(movie.id),
+                'offers.availabilityStarts': availabilityStarts
+            });
+            updateCount += 1;
+            console.log('updated.', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+        }
+    });
+
+    console.log(i, 'creativeWorks checked');
+    console.log(updateCount, 'creativeWorks updated');
+    console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
+}
+
+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, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         // MongoDB検索条件
         const andConditions = [
             {
@@ -140,31 +140,15 @@ class MongoRepository {
                 }
             });
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.offers !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.offers.availableFrom instanceof Date) {
-                andConditions.push({
-                    'offers.availabilityEnds': {
-                        $exists: true,
-                        $gte: params.offers.availableFrom
-                    }
-                });
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.offers.availableThrough instanceof Date) {
-                andConditions.push({
-                    'offers.availabilityStarts': {
-                        $exists: true,
-                        $lte: params.offers.availableThrough
-                    }
-                });
-            }
+        const offersAvailableFrom = (_k = params.offers) === null || _k === void 0 ? void 0 : _k.availableFrom;
+        if (offersAvailableFrom instanceof Date) {
+            andConditions.push({ 'offers.availabilityEnds': { $exists: true, $gte: offersAvailableFrom } });
+        }
+        const offersAvailableThrough = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.availableThrough;
+        if (offersAvailableThrough instanceof Date) {
+            andConditions.push({ 'offers.availabilityStarts': { $exists: true, $lte: offersAvailableThrough } });
         }
-        const additionalPropertyElemMatch = (_k = params.additionalProperty) === null || _k === void 0 ? void 0 : _k.$elemMatch;
+        const additionalPropertyElemMatch = (_m = params.additionalProperty) === null || _m === void 0 ? void 0 : _m.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

package/lib/chevre/service/event/createEvent.js

@@ -37,7 +37,7 @@ function createEvent(params) {
                         const firstCreatingEventParams = creatingEventParams[0];
                         const movieTheaters = yield repos.place.searchMovieTheaters({
                             project: { id: { $eq: actionAttributes.project.id } }
-                        }, ['_id', 'branchCode', 'kanaName', 'name'], []);
+                        }, ['_id', 'branchCode', 'kanaName', 'name', 'parentOrganization'], []);
                         creatingEventParams = movieTheaters.map((movieTheater) => {
                             const location = {
                                 branchCode: movieTheater.branchCode,
@@ -46,8 +46,13 @@ function createEvent(params) {
                                 name: movieTheater.name,
                                 typeOf: factory.placeType.MovieTheater
                             };
+                            const organizer = {
+                                id: movieTheater.parentOrganization.id
+                            };
                             return {
-                                attributes: Object.assign(Object.assign({}, firstCreatingEventParams.attributes), { location })
+                                attributes: Object.assign(Object.assign({}, firstCreatingEventParams.attributes), { location,
+                                    // organizerがfirstCreatingEventParamsにそろってしまうbug対応(2023-08-03~)
+                                    organizer })
                             };
                         });
                     }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.321.0",
-    "@cinerino/sdk": "3.162.0-alpha.7",
+    "@chevre/factory": "4.321.1",
+    "@cinerino/sdk": "3.162.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.5.0-alpha.4"
+  "version": "21.5.0-alpha.5"
 }