@chevre/domain 21.5.0-alpha.1 → 21.5.0-alpha.3

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

@@ -186,30 +186,57 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
-    deleteScreeningEventsByMovieTheaterBranchCode(params: {
+    deleteManyByOrganizerId(params: {
+        project: {
+            id: string;
+        };
+        organizer: {
+            id: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    deleteManyByLocationId(params: {
         project: {
             id: string;
         };
         location: {
-            branchCode: string;
+            id: string;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
+    deleteManyByScreeningRoom(params: {
         project: {
             id: string;
         };
         location: {
+            /**
+             * ルームコード
+             */
             branchCode: string;
+            containedInPlace: {
+                /**
+                 * 施設ID
+                 */
+                id: string;
+            };
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteManyByOrganizerId(params: {
+    deleteManyBySuperEventId(params: {
         project: {
             id: string;
         };
-        organizer: {
+        superEvent: {
             id: string;
         };
     }): Promise<import("mongodb").DeleteResult>;
+    deleteManyBySuperEventLocationId(params: {
+        project: {
+            id: string;
+        };
+        superEvent: {
+            location: {
+                id: string;
+            };
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -882,31 +882,74 @@ class MongoRepository {
                 .exec();
         });
     }
-    deleteScreeningEventsByMovieTheaterBranchCode(params) {
+    // public async deleteScreeningEventsByMovieTheaterBranchCode(params: {
+    //     project: { id: string };
+    //     location: { branchCode: string };
+    // }) {
+    //     return this.eventModel.deleteMany(
+    //         {
+    //             typeOf: { $eq: factory.eventType.ScreeningEvent },
+    //             'project.id': { $eq: params.project.id },
+    //             'superEvent.location.branchCode': { $exists: true, $eq: params.location.branchCode }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    // public async deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
+    //     project: { id: string };
+    //     location: { branchCode: string };
+    // }) {
+    //     return this.eventModel.deleteMany(
+    //         {
+    //             typeOf: { $eq: factory.eventType.ScreeningEventSeries },
+    //             'project.id': { $eq: params.project.id },
+    //             'location.branchCode': { $exists: true, $eq: params.location.branchCode }
+    //         }
+    //     )
+    //         .exec();
+    // }
+    deleteManyByOrganizerId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
-                typeOf: { $eq: factory.eventType.ScreeningEvent },
                 'project.id': { $eq: params.project.id },
-                'superEvent.location.branchCode': { $exists: true, $eq: params.location.branchCode }
+                'organizer.id': { $exists: true, $eq: params.organizer.id }
             })
                 .exec();
         });
     }
-    deleteScreeningEventSeriesByMovieTheaterBranchCode(params) {
+    deleteManyByLocationId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
-                typeOf: { $eq: factory.eventType.ScreeningEventSeries },
                 'project.id': { $eq: params.project.id },
-                'location.branchCode': { $exists: true, $eq: params.location.branchCode }
+                'location.id': { $exists: true, $eq: params.location.id }
             })
                 .exec();
         });
     }
-    deleteManyByOrganizerId(params) {
+    deleteManyByScreeningRoom(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 'project.id': { $eq: params.project.id },
-                'organizer.id': { $exists: true, $eq: params.organizer.id }
+                'location.branchCode': { $exists: true, $eq: params.location.branchCode },
+                'superEvent.location.id': { $exists: true, $eq: params.location.containedInPlace.id }
+            })
+                .exec();
+        });
+    }
+    deleteManyBySuperEventId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'superEvent.id': { $exists: true, $eq: params.superEvent.id }
+            })
+                .exec();
+        });
+    }
+    deleteManyBySuperEventLocationId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'superEvent.location.id': { $exists: true, $eq: params.superEvent.location.id }
             })
                 .exec();
         });

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

@@ -136,7 +136,7 @@ export declare class MongoRepository {
              */
             id: string;
         };
-    }): Promise<void>;
+    }): Promise<import("mongodb").DeleteResult>;
     createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace & {
         parentOrganization?: {
             id?: string;

package/lib/chevre/repo/place.js

@@ -475,7 +475,7 @@ class MongoRepository {
     }
     deleteScreeningRoomsByMovieTheaterId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.placeModel.deleteMany({
+            return this.placeModel.deleteMany({
                 typeOf: { $eq: factory.placeType.ScreeningRoom },
                 'project.id': { $eq: params.project.id },
                 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id }

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

@@ -0,0 +1,25 @@
+import * as factory from '../../../factory';
+import { MongoRepository as AccountTitleRepo } from '../../../repo/accountTitle';
+import { MongoRepository as ActionRepo } from '../../../repo/action';
+import { MongoRepository as CategoryCodeRepo } from '../../../repo/categoryCode';
+import { MongoRepository as CreativeWorkRepo } from '../../../repo/creativeWork';
+import { MongoRepository as EventRepo } from '../../../repo/event';
+import { MongoRepository as MemberRepo } from '../../../repo/member';
+import { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
+import { MongoRepository as PlaceRepo } from '../../../repo/place';
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import { MongoRepository as ProductOfferRepo } from '../../../repo/productOffer';
+import { MongoRepository as TaskRepo } from '../../../repo/task';
+export declare function onResourceDeleted(params: factory.task.onResourceUpdated.IData): (repos: {
+    accountTitle: AccountTitleRepo;
+    action: ActionRepo;
+    categoryCode: CategoryCodeRepo;
+    creativeWork: CreativeWorkRepo;
+    event: EventRepo;
+    member: MemberRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
+    place: PlaceRepo;
+    product: ProductRepo;
+    productOffer: ProductOfferRepo;
+    task: TaskRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,230 @@
+"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.onResourceDeleted = void 0;
+const factory = require("../../../factory");
+function onResourceDeleted(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const isDeleted = params.isDeleted === true;
+        if (isDeleted) {
+            switch (params.typeOf) {
+                case factory.eventType.ScreeningEventSeries:
+                    yield deleteResourcesByScreeningEventSeries({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case factory.placeType.ScreeningRoom:
+                    yield deleteResourcesByScreeningRoom({
+                        project: { id: params.project.id },
+                        branchCode: params.branchCode,
+                        containedInPlace: { id: params.containedInPlace.id }
+                    })(repos);
+                    break;
+                case factory.placeType.MovieTheater:
+                    yield deleteResourcesByMovieTheater({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case factory.organizationType.Corporation:
+                    yield deleteResourcesBySeller({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                default:
+                // no op
+            }
+        }
+    });
+}
+exports.onResourceDeleted = onResourceDeleted;
+function deleteResourcesByScreeningEventSeries(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');
+        }
+        for (const eventId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: eventId, typeOf: factory.eventType.ScreeningEventSeries },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // イベント削除
+                const deleteScreeningEventResult = yield repos.event.deleteManyBySuperEventId({
+                    project: { id: params.project.id },
+                    superEvent: { id: eventId }
+                });
+                deleteResult = { deleteScreeningEventResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}
+function deleteResourcesByScreeningRoom(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const deleteActionAttributes = {
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            object: { branchCode: params.branchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
+            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+            typeOf: factory.actionType.DeleteAction
+        };
+        let deleteResult;
+        const action = yield repos.action.start(deleteActionAttributes);
+        try {
+            // イベント削除
+            const deleteScreeningEventResult = yield repos.event.deleteManyByScreeningRoom({
+                project: { id: params.project.id },
+                location: {
+                    branchCode: params.branchCode,
+                    containedInPlace: { id: params.containedInPlace.id }
+                }
+            });
+            deleteResult = { deleteScreeningEventResult };
+        }
+        catch (error) {
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+            }
+            catch (_) {
+                // no op
+            }
+            throw error;
+        }
+        yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+    });
+}
+function deleteResourcesByMovieTheater(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');
+        }
+        for (const placeId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: placeId, typeOf: factory.placeType.MovieTheater },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // イベント削除
+                const deleteScreeningEventResult = yield repos.event.deleteManyBySuperEventLocationId({
+                    project: { id: params.project.id },
+                    superEvent: { location: { id: placeId } }
+                });
+                // 施設コンテンツ削除
+                const deleteScreeningEventSeriesResult = yield repos.event.deleteManyByLocationId({
+                    project: { id: params.project.id },
+                    location: { id: placeId }
+                });
+                // ルーム削除
+                const deletePlaceResult = yield repos.place.deleteScreeningRoomsByMovieTheaterId({
+                    project: { id: params.project.id },
+                    containedInPlace: { id: placeId }
+                });
+                deleteResult = { deleteScreeningEventResult, deleteScreeningEventSeriesResult, deletePlaceResult };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}
+function deleteResourcesBySeller(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');
+        }
+        for (const sellerId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: sellerId, typeOf: factory.organizationType.Corporation },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // メンバー削除
+                const deleteMemberResult = yield repos.member.deleteManyByMemberOfId({
+                    project: { id: params.project.id },
+                    member: {
+                        memberOf: {
+                            id: { $eq: sellerId },
+                            typeOf: { $eq: factory.organizationType.Corporation }
+                        }
+                    }
+                });
+                // 提供決済サービス削除
+                const deletePaymentServiceProviderResult = yield repos.paymentServiceProvider.deleteManyByProviderId({
+                    project: { id: params.project.id },
+                    id: sellerId
+                });
+                // プロダクトオファー削除
+                const deleteProductOfferResult = yield repos.productOffer.deleteManyBySellerId({
+                    project: { id: params.project.id },
+                    seller: { id: sellerId }
+                });
+                // イベント削除
+                const deleteEventResult = yield repos.event.deleteManyByOrganizerId({
+                    project: { id: params.project.id },
+                    organizer: { id: sellerId }
+                });
+                // 施設削除
+                const deletePlaceResult = yield repos.place.deleteManyByParentOrganizationId({
+                    project: { id: params.project.id },
+                    parentOrganization: { id: sellerId }
+                });
+                deleteResult = {
+                    deleteMemberResult, deletePaymentServiceProviderResult, deleteProductOfferResult,
+                    deleteEventResult, deletePlaceResult
+                };
+            }
+            catch (error) {
+                try {
+                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
+                }
+                catch (_) {
+                    // no op
+                }
+                throw error;
+            }
+            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
+        }
+    });
+}

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

@@ -22,6 +22,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 onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -49,16 +50,7 @@ function onResourceUpdated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const isDeleted = params.isDeleted === true;
         if (isDeleted) {
-            switch (params.typeOf) {
-                case factory.organizationType.Corporation:
-                    yield deleteResourcesBySeller({
-                        project: { id: params.project.id },
-                        ids: params.id
-                    })(repos);
-                    break;
-                default:
-                // no op
-            }
+            yield (0, onResourceDeleted_1.onResourceDeleted)(params)(repos);
         }
         else {
             if (params.useInform === true) {
@@ -419,67 +411,3 @@ function syncMovieTheater(params) {
         });
     });
 }
-function deleteResourcesBySeller(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');
-        }
-        for (const sellerId of params.ids) {
-            const deleteActionAttributes = {
-                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-                object: { id: sellerId, typeOf: factory.organizationType.Corporation },
-                project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                typeOf: factory.actionType.DeleteAction
-            };
-            let deleteResult;
-            const action = yield repos.action.start(deleteActionAttributes);
-            try {
-                // メンバー削除
-                const deleteMemberResult = yield repos.member.deleteManyByMemberOfId({
-                    project: { id: params.project.id },
-                    member: {
-                        memberOf: {
-                            id: { $eq: sellerId },
-                            typeOf: { $eq: factory.organizationType.Corporation }
-                        }
-                    }
-                });
-                // 提供決済サービス削除
-                const deletePaymentServiceProviderResult = yield repos.paymentServiceProvider.deleteManyByProviderId({
-                    project: { id: params.project.id },
-                    id: sellerId
-                });
-                // プロダクトオファー削除
-                const deleteProductOfferResult = yield repos.productOffer.deleteManyBySellerId({
-                    project: { id: params.project.id },
-                    seller: { id: sellerId }
-                });
-                // イベント削除
-                const deleteEventResult = yield repos.event.deleteManyByOrganizerId({
-                    project: { id: params.project.id },
-                    organizer: { id: sellerId }
-                });
-                // 施設削除
-                const deletePlaceResult = yield repos.place.deleteManyByParentOrganizationId({
-                    project: { id: params.project.id },
-                    parentOrganization: { id: sellerId }
-                });
-                deleteResult = {
-                    deleteMemberResult, deletePaymentServiceProviderResult, deleteProductOfferResult,
-                    deleteEventResult, deletePlaceResult
-                };
-            }
-            catch (error) {
-                try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: deleteActionAttributes.typeOf, id: action.id, error: actionError });
-                }
-                catch (_) {
-                    // no op
-                }
-                throw error;
-            }
-            yield repos.action.complete({ typeOf: deleteActionAttributes.typeOf, id: action.id, result: deleteResult });
-        }
-    });
-}

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.319.0",
-    "@cinerino/sdk": "3.162.0-alpha.6",
+    "@chevre/factory": "4.320.0",
+    "@cinerino/sdk": "3.162.0-alpha.7",
     "@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.1"
+  "version": "21.5.0-alpha.3"
 }

package/example/src/chevre/cleanEventsByMovieTheater.ts

@@ -1,32 +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 LOCATION_BRANCH_CODE = String(process.env.LOCATION_BRANCH_CODE);
-// 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 eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    let result = await eventRepo.deleteScreeningEventSeriesByMovieTheaterBranchCode({
-        project: { id: project.id },
-        location: { branchCode: LOCATION_BRANCH_CODE }
-    });
-    console.log('deleteScreeningEventSeriesByMovieTheaterBranchCode processed.', result);
-
-    result = await eventRepo.deleteScreeningEventsByMovieTheaterBranchCode({
-        project: { id: project.id },
-        location: { branchCode: LOCATION_BRANCH_CODE }
-    });
-    console.log('deleteScreeningEventsByMovieTheaterBranchCode processed.', result);
-}
-
-main()
-    .then()
-    .catch(console.error);