added back subcategory

Author: ayushaga14

apps/dashboard/src/main/resources/struts.xml

@@ -8421,7 +8421,9 @@
                 <param
                     name="includeProperties">^actionErrors.*</param>
             </result>
-            <result name="SUCCESS" type="json"> </result>
+            <result name="SUCCESS" type="json">
+                <param name="includeProperties">^categoryCounts.*</param>
+            </result>
             <result name="ERROR" type="json">
                 <param name="statusCode">422</param>
                 <param name="ignoreHierarchy">false</param>
@@ -8453,7 +8455,9 @@
                 <param
                     name="includeProperties">^actionErrors.*</param>
             </result>
-            <result name="SUCCESS" type="json"> </result>
+            <result name="SUCCESS" type="json">
+                <param name="includeProperties">^actorsCounts.*</param>
+            </result>
             <result name="ERROR" type="json">
                 <param name="statusCode">422</param>
                 <param name="ignoreHierarchy">false</param>
@@ -8485,7 +8489,9 @@
                 <param
                     name="includeProperties">^actionErrors.*</param>
             </result>
-            <result name="SUCCESS" type="json"> </result>
+            <result name="SUCCESS" type="json">
+                <param name="includeProperties">^threatActivityTimelines.*</param>
+            </result>
             <result name="ERROR" type="json">
                 <param name="statusCode">422</param>
                 <param name="ignoreHierarchy">false</param>

apps/threat-detection-backend/src/main/java/com/akto/threat/backend/service/ThreatApiService.java

@@ -141,7 +141,8 @@ public ThreatCategoryWiseCountResponse getSubCategoryWiseCount(
     // 3. Group by category and subCategory
     pipeline.add(new Document("$group",
         new Document("_id",
-            new Document("category", "$category"))
+            new Document("category", "$category")
+            .append("subCategory", "$subCategory"))
             .append("count", new Document("$sum", 1))));
 
     // 4. Sort by count descending
@@ -158,6 +159,7 @@ public ThreatCategoryWiseCountResponse getSubCategoryWiseCount(
         categoryWiseCounts.add(
             ThreatCategoryWiseCountResponse.SubCategoryCount.newBuilder()
                 .setCategory(agg.getString("category"))
+                .setSubCategory(agg.getString("subCategory"))
                 .setCount(doc.getInteger("count", 0))
                 .build());
       }