@chevre/domain 21.11.0-alpha.2 → 21.11.0

package/example/src/chevre/place/adminHasPOS.ts

@@ -14,7 +14,11 @@ async function main() {
     const poses = await posRepo.search({
         limit: 10,
         page: 1,
-        project: { id: { $eq: project.id } }
+        project: { id: { $eq: project.id } },
+        branchCode: {
+            // $eq: '002',
+            $regex: '^0'
+        }
     });
     console.log(poses);
     console.log(poses.length);

package/example/src/chevre/place/migrateHasPOS.ts

@@ -0,0 +1,76 @@
+// 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 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.placeType.MovieTheater
+            }
+            // organizer: { $exists: false }
+        },
+        {
+            branchCode: 1,
+            _id: 1, name: 1, project: 1, hasPOS: 1
+        }
+    );
+    console.log('places found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const movieTheater: Pick<chevre.factory.place.movieTheater.IPlace,
+            'branchCode' | 'id' | 'name' | 'project' | 'hasPOS'> = doc.toObject();
+        console.log(movieTheater);
+
+        if (!Array.isArray(movieTheater.hasPOS)) {
+            console.log('has no pos', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
+        } else {
+            const alreadyMigrated = movieTheater.hasPOS.every((pos) => pos.branchCode === pos.id);
+            if (alreadyMigrated) {
+                console.log('already migrated...', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
+            } else {
+                if (movieTheater.hasPOS.length > 0) {
+                    const newHasPOS: chevre.factory.place.movieTheater.IPOS[] = movieTheater.hasPOS.map((pos) => {
+                        return {
+                            id: pos.id,
+                            branchCode: pos.id,
+                            name: pos.name
+                        };
+                    });
+                    console.log('updating place...', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i, newHasPOS);
+                    await placeRepo.saveMovieTheater(<any>{
+                        project: movieTheater.project,
+                        branchCode: movieTheater.branchCode,
+                        id: movieTheater.id,
+                        typeOf: chevre.factory.placeType.MovieTheater,
+                        hasPOS: newHasPOS
+                    });
+                    updateCount += 1;
+                    console.log('updated.', movieTheater.project.id, movieTheater.branchCode, movieTheater.name.ja, i);
+                }
+            }
+        }
+    });
+
+    console.log(i, 'places checked');
+    console.log(updateCount, 'places updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -14,11 +14,15 @@ interface IOperator {
  */
 export declare class MongoRepository {
     private readonly placeModel;
-    private readonly operater;
+    private readonly operator;
     constructor(connection: Connection, operater: IOperator);
     search(params: {
         limit?: number;
         page?: number;
+        branchCode?: {
+            $eq?: string;
+            $regex?: string;
+        };
         project?: {
             id?: {
                 $eq?: string;

package/lib/chevre/repo/place/hasPOS.js

@@ -20,18 +20,26 @@ const settings_1 = require("../../settings");
 class MongoRepository {
     constructor(connection, operater) {
         this.placeModel = connection.model(place_1.modelName, place_1.schema);
-        this.operater = operater;
+        this.operator = operater;
     }
     search(params) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
-                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operater.id) } } }
+                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
             ];
             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 branchCodeEq = (_c = params.branchCode) === null || _c === void 0 ? void 0 : _c.$eq;
+            if (typeof branchCodeEq === 'string') {
+                matchStages.push({ $match: { 'hasPOS.branchCode': { $eq: branchCodeEq } } });
+            }
+            const branchCodeRegex = (_d = params.branchCode) === null || _d === void 0 ? void 0 : _d.$regex;
+            if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
+                matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
+            }
             const aggregate = this.placeModel.aggregate([
                 {
                     $unwind: {
@@ -63,7 +71,7 @@ class MongoRepository {
             // 施設存在確認
             let doc = yield this.placeModel.findOne({
                 'project.id': { $eq: params.project.id },
-                _id: { $eq: this.operater.id }
+                _id: { $eq: this.operator.id }
             }, { _id: 1, typeOf: 1 })
                 .exec();
             if (doc === null) {
@@ -76,7 +84,7 @@ class MongoRepository {
             };
             doc = yield this.placeModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
-                _id: { $eq: this.operater.id },
+                _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $ne: params.branchCode }
             }, {
                 $push: { hasPOS: creatingPOS }
@@ -96,7 +104,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
-                _id: { $eq: this.operater.id },
+                _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $eq: params.branchCode }
             }, Object.assign({}, (params.name !== undefined && params.name !== null)
                 ? { 'hasPOS.$[pos].name': params.name }
@@ -118,7 +126,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.placeModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
-                _id: { $eq: this.operater.id },
+                _id: { $eq: this.operator.id },
                 'hasPOS.branchCode': { $eq: params.branchCode }
             }, {
                 $pull: { hasPOS: { branchCode: { $eq: params.branchCode } } }

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

@@ -81,19 +81,6 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    addParentOrganization2ScreeningRoom(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'branchCode' | 'parentOrganization' | 'project'> & {
-        containedInPlace: {
-            branchCode: string;
-        };
-    }): Promise<{
-        containedInPlace: {
-            /**
-             * 施設ID
-             */
-            id: string;
-        };
-        typeOf: factory.placeType.ScreeningRoom;
-    }>;
     updateScreeningRoomsByContainedInPlaceId(screeningRoom: {
         project: {
             id: string;

package/lib/chevre/repo/place.js

@@ -423,26 +423,42 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    addParentOrganization2ScreeningRoom(screeningRoom) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.placeModel.findOneAndUpdate({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoom.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
-                branchCode: screeningRoom.branchCode
-            }, {
-                parentOrganization: screeningRoom.parentOrganization
-            }, {
-                new: true,
-                projection: { 'containedInPlace.id': 1, typeOf: 1 }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
-            }
-            return doc.toObject();
-        });
-    }
+    // public async addParentOrganization2ScreeningRoom(
+    //     screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'branchCode' | 'parentOrganization' | 'project'> & {
+    //         containedInPlace: {
+    //             branchCode: string;
+    //         };
+    //     }
+    // ): Promise<{
+    //     containedInPlace: {
+    //         /**
+    //          * 施設ID
+    //          */
+    //         id: string;
+    //     };
+    //     typeOf: factory.placeType.ScreeningRoom;
+    // }> {
+    //     const doc = await this.placeModel.findOneAndUpdate(
+    //         {
+    //             typeOf: { $eq: factory.placeType.ScreeningRoom },
+    //             'project.id': { $eq: screeningRoom.project.id },
+    //             'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+    //             branchCode: screeningRoom.branchCode
+    //         },
+    //         {
+    //             parentOrganization: screeningRoom.parentOrganization
+    //         },
+    //         {
+    //             new: true,
+    //             projection: { 'containedInPlace.id': 1, typeOf: 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+    //     }
+    //     return doc.toObject();
+    // }
     updateScreeningRoomsByContainedInPlaceId(screeningRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.d.ts

@@ -0,0 +1,16 @@
+import * as factory from '../../../factory';
+import { MongoRepository as PlaceRepo } from '../../../repo/place';
+import { MongoRepository as TaskRepo } from '../../../repo/task';
+export declare function createInformHasPOSTasks(params: {
+    project: {
+        id: string;
+    };
+    /**
+     * 施設ID
+     */
+    ids: string[];
+    typeOf: factory.placeType.MovieTheater;
+}): (repos: {
+    place: PlaceRepo;
+    task: TaskRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createInformHasPOSTasks = void 0;
+const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
+const informResources = settings_1.settings.onResourceUpdated.informResource;
+function createInformHasPOSTasks(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');
+        }
+        // 施設のhasPOSを全て連携する
+        const movieTheaters = yield repos.place.searchMovieTheaters({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            id: { $eq: params.ids[0] }
+        }, ['hasPOS'], []);
+        const movieTheater = movieTheaters.shift();
+        if (movieTheater === undefined) {
+            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+        }
+        const movieTheaters4inform = [{
+                hasPOS: (Array.isArray(movieTheater.hasPOS)) ? movieTheater.hasPOS : [],
+                id: movieTheater.id,
+                typeOf: factory.placeType.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;
+                    const informActionAttributes = {
+                        agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        object: movieTheater4inform,
+                        project: { id: params.project.id, typeOf: factory.organizationType.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: { id: params.project.id, typeOf: factory.organizationType.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 });
+            }
+        }
+    });
+}
+exports.createInformHasPOSTasks = createInformHasPOSTasks;

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

@@ -11,11 +11,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onResourceDeleted = void 0;
 const factory = require("../../../factory");
+const onHasPOSUpdated_1 = require("./onHasPOSUpdated");
 const syncOfferCatalog_1 = require("./syncOfferCatalog");
+// tslint:disable-next-line:max-func-body-length
 function onResourceDeleted(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
         if (isDeleted) {
+            if (params.useInform === true) {
+                switch (params.typeOf) {
+                    case 'POS':
+                        yield (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
+                            project: { id: params.project.id },
+                            ids: [params.operator.id],
+                            typeOf: factory.placeType.MovieTheater
+                        })(repos);
+                        break;
+                    default:
+                    // no op
+                }
+            }
             switch (params.typeOf) {
                 case factory.eventType.ScreeningEventSeries:
                     yield deleteResourcesByScreeningEventSeries({

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

@@ -26,6 +26,7 @@ const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const productOffer_1 = require("../../repo/productOffer");
 const task_1 = require("../../repo/task");
+const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
 const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
 const settings_1 = require("../../settings");
@@ -55,6 +56,7 @@ function call(data) {
     });
 }
 exports.call = call;
+// tslint:disable-next-line:max-func-body-length
 function onResourceUpdated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
@@ -99,6 +101,13 @@ function onResourceUpdated(params) {
                             typeOf: params.typeOf
                         })(repos);
                         break;
+                    case 'POS':
+                        yield (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
+                            project: { id: params.project.id },
+                            ids: [params.operator.id],
+                            typeOf: factory.placeType.MovieTheater
+                        })(repos);
+                        break;
                     default:
                     // no op
                 }

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.333.0",
+    "@chevre/factory": "4.334.0",
     "@cinerino/sdk": "3.170.0",
     "@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.11.0-alpha.2"
+  "version": "21.11.0"
 }

package/example/src/chevre/migrateScreeningRoomOrganizer.ts

@@ -1,91 +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, { autoIndex: false });
-
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = placeRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: {
-                $in: [
-                    chevre.factory.placeType.ScreeningRoom
-                ]
-            }
-            // organizer: { $exists: false }
-        },
-        {
-            containsPlace: 0
-        }
-    );
-    console.log('places found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const screeningRoom: chevre.factory.place.screeningRoom.IPlace = doc.toObject();
-        console.log(screeningRoom);
-
-        const organizerId = screeningRoom.parentOrganization?.id;
-        const alreadyMigrated = typeof organizerId === 'string';
-
-        if (alreadyMigrated) {
-            console.log('already exist...', screeningRoom.project.id, screeningRoom.branchCode, organizerId, i);
-        } else {
-            const movieTheaterId = screeningRoom.containedInPlace?.id;
-            if (typeof movieTheaterId !== 'string') {
-                throw new Error('containedInPlace?.id undefined');
-            }
-            const movieTheaters = <Pick<chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom, 'parentOrganization'>[]>
-                await placeRepo.searchMovieTheaters(
-                    {
-                        limit: 1,
-                        page: 1,
-                        project: { id: { $eq: screeningRoom.project.id } },
-                        id: { $eq: movieTheaterId }
-                    },
-                    ['parentOrganization'],
-                    []
-                );
-            const movieTheater = movieTheaters.shift();
-            const sellerId = movieTheater?.parentOrganization?.id;
-            console.log('movieTheater found', screeningRoom.project.id, screeningRoom.branchCode, 'sellerId:', sellerId, i);
-            // if (typeof sellerId !== 'string') {
-            //     throw new Error('movieTheater not found');
-            // }
-            if (typeof sellerId === 'string') {
-                const newParentOrganization: chevre.factory.place.screeningRoom.IParentOrganization = {
-                    id: sellerId,
-                    typeOf: chevre.factory.organizationType.Corporation
-                };
-                console.log('updating room...', screeningRoom.project.id, screeningRoom.branchCode, i);
-                await placeRepo.addParentOrganization2ScreeningRoom({
-                    project: screeningRoom.project,
-                    branchCode: screeningRoom.branchCode,
-                    containedInPlace: { branchCode: String(screeningRoom.containedInPlace?.branchCode) },
-                    parentOrganization: newParentOrganization
-                });
-                updateCount += 1;
-                console.log('updated.', screeningRoom.project.id, screeningRoom.branchCode, i);
-            }
-        }
-    });
-
-    console.log(i, 'rooms checked');
-    console.log(updateCount, 'rooms updated');
-}
-
-main()
-    .then()
-    .catch(console.error);