@chevre/domain 21.6.0-alpha.0 → 21.6.0-alpha.2

package/example/src/chevre/migrateEventOrganizer.ts

@@ -5,7 +5,7 @@ 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;
+const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -17,7 +17,7 @@ async function main() {
     const cursor = eventRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },
-            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
             typeOf: {
                 $in: [
                     // chevre.factory.eventType.ScreeningEvent,
@@ -96,16 +96,16 @@ async function main() {
 
         if (alreadyMigrated) {
             console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
-            if (organizerId !== sellerId) {
+            if (organizerId === sellerId) {
+                console.log('organizerId is valid', event.project.id, event.id, event.startDate, organizerId, i);
+            } else {
                 invalidOrganizerCount += 1;
-            }
-        } else {
-            throw new Error('organizer not found');
-            // if (typeof sellerId !== 'string') {
-            //     throw new Error('movieTheater not found');
-            // }
-            if (typeof sellerId === 'string') {
-                const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+
+                // organizerを修正する
+                if (typeof sellerId !== 'string') {
+                    throw new Error('movieTheater not found');
+                }
+                const fixedOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
                     id: sellerId
                 };
                 console.log('updating event...', event.project.id, event.id, event.startDate, i);
@@ -114,12 +114,33 @@ async function main() {
                     id: event.id,
                     attributes: <any>{
                         typeOf: event.typeOf,
-                        organizer: newOrganizer
+                        organizer: fixedOrganizer
                     }
                 });
                 updateCount += 1;
                 console.log('updated.', event.project.id, event.id, event.startDate, i);
             }
+        } else {
+            throw new Error('organizer not found');
+            // if (typeof sellerId !== 'string') {
+            //     throw new Error('movieTheater not found');
+            // }
+            // if (typeof sellerId === 'string') {
+            //     const newOrganizer: chevre.factory.event.screeningEventSeries.IOrganizer = {
+            //         id: sellerId
+            //     };
+            //     console.log('updating event...', event.project.id, event.id, event.startDate, i);
+            //     await eventRepo.updatePartiallyById({
+            //         project: { id: event.project.id },
+            //         id: event.id,
+            //         attributes: <any>{
+            //             typeOf: event.typeOf,
+            //             organizer: newOrganizer
+            //         }
+            //     });
+            //     updateCount += 1;
+            //     console.log('updated.', event.project.id, event.id, event.startDate, i);
+            // }
         }
     });
 

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

@@ -237,6 +237,21 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
+    /**
+     * 興行(プロダクト)から削除する
+     */
+    deleteManyByItemOfferedId(params: {
+        project: {
+            id: string;
+        };
+        offers: {
+            itemOffered: {
+                id: {
+                    $in: string[];
+                };
+            };
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -954,6 +954,18 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 興行(プロダクト)から削除する
+     */
+    deleteManyByItemOfferedId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'offers.itemOffered.id': { $exists: true, $in: params.offers.itemOffered.id.$in }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

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

@@ -71,6 +71,21 @@ export declare class MongoRepository {
         attributes: factory.unitPriceOffer.IUnitPriceOffer;
         upsert?: boolean;
     }[]): Promise<void>;
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params: {
+        project: {
+            id: string;
+        };
+        addOn: {
+            itemOffered: {
+                id: {
+                    $in: string[];
+                };
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult | undefined>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/offer.js

@@ -494,6 +494,27 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * プロダクトIDからアドオンを除外する
+     */
+    pullAddOns(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.addOn.itemOffered.id.$in.length === 0) {
+                return;
+            }
+            return this.offerModel.updateMany({
+                'project.id': { $eq: params.project.id },
+                'addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in }
+            }, {
+                $pull: {
+                    addOn: {
+                        'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.offerModel.findOneAndRemove({ _id: params.id })

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

@@ -52,6 +52,20 @@ export declare class MongoRepository {
             };
         };
     }): Promise<void>;
+    pullItemListElement(params: {
+        project: {
+            id: string;
+        };
+        $pull: {
+            itemListElement: {
+                $elemMatch: {
+                    id: {
+                        $in: string[];
+                    };
+                };
+            };
+        };
+    }): Promise<import("mongodb").UpdateResult | undefined>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<(Omit<factory.offerCatalog.IOfferCatalog, 'itemListElement'> & {
         numberOfItems?: number;
     })[]>;

package/lib/chevre/repo/offerCatalog.js

@@ -178,6 +178,27 @@ class MongoRepository {
                 .exec();
         });
     }
+    pullItemListElement(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.$pull.itemListElement.$elemMatch.id.$in.length === 0) {
+                return;
+            }
+            return this.offerCatalogModel.updateMany({
+                'project.id': { $eq: params.project.id },
+                'itemListElement.id': {
+                    $exists: true,
+                    $in: params.$pull.itemListElement.$elemMatch.id.$in
+                }
+            }, {
+                $pull: {
+                    itemListElement: {
+                        id: { $in: params.$pull.itemListElement.$elemMatch.id.$in }
+                    }
+                }
+            })
+                .exec();
+        });
+    }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -68,6 +68,14 @@ export declare class MongoRepository {
          */
         createIfNotExist?: boolean;
     }): Promise<factory.product.IProduct>;
+    deleteByHasOfferCatalog(params: {
+        project: {
+            id: string;
+        };
+        hasOfferCatalog: {
+            id: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     /**
      * プロジェクト指定で削除する
      */

package/lib/chevre/repo/product.js

@@ -371,6 +371,15 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    deleteByHasOfferCatalog(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.productModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                'hasOfferCatalog.id': { $exists: true, $eq: params.hasOfferCatalog.id }
+            })
+                .exec();
+        });
+    }
     /**
      * プロジェクト指定で削除する
      */

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

@@ -5,6 +5,8 @@ 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 OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
@@ -18,6 +20,8 @@ export declare function onResourceDeleted(params: factory.task.onResourceUpdated
     event: EventRepo;
     member: MemberRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     place: PlaceRepo;
     product: ProductRepo;
     productOffer: ProductOfferRepo;

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

@@ -41,8 +41,30 @@ function onResourceDeleted(params) {
                         ids: params.id
                     })(repos);
                     break;
+                case factory.offerType.Offer:
+                    yield deleteResourcesByOffer({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case 'OfferCatalog':
+                    yield deleteResourcesByOfferCatalog({
+                        project: { id: params.project.id },
+                        ids: params.id
+                    })(repos);
+                    break;
+                case factory.product.ProductType.EventService:
+                case factory.product.ProductType.Product:
+                case factory.product.ProductType.Transportation:
+                    yield deleteResourcesByProduct({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
+                    break;
                 default:
-                // no op
+                    // no op
+                    throw new factory.errors.NotImplemented(`${params.typeOf} onDeleted not implemented`);
             }
         }
     });
@@ -228,3 +250,138 @@ function deleteResourcesBySeller(params) {
         }
     });
 }
+function deleteResourcesByOffer(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 offerId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: offerId, typeOf: factory.offerType.Offer },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // カタログからpullItemListElement
+                const updateCatalogResult = yield repos.offerCatalog.pullItemListElement({
+                    project: { id: params.project.id },
+                    $pull: { itemListElement: { $elemMatch: { id: { $in: [offerId] } } } }
+                });
+                deleteResult = { updateCatalogResult };
+            }
+            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 deleteResourcesByOfferCatalog(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 catalogId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: catalogId, typeOf: 'OfferCatalog' },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                // カタログからプロダクト検索
+                const productsWithCatalog = yield repos.product.search({
+                    project: { id: { $eq: params.project.id } },
+                    hasOfferCatalog: { id: { $eq: catalogId } }
+                }, ['_id'], []);
+                let deleteEventResult;
+                let updateOfferResult;
+                if (productsWithCatalog.length > 0) {
+                    const deletingProductIds = productsWithCatalog.map((product) => product.id);
+                    // 興行を設定されたイベント削除
+                    deleteEventResult = yield repos.event.deleteManyByItemOfferedId({
+                        project: { id: params.project.id },
+                        offers: { itemOffered: { id: { $in: deletingProductIds } } }
+                    });
+                    // アドオンから除外
+                    updateOfferResult = yield repos.offer.pullAddOns({
+                        project: { id: params.project.id },
+                        addOn: { itemOffered: { id: { $in: deletingProductIds } } }
+                    });
+                }
+                // プロダクト削除
+                const deleteProductResult = yield repos.product.deleteByHasOfferCatalog({
+                    project: { id: params.project.id },
+                    hasOfferCatalog: { id: catalogId }
+                });
+                deleteResult = { deleteEventResult, deleteProductResult, updateOfferResult };
+            }
+            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 deleteResourcesByProduct(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 productId of params.ids) {
+            const deleteActionAttributes = {
+                agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+                object: { id: productId, typeOf: params.typeOf },
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.actionType.DeleteAction
+            };
+            let deleteResult;
+            const action = yield repos.action.start(deleteActionAttributes);
+            try {
+                let deleteEventResult;
+                let updateOfferResult;
+                // 興行を設定されたイベント削除
+                deleteEventResult = yield repos.event.deleteManyByItemOfferedId({
+                    project: { id: params.project.id },
+                    offers: { itemOffered: { id: { $in: [productId] } } }
+                });
+                // アドオンから除外
+                updateOfferResult = yield repos.offer.pullAddOns({
+                    project: { id: params.project.id },
+                    addOn: { itemOffered: { id: { $in: [productId] } } }
+                });
+                deleteResult = { deleteEventResult, updateOfferResult };
+            }
+            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

@@ -17,6 +17,8 @@ const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const event_1 = require("../../repo/event");
 const member_1 = require("../../repo/member");
+const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
@@ -37,6 +39,8 @@ function call(data) {
             creativeWork: new creativeWork_1.MongoRepository(connectionSettings.connection),
             event: new event_1.MongoRepository(connectionSettings.connection),
             member: new member_1.MongoRepository(connectionSettings.connection),
+            offer: new offer_1.MongoRepository(connectionSettings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(connectionSettings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(connectionSettings.connection),
             place: new place_1.MongoRepository(connectionSettings.connection),
             product: new product_1.MongoRepository(connectionSettings.connection),

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.321.1",
-    "@cinerino/sdk": "3.162.1",
+    "@chevre/factory": "4.323.0",
+    "@cinerino/sdk": "3.162.2",
     "@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.6.0-alpha.0"
+  "version": "21.6.0-alpha.2"
 }