@chevre/domain 21.2.0-alpha.113 → 21.2.0-alpha.115

package/example/src/chevre/countDelayedTasks.ts

@@ -4,11 +4,16 @@ 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: false });
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const count = await taskRepo.countDelayedTasks({ delayInSeconds: 60 });
+    const count = await taskRepo.countDelayedTasks({
+        delayInSeconds: 60,
+        name: {
+            $nin: [chevre.factory.taskName.OrderProgramMembership]
+        }
+    });
     console.log('count:', count);
 }
 

package/example/src/chevre/findMovieTheaterById.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const movieTheater = await placeRepo.findById(
+        { id: '5d1da6853736344e714efbb8' },
+        [
+            'additionalProperty',
+            'branchCode',
+            'hasEntranceGate',
+            'hasPOS',
+            'kanaName',
+            'name',
+            'parentOrganization',
+            'project',
+            'telephone',
+            'url',
+            'typeOf',
+            'containsPlace.branchCode',
+            'containsPlace.name',
+            'containsPlace.typeOf',
+            'containsPlace.additionalProperty',
+            'containsPlace.address'
+        ],
+        []
+    );
+    console.log('place found', movieTheater);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/migrateScreeningEventSeriesVersion.ts

@@ -0,0 +1,79 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+
+const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            'project.id': {
+                // $eq: project.id,
+                $ne: EXCLUDED_PROJECT_ID
+            },
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            'workPerformed.version': { $exists: false }
+            // _id: { $eq: 'bl7ed6sq9' }
+        },
+        {
+            _id: 1,
+            workPerformed: 1,
+            project: 1,
+            location: 1,
+            startDate: 1,
+            typeOf: 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 version = event.workPerformed.version;
+
+        const alreadyMigrated = typeof version === 'string' && version.length > 0;
+
+        if (alreadyMigrated) {
+            console.log('alreadyMigrated.', event.project.id, event.id, event.startDate, version, i);
+        } else {
+            // 既存施設コンテンツバージョンを検索
+            const { maxVersion } = await eventRepo.aggregateScreeningEventMaxVersion({
+                project: { id: { $eq: event.project.id } },
+                workPerformed: { identifier: { $eq: event.workPerformed.identifier } },
+                location: { branchCode: { $in: [event.location.branchCode] } }
+            });
+            console.log('maxVersion:', maxVersion);
+
+            const newVersion: string = `${Number(maxVersion) + 1}`;
+            console.log('updating event...', event.project.id, event.id, event.startDate, newVersion, i);
+            await eventRepo.updatePartiallyById({
+                id: event.id,
+                attributes: <any>{
+                    typeOf: event.typeOf,
+                    'workPerformed.version': newVersion
+                }
+            });
+            updateCount += 1;
+            console.log('updated.', event.project.id, event.id, event.startDate, newVersion, i);
+        }
+    });
+
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/updateScreeningRoom.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const movieTheater = await placeRepo.updateScreeningRoom(
+        {
+            typeOf: chevre.factory.placeType.ScreeningRoom,
+            branchCode: '01',
+            project: {
+                id: PROJECT_ID,
+                typeOf: chevre.factory.organizationType.Project
+            },
+            containedInPlace: {
+                branchCode: '001',
+                project: {
+                    id: PROJECT_ID,
+                    typeOf: chevre.factory.organizationType.Project
+                },
+                typeOf: chevre.factory.placeType.MovieTheater
+            },
+            name: {
+                ja: '東京タワー TOP DECK',
+                en: 'TokyoTower TOP DECK'
+            }
+        },
+        {}
+    );
+    console.log('place found', movieTheater);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/event.js

@@ -850,19 +850,20 @@ class MongoRepository {
                 },
                 {
                     $project: {
-                        workPerformed: '$workPerformed'
+                        workPerformed: '$workPerformed',
+                        version: { $toInt: '$workPerformed.version' }
                     }
                 },
                 {
                     $group: {
                         _id: '$typeOf',
-                        maxVersion: { $max: '$workPerformed.version' }
+                        maxVersion: { $max: '$version' }
                     }
                 }
             ])
                 .exec();
             const maxVersion = (aggregations.length > 0)
-                ? (_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion
+                ? String((_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion)
                 : '0';
             return { maxVersion };
         });

package/lib/chevre/repo/place.d.ts

@@ -37,7 +37,7 @@ export declare class MongoRepository {
     /**
      * 施設を保管する
      */
-    saveMovieTheater(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
+    saveMovieTheater(params: factory.place.movieTheater.IPlaceWithoutScreeningRoom): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom>;
     saveMovieTheaterByBranchCode4coa(params: factory.place.movieTheater.IPlace): Promise<factory.place.movieTheater.IPlace>;
     findMovieTheaterByBranchCode(params: {
         project: {
@@ -58,12 +58,22 @@ export declare class MongoRepository {
      */
     findById(params: {
         id: string;
-    }, projection?: any): Promise<factory.place.movieTheater.IPlace>;
+    }, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace>;
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: factory.place.screeningRoom.IPlace): Promise<void>;
-    updateScreeningRoom(screeningRoom: factory.place.screeningRoom.IPlace, $unset: any): Promise<void>;
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
+    updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>, $unset: any): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
     deleteScreeningRoom(screeningRoom: {
         project: {
             id: string;
@@ -78,7 +88,12 @@ export declare class MongoRepository {
              */
             branchCode: string;
         };
-    }): Promise<void>;
+    }): Promise<{
+        /**
+         * 施設ID
+         */
+        id: string;
+    }>;
     createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace): Promise<void>;
     updateScreeningRoomSection(screeningRoomSection: factory.place.screeningRoomSection.IPlace, $unset: any): Promise<void>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {

package/lib/chevre/repo/place.js

@@ -221,7 +221,16 @@ class MongoRepository {
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
                 const { id, branchCode, project, typeOf } = params, updateFields = __rest(params, ["id", "branchCode", "project", "typeOf"]);
-                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, { upsert: false, new: true })
+                doc = yield this.placeModel.findOneAndUpdate({ _id: params.id }, updateFields, {
+                    upsert: false,
+                    new: true,
+                    projection: {
+                        __v: 0,
+                        createdAt: 0,
+                        updatedAt: 0,
+                        containsPlace: 0
+                    }
+                })
                     .exec();
             }
             if (doc === null) {
@@ -292,12 +301,32 @@ class MongoRepository {
     /**
      * 施設取得
      */
-    findById(params, projection) {
+    findById(params, 
+    // projection?: any
+    inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const doc = yield this.placeModel.findOne({
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 _id: { $eq: params.id }
-            }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.placeModel.modelName);
@@ -360,6 +389,7 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.AlreadyInUse(factory.placeType.ScreeningRoom, ['branchCode']);
             }
+            return doc.toObject();
         });
     }
     updateScreeningRoom(screeningRoom, $unset) {
@@ -391,6 +421,7 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
             }
+            return doc.toObject();
         });
     }
     deleteScreeningRoom(screeningRoom) {
@@ -403,11 +434,16 @@ class MongoRepository {
                 $pull: {
                     containsPlace: { branchCode: screeningRoom.branchCode }
                 }
+            }, {
+                projection: {
+                    _id: 1
+                }
             })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
             }
+            return doc.toObject();
         });
     }
     createScreeningRoomSection(screeningRoomSection) {

package/lib/chevre/repo/task.d.ts

@@ -103,6 +103,9 @@ export declare class MongoRepository {
     }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
     }): Promise<number>;
     aggregateTask(params: {
         project?: {

package/lib/chevre/repo/task.js

@@ -427,10 +427,7 @@ class MongoRepository {
             const runsAtLt = moment()
                 .add(-params.delayInSeconds, 'seconds')
                 .toDate();
-            return this.taskModel.count({
-                status: factory.taskStatus.Ready,
-                runsAt: { $lt: runsAtLt }
-            })
+            return this.taskModel.count(Object.assign({ status: factory.taskStatus.Ready, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined))
                 .exec();
         });
     }

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -58,12 +58,14 @@ function findEntranceGates(params) {
         try {
             movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id }, 
             // 不要な属性を取得しない
-            {
-                containsPlace: 0,
-                hasPOS: 0,
-                offers: 0,
-                parentOrganization: 0
-            });
+            ['hasEntranceGate'], []
+            // {
+            //     containsPlace: 0,
+            //     hasPOS: 0,
+            //     offers: 0,
+            //     parentOrganization: 0
+            // }
+            );
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/task/onResourceUpdated.js

@@ -13,6 +13,7 @@ exports.call = void 0;
 const factory = require("../../factory");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
+const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
 const settings_1 = require("../../settings");
@@ -25,6 +26,7 @@ function call(data) {
         yield onResourceUpdated(data)({
             categoryCode: new categoryCode_1.MongoRepository(connectionSettings.connection),
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
+            place: new place_1.MongoRepository(connectionSettings.connection),
             product: new product_1.MongoRepository(connectionSettings.connection),
             task: new task_1.MongoRepository(connectionSettings.connection)
         });
@@ -56,6 +58,13 @@ function onResourceUpdated(params) {
                         typeOf: params.typeOf
                     })(repos);
                     break;
+                case factory.placeType.MovieTheater:
+                    yield createInformMovieTheaterTasks({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
+                    break;
                 default:
                 // no op
             }
@@ -197,3 +206,70 @@ function createInformCategoryCodeTasks(params) {
         }
     });
 }
+function createInformMovieTheaterTasks(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.ids.length !== 1) {
+            throw new factory.errors.Argument('id', 'id.length must be 1');
+        }
+        const movieTheater = yield repos.place.findById({ id: params.ids[0] }, [
+            'additionalProperty',
+            'branchCode',
+            'hasEntranceGate',
+            'hasPOS',
+            'kanaName',
+            'name',
+            'parentOrganization',
+            'project',
+            'telephone',
+            'url',
+            'typeOf',
+            'containsPlace.branchCode',
+            'containsPlace.name',
+            'containsPlace.typeOf',
+            'containsPlace.additionalProperty',
+            'containsPlace.address'
+        ], []);
+        if (movieTheater.project.id !== params.project.id) {
+            throw new factory.errors.Argument('project.id', 'project.id not matched');
+        }
+        const movieTheaters4inform = [movieTheater];
+        if (movieTheaters4inform.length > 0) {
+            const taskRunsAt = new Date();
+            const informTasks = [];
+            informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
+                var _a;
+                const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                movieTheaters4inform.forEach((movieTheater4inform) => {
+                    var _a;
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete movieTheater4inform._id;
+                    const informActionAttributes = {
+                        agent: movieTheater4inform.project,
+                        object: movieTheater4inform,
+                        project: movieTheater4inform.project,
+                        recipient: {
+                            id: '',
+                            name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    informTasks.push({
+                        project: movieTheater4inform.project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: taskRunsAt,
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informActionAttributes
+                    });
+                });
+            });
+            if (informTasks.length > 0) {
+                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+            }
+        }
+    });
+}

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.35",
+    "@chevre/factory": "4.313.0-alpha.36",
     "@cinerino/sdk": "3.157.0-alpha.12",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.113"
+  "version": "21.2.0-alpha.115"
 }

package/example/src/chevre/aggregateScreeningEventMaxVersion.ts

@@ -1,27 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const aggregation = await eventRepo.aggregateScreeningEventMaxVersion({
-        project: { id: { $eq: project.id } },
-        workPerformed: { identifier: { $eq: '00001' } },
-        location: { branchCode: { $in: ['118', '203'] } }
-    });
-
-    console.log('result:', aggregation);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);