@chevre/domain 21.9.0-alpha.8 → 21.9.0

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

@@ -0,0 +1,28 @@
+"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.onOfferCatalogUpdated = void 0;
+const syncOfferCatalog_1 = require("./syncOfferCatalog");
+/**
+ * オファーカタログ変更時処理
+ */
+function onOfferCatalogUpdated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+            project: { id: params.project.id },
+            ids: params.ids,
+            typeOf: params.typeOf,
+            isDeleted: false,
+            isOfferCatalogItem: params.isOfferCatalogItem === true
+        })(repos);
+    });
+}
+exports.onOfferCatalogUpdated = onOfferCatalogUpdated;

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({
@@ -258,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');
@@ -266,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
             };
@@ -278,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 {

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

@@ -22,8 +22,6 @@ function syncOfferCatalog(params) {
         var _a;
         if (params.isDeleted) {
             for (const offerCatalogId of params.ids) {
-                // 検索しても存在しない
-                // const offerCatalogs = await repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
                 // カタログを含む全集計オファーからカタログを除外
                 yield repos.aggregateOffer.pullIncludedInDataCatalog({
                     project: { id: params.project.id },
@@ -37,7 +35,7 @@ function syncOfferCatalog(params) {
             for (const offerCatalogId of params.ids) {
                 let offerCatalogs = [];
                 if (params.isOfferCatalogItem) {
-                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } });
+                    offerCatalogs = yield repos.offerCatalogItem.search({ id: { $in: [offerCatalogId] } }, {});
                 }
                 else {
                     offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
@@ -45,36 +43,12 @@ function syncOfferCatalog(params) {
                 const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
                 switch (itemListElementTypeOf) {
                     case factory.offerType.Offer:
-                        // 集計オファー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 } } }
-                            } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
-                        if (aggregateOfferIds.length > 0) {
-                            // 新しいカタログに含まれる全集計オファーにカタログを追加
-                            yield repos.aggregateOffer.pushIncludedInDataCatalog({
-                                project: { id: params.project.id },
-                                id: { $in: aggregateOfferIds },
-                                $push: {
-                                    includedInDataCatalog: { $each: [{ id: offerCatalogId }] }
-                                }
-                            });
-                        }
+                        // includedInDataCatalogを単価オファーへ同期
+                        yield syncOfferCatalogOfOffer2offer({
+                            id: offerCatalogId,
+                            project: { id: params.project.id },
+                            isOfferCatalogItem: params.isOfferCatalogItem
+                        })(repos);
                         // 同期済記録を補完
                         if (params.isOfferCatalogItem) {
                             yield repos.offerCatalogItem.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
@@ -83,6 +57,10 @@ function syncOfferCatalog(params) {
                             yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
                         }
                         break;
+                    case 'OfferCatalog':
+                        // 特に何もしない
+                        yield repos.offerCatalog.updateDateSynced({ id: offerCatalogId, dateSynced: new Date() });
+                        break;
                     default:
                     // no op
                 }
@@ -91,3 +69,37 @@ function syncOfferCatalog(params) {
     });
 }
 exports.syncOfferCatalog = syncOfferCatalog;
+function syncOfferCatalogOfOffer2offer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 集計オファーIDリストを検索
+        let aggregateOfferIds;
+        if (params.isOfferCatalogItem) {
+            const { itemListElement } = yield repos.offerCatalogItem.findItemListElementById({
+                id: params.id,
+                project: { id: params.project.id }
+            });
+            aggregateOfferIds = itemListElement.map((element) => element.id);
+        }
+        else {
+            const { itemListElement } = yield repos.offerCatalog.findItemListElementById({
+                id: params.id,
+                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: params.id } } }
+            } }, (aggregateOfferIds.length > 0) ? { id: { $nin: aggregateOfferIds } } : undefined));
+        if (aggregateOfferIds.length > 0) {
+            // 新しいカタログに含まれる全集計オファーにカタログを追加
+            yield repos.aggregateOffer.pushIncludedInDataCatalog({
+                project: { id: params.project.id },
+                id: { $in: aggregateOfferIds },
+                $push: {
+                    includedInDataCatalog: { $each: [{ id: params.id }] }
+                }
+            });
+        }
+    });
+}

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

@@ -26,8 +26,8 @@ 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 onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdated");
 const onResourceDeleted_1 = require("./onResourceUpdated/onResourceDeleted");
-const syncOfferCatalog_1 = require("./onResourceUpdated/syncOfferCatalog");
 const settings_1 = require("../../settings");
 const informResources = settings_1.settings.onResourceUpdated.informResource;
 /**
@@ -114,7 +114,7 @@ function onResourceUpdated(params) {
                     break;
                 // カタログに対応(2023-09-12~)
                 case 'OfferCatalog':
-                    yield (0, syncOfferCatalog_1.syncOfferCatalog)({
+                    yield (0, onOfferCatalogUpdated_1.onOfferCatalogUpdated)({
                         project: { id: params.project.id },
                         ids: params.id,
                         typeOf: params.typeOf,

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.330.0-alpha.1",
-    "@cinerino/sdk": "3.167.0-alpha.9",
+    "@chevre/factory": "4.330.0",
+    "@cinerino/sdk": "3.169.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.8"
+  "version": "21.9.0"
 }