Added changes in mt for count issue map

akto-api-security · Jan 7, 2025 · a24eee3 · a24eee3
1 parent 32a779d
commit a24eee3
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/apps/database-abstractor/src/main/resources/struts.xml b/apps/database-abstractor/src/main/resources/struts.xml
@@ -1036,17 +1036,6 @@
             </result>
         </action>
 
-        <action name="api/updateIssueCountInSummary" class="com.akto.action.DbAction" method="updateIssueCountInSummary">
-            <interceptor-ref name="json"/>
-            <interceptor-ref name="defaultStack" />
-            <result name="SUCCESS" type="json"/>
-            <result name="ERROR" type="json">
-                <param name="statusCode">422</param>
-                <param name="ignoreHierarchy">false</param>
-                <param name="includeProperties">^actionErrors.*</param>
-            </result>
-        </action>
-
         <action name="api/updateTestRunResultSummary" class="com.akto.action.DbAction" method="updateTestRunResultSummary">
             <interceptor-ref name="json"/>
             <interceptor-ref name="defaultStack" />

diff --git a/libs/utils/src/main/java/com/akto/data_actor/ClientActor.java b/libs/utils/src/main/java/com/akto/data_actor/ClientActor.java
@@ -2015,11 +2015,14 @@ public void insertActivity(int count) {
         }
     }
 
-    public TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues) {
+    private  TestingRunResultSummary getUpdatedSummaryAfterCount(String summaryId, Map<String, Integer> totalCountIssues, String operator){
         Map<String, List<String>> headers = buildHeaders();
         BasicDBObject obj = new BasicDBObject();
         obj.put("summaryId", summaryId);
         obj.put("totalCountIssues", totalCountIssues);
+        if(operator != null && !operator.isEmpty()){
+            obj.put("operator", operator);
+        }
         OriginalHttpRequest request = new OriginalHttpRequest(url + "/updateIssueCountInSummary", "", "POST", obj.toString(), headers, "");
         try {
             OriginalHttpResponse response = ApiExecutor.sendRequest(request, true, null, false, null);
@@ -2047,11 +2050,18 @@ public TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<S
         }
     }
 
+    public TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues, String operator) {
+        return getUpdatedSummaryAfterCount(summaryId, totalCountIssues, operator);
+    }
+
+    public TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues) {
+        return getUpdatedSummaryAfterCount(summaryId, totalCountIssues, null);
+    }
+
     public TestingRunResultSummary updateIssueCountAndStateInSummary(String summaryId, Map<String, Integer> totalCountIssues, String state) {
         Map<String, List<String>> headers = buildHeaders();
         BasicDBObject obj = new BasicDBObject();
         obj.put("summaryId", summaryId);
-        obj.put("totalCountIssues", totalCountIssues);
         obj.put("state", state);
         OriginalHttpRequest request = new OriginalHttpRequest(url + "/updateIssueCountAndStateInSummary", "", "POST", obj.toString(), headers, "");
         try {

diff --git a/libs/utils/src/main/java/com/akto/data_actor/DataActor.java b/libs/utils/src/main/java/com/akto/data_actor/DataActor.java
@@ -170,6 +170,8 @@ public abstract class DataActor {
 
     public abstract TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues);
 
+    public abstract TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues, String operator);
+
     public abstract TestingRunResultSummary updateIssueCountAndStateInSummary(String summaryId, Map<String, Integer> totalCountIssues, String state);
 
     public abstract List<TestingRunResult> fetchLatestTestingRunResultBySummaryId(String summaryId, int limit, int skip);

diff --git a/libs/utils/src/main/java/com/akto/data_actor/DbActor.java b/libs/utils/src/main/java/com/akto/data_actor/DbActor.java
@@ -423,6 +423,11 @@ public TestingRunResultSummary updateIssueCountInSummary(String summaryId,
         return DbLayer.updateIssueCountInSummary(summaryId, totalCountIssues);
     }
 
+    public TestingRunResultSummary updateIssueCountInSummary(String summaryId,
+            Map<String, Integer> totalCountIssues, String operator) {
+        return DbLayer.updateIssueCountInSummary(summaryId, totalCountIssues, operator);
+    }
+
     public TestingRunResultSummary updateIssueCountAndStateInSummary(String summaryId, Map<String, Integer> totalCountIssues, String state) {
         return DbLayer.updateIssueCountAndStateInSummary(summaryId, totalCountIssues, state);
     }

diff --git a/libs/utils/src/main/java/com/akto/data_actor/DbLayer.java b/libs/utils/src/main/java/com/akto/data_actor/DbLayer.java
@@ -673,6 +673,27 @@ public static void insertActivity(int count) {
         ActivitiesDao.instance.insertActivity("High Vulnerability detected", count + " HIGH vulnerabilites detected");
     }
 
+    public static TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues, String operator) {
+        if(operator == null || !operator.equals("increment")){
+            return updateIssueCountInSummary(summaryId,totalCountIssues);
+        }else{
+            ObjectId summaryObjectId = new ObjectId(summaryId);
+            FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
+            options.returnDocument(ReturnDocument.AFTER);
+            Bson updateIncrement = Updates.combine(
+                Updates.inc("countIssues.HIGH", totalCountIssues.getOrDefault("HIGH", 0)),
+                Updates.inc("countIssues.MEDIUM", totalCountIssues.getOrDefault("MEDIUM", 0)),
+                Updates.inc("countIssues.LOW", totalCountIssues.getOrDefault("LOW", 0))
+            );
+            return TestingRunResultSummariesDao.instance.getMCollection().findOneAndUpdate(
+                    Filters.eq(Constants.ID, summaryObjectId),
+                    Updates.combine(
+                            Updates.set(TestingRunResultSummary.END_TIMESTAMP, Context.now()),
+                            Updates.set(TestingRunResultSummary.STATE, State.COMPLETED),
+                            updateIncrement),options);
+        }
+    }
+
     public static TestingRunResultSummary updateIssueCountInSummary(String summaryId, Map<String, Integer> totalCountIssues) {
         ObjectId summaryObjectId = new ObjectId(summaryId);
         FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
@@ -694,9 +715,8 @@ public static TestingRunResultSummary updateIssueCountAndStateInSummary(String s
                 Filters.eq(Constants.ID, summaryObjectId),
                 Updates.combine(
                         Updates.set(TestingRunResultSummary.END_TIMESTAMP, Context.now()),
-                        Updates.set(TestingRunResultSummary.STATE, state),
-                        Updates.set(TestingRunResultSummary.COUNT_ISSUES, totalCountIssues)),
-                options);
+                        Updates.set(TestingRunResultSummary.STATE, state)
+                ),options);
     }
 
     public static List<Integer> fetchDeactivatedCollections() {