@chevre/domain 21.9.0-alpha.0 → 21.9.0-alpha.10

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

@@ -42,11 +42,16 @@ function onResourceDeleted(params) {
                         ids: params.id
                     })(repos);
                     break;
-                case factory.offerType.Offer:
-                    yield deleteResourcesByOffer({
+                case factory.offerType.AggregateOffer:
+                    yield deleteResourcesByAggregateOffer({
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
+                    // case factory.offerType.Offer:
+                    //     await deleteResourcesByOffer({
+                    //         project: { id: params.project.id },
+                    //         ids: params.id
+                    //     })(repos);
                     break;
                 case 'OfferCatalog':
                     yield deleteResourcesByOfferCatalog({
@@ -57,7 +62,8 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: params.typeOf,
-                        isDeleted: true
+                        isDeleted: true,
+                        isOfferCatalogItem: params.isOfferCatalogItem === true
                     })(repos);
                     break;
                 case factory.product.ProductType.EventService:
@@ -257,7 +263,7 @@ function deleteResourcesBySeller(params) {
         }
     });
 }
-function deleteResourcesByOffer(params) {
+function deleteResourcesByAggregateOffer(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');
@@ -265,7 +271,7 @@ function deleteResourcesByOffer(params) {
         for (const offerId of params.ids) {
             const deleteActionAttributes = {
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-                object: { id: offerId, typeOf: factory.offerType.Offer },
+                object: { id: offerId, typeOf: factory.offerType.AggregateOffer },
                 project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 typeOf: factory.actionType.DeleteAction
             };
@@ -277,7 +283,12 @@ function deleteResourcesByOffer(params) {
                     project: { id: params.project.id },
                     $pull: { itemListElement: { $elemMatch: { id: { $in: [offerId] } } } }
                 });
-                deleteResult = { updateCatalogResult };
+                // サブカタログ対応
+                const updateCatalogItemResult = yield repos.offerCatalogItem.pullItemListElement({
+                    project: { id: params.project.id },
+                    $pull: { itemListElement: { $elemMatch: { id: { $in: [offerId] } } } }
+                });
+                deleteResult = { updateCatalogResult, updateCatalogItemResult };
             }
             catch (error) {
                 try {
@@ -333,7 +344,12 @@ function deleteResourcesByOfferCatalog(params) {
                     project: { id: params.project.id },
                     hasOfferCatalog: { id: catalogId }
                 });
-                deleteResult = { deleteEventResult, deleteProductResult, updateOfferResult };
+                // カタログからpullItemListElement(サブカタログ対応)
+                const updateCatalogResult = yield repos.offerCatalog.pullItemListElement({
+                    project: { id: params.project.id },
+                    $pull: { itemListElement: { $elemMatch: { id: { $in: [catalogId] } } } }
+                });
+                deleteResult = { deleteEventResult, deleteProductResult, updateOfferResult, updateCatalogResult };
             }
             catch (error) {
                 try {

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

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import { MongoRepository as AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+import { MongoRepository as OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 /**
  * カタログのitemListElementを集計オファーへ同期する
  */
@@ -11,7 +12,9 @@ export declare function syncOfferCatalog(params: {
     ids: string[];
     typeOf: factory.task.onResourceUpdated.OfferCatalogType;
     isDeleted: boolean;
+    isOfferCatalogItem: boolean;
 }): (repos: {
     aggregateOffer: AggregateOfferRepo;
     offerCatalog: OfferCatalogRepo;
+    offerCatalogItem: OfferCatalogItemRepo;
 }) => Promise<void>;

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

@@ -19,38 +19,48 @@ function syncOfferCatalog(params) {
         // if (params.ids.length !== 1) {
         //     throw new factory.errors.Argument('id', 'id.length must be 1');
         // }
-        var _a, _b;
+        var _a;
         if (params.isDeleted) {
             for (const offerCatalogId of params.ids) {
-                const offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
-                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
-                switch (itemListElementTypeOf) {
-                    case factory.offerType.Offer:
-                        // カタログを含む全集計オファーからカタログを除外
-                        yield repos.aggregateOffer.pullIncludedInDataCatalog({
-                            project: { id: params.project.id },
-                            $pull: {
-                                includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
-                            }
-                        });
-                        break;
-                    default:
-                    // no op
-                }
+                // 検索しても存在しない
+                // const offerCatalogs = await repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                // カタログを含む全集計オファーからカタログを除外
+                yield repos.aggregateOffer.pullIncludedInDataCatalog({
+                    project: { id: params.project.id },
+                    $pull: {
+                        includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                    }
+                });
             }
         }
         else {
             for (const offerCatalogId of params.ids) {
-                const offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
-                const itemListElementTypeOf = (_b = offerCatalogs.shift()) === null || _b === void 0 ? void 0 : _b.itemListElementTypeOf;
+                let offerCatalogs = [];
+                if (params.isOfferCatalogItem) {
+                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } });
+                }
+                else {
+                    offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                }
+                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
                 switch (itemListElementTypeOf) {
                     case factory.offerType.Offer:
                         // 集計オファーIDリストを検索
-                        const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
-                            id: offerCatalogId,
-                            project: { id: params.project.id }
-                        });
-                        const aggregateOfferIds = itemListElement.map((element) => element.id);
+                        let aggregateOfferIds;
+                        if (params.isOfferCatalogItem) {
+                            const { itemListElement } = yield repos.offerCatalogItem.findItemListElementById({
+                                id: offerCatalogId,
+                                project: { id: params.project.id }
+                            });
+                            aggregateOfferIds = itemListElement.map((element) => element.id);
+                        }
+                        else {
+                            const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
+                                id: offerCatalogId,
+                                project: { id: params.project.id }
+                            });
+                            aggregateOfferIds = itemListElement.map((element) => element.id);
+                        }
                         // カタログを含み、かつ、新しいカタログに含まれない集計オファーからカタログを除外
                         yield repos.aggregateOffer.pullIncludedInDataCatalog(Object.assign({ project: { id: params.project.id }, $pull: {
                                 includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
@@ -66,7 +76,12 @@ function syncOfferCatalog(params) {
                             });
                         }
                         // 同期済記録を補完
-                        yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        if (params.isOfferCatalogItem) {
+                            yield repos.offerCatalogItem.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        }
+                        else {
+                            yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        }
                         break;
                     default:
                     // no op

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

@@ -20,6 +20,7 @@ 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 offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
@@ -44,6 +45,7 @@ function call(data) {
             member: new member_1.MongoRepository(connectionSettings.connection),
             offer: new offer_1.MongoRepository(connectionSettings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(connectionSettings.connection),
+            offerCatalogItem: new offerCatalogItem_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),
@@ -116,7 +118,8 @@ function onResourceUpdated(params) {
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: params.typeOf,
-                        isDeleted: false
+                        isDeleted: false,
+                        isOfferCatalogItem: params.isOfferCatalogItem === true
                     })(repos);
                     break;
                 default:

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0",
-    "@cinerino/sdk": "3.167.0-alpha.9",
+    "@chevre/factory": "4.330.0-alpha.2",
+    "@cinerino/sdk": "3.168.0",
     "@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.9.0-alpha.0"
+  "version": "21.9.0-alpha.10"
 }