EBL-423:fix edit blocker functionally no to reset the json configurat…

…ion of the blocker (#489) * EBL-423: fix edit of Single Region Blocker
logzio · Feb 15, 2021 · 70247cb · 70247cb
1 parent 4825c2c
commit 70247cb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java b/apollo-backend/src/main/java/io/logz/apollo/controllers/BlockerDefinitionController.java
@@ -188,9 +188,15 @@ public void updateBlockerDefinition(int id, String name, Integer environmentId,
         blockerDefinition.setStackId(stackId);
         blockerDefinition.setAvailability(availability);
         blockerDefinition.setBlockerTypeName(blockerTypeName);
-        blockerDefinition.setBlockerJsonConfiguration(blockerJsonConfiguration);
         blockerDefinition.setActive(isActive);
 
+        if (blockerTypeName.equals(BlockerTypeName.SINGLE_REGION)) {
+            blockerJsonConfiguration = initSingleRegionBlockerJsonConfig(environmentId, serviceId, stackId, availability, blockerJsonConfiguration, req);
+            if (blockerJsonConfiguration == null) return;
+        }
+
+        blockerDefinition.setBlockerJsonConfiguration(blockerJsonConfiguration);
+
         blockerDefinitionDao.updateBlockerDefinition(blockerDefinition);
         logger.info(String.format("Updated blocker: blockerId - %s, blockerName - %s, active - %s", blockerDefinition.getId(), blockerDefinition.getName(), blockerDefinition.getActive()));
         assignJsonResponseToReq(req, HttpStatus.OK, blockerDefinition);