fix control plane api use case display error

mycloudnexus · Nov 15, 2024 · 70680e5 · 70680e5
1 parent 0a89c2d
commit 70680e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...in/java/com/consoleconnect/kraken/operator/controller/service/TemplateUpgradeService.java b/...in/java/com/consoleconnect/kraken/operator/controller/service/TemplateUpgradeService.java
@@ -23,10 +23,7 @@
 import com.consoleconnect.kraken.operator.core.event.IngestionDataResult;
 import com.consoleconnect.kraken.operator.core.exception.KrakenException;
 import com.consoleconnect.kraken.operator.core.ingestion.DataIngestionJob;
-import com.consoleconnect.kraken.operator.core.model.AssetLink;
-import com.consoleconnect.kraken.operator.core.model.Metadata;
-import com.consoleconnect.kraken.operator.core.model.SyncMetadata;
-import com.consoleconnect.kraken.operator.core.model.UnifiedAsset;
+import com.consoleconnect.kraken.operator.core.model.*;
 import com.consoleconnect.kraken.operator.core.model.facet.ComponentAPITargetFacets;
 import com.consoleconnect.kraken.operator.core.repo.UnifiedAssetRepository;
 import com.consoleconnect.kraken.operator.core.service.CompatibilityCheckService;
@@ -73,6 +70,7 @@ public class TemplateUpgradeService {
   private final TransactionService transactionService;
   private final CompatibilityCheckService compatibilityCheckService;
   private final EventSinkService eventSinkService;
+  private final AppProperty appProperty;
 
   protected String deployProduction(
       String templateUpgradeId, String stageEnvId, String productionEnvId, String userId) {
@@ -332,6 +330,7 @@ public Paging<TemplateUpgradeDeploymentVO> listTemplateDeployment(
   public List<MapperTagVO> templateDeploymentDetailsFromControlDeployment(
       UnifiedAssetDto templateDeployment) {
     Map<String, List<Tuple2>> apiUseCases = apiComponentService.findApiUseCase();
+    log.info("apiUseCases : {}", JsonToolkit.toJson(apiUseCases));
     ControlDeploymentFacet controlDeploymentFacet =
         UnifiedAsset.getFacets(templateDeployment, ControlDeploymentFacet.class);
     UpgradeTuple upgradeTuple = controlDeploymentFacet.getUpgradeTuple();
@@ -347,6 +346,7 @@ public List<MapperTagVO> templateDeploymentDetailsFromControlDeployment(
         .filter(Optional::isPresent)
         .map(Optional::get)
         .map(ApiUseCaseDto::getMapperKey)
+        .filter(t -> !appProperty.getQueryExcludeAssetKeys().contains(t))
         .distinct()
         .map(this::getMapperTagVOFromDraft)
         .toList();

diff --git a/...c/test/java/com/consoleconnect/kraken/operator/gateway/service/BuyerCheckServiceTest.java b/...c/test/java/com/consoleconnect/kraken/operator/gateway/service/BuyerCheckServiceTest.java
@@ -60,8 +60,6 @@ void givenBuyer_whenInit_thenReturnData() {
             .issuedAt(Instant.now().minusSeconds(60))
             .claim("env", "stage")
             .build();
-    ;
-
     Instant instant = jwt.getIssuedAt();
     unifiedAsset
         .getMetadata()