@chevre/domain 21.9.0-alpha.12 → 21.9.0-alpha.13

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

@@ -126,6 +126,12 @@ export declare class MongoRepository {
         $pull: {
             includedInOfferCatalogItem: {
                 $elemMatch: {
+                    /**
+                     * サブカタログID除外リスト
+                     */
+                    id?: {
+                        $nin: string[];
+                    };
                     includedInDataCatalog: {
                         /**
                          * カタログID

package/lib/chevre/repo/aggregateOffer.js

@@ -615,7 +615,9 @@ class MongoRepository {
      * カタログに属するサブカタログを全て除外する
      */
     pullIncludedInOfferCatalogItemByCatalogId(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const offerCatalogItemIdNin = (_a = params.$pull.includedInOfferCatalogItem.$elemMatch.id) === null || _a === void 0 ? void 0 : _a.$nin;
             yield this.aggregateOfferModel.updateMany({
                 'project.id': { $eq: params.project.id },
                 'offers.includedInOfferCatalogItem': {
@@ -628,12 +630,12 @@ class MongoRepository {
                 }
             }, {
                 $pull: {
-                    'offers.$[].includedInOfferCatalogItem': {
-                        'includedInDataCatalog.id': {
+                    'offers.$[].includedInOfferCatalogItem': Object.assign({ 'includedInDataCatalog.id': {
                             $exists: true,
                             $eq: params.$pull.includedInOfferCatalogItem.$elemMatch.includedInDataCatalog.id.$eq
-                        }
-                    }
+                        } }, (Array.isArray(offerCatalogItemIdNin))
+                        ? { id: { $nin: offerCatalogItemIdNin } } // // 指定サブカタログを除外する
+                        : undefined)
                 }
             })
                 .exec();

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

@@ -139,6 +139,18 @@ function syncOfferCatalog2offer(params) {
         offerCatalogItemIds = itemListElement.map((element) => element.id);
         // サブカタログごとに同期
         if (offerCatalogItemIds.length > 0) {
+            // カタログに含まれるがサブカタログに含まれないものを除外
+            yield repos.aggregateOffer.pullIncludedInOfferCatalogItemByCatalogId({
+                project: { id: params.project.id },
+                $pull: {
+                    includedInOfferCatalogItem: {
+                        $elemMatch: {
+                            id: { $nin: offerCatalogItemIds },
+                            includedInDataCatalog: { id: { $eq: params.id } }
+                        }
+                    }
+                }
+            });
             for (const offerCatalogItemId of offerCatalogItemIds) {
                 yield syncSubCatalogs2offer({
                     id: offerCatalogItemId,

package/package.json

@@ -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.12"
+  "version": "21.9.0-alpha.13"
 }