removed redundant index for customerGUID and added tests for uiStatus…

….processingStatis Signed-off-by: radoslawd <[email protected]>
armosec · Aug 2, 2023 · 67d99d2 · 67d99d2
1 parent 78d9c56
commit 67d99d2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/db/mongo/index.go b/db/mongo/index.go
@@ -78,12 +78,6 @@ var collectionIndexes = map[string][]mongo.IndexModel{
 			},
 			Options: options.Index().SetBackground(true),
 		},
-		{
-			Keys: bson.D{
-				{Key: "customerGUID", Value: 1},
-			},
-			Options: options.Index().SetBackground(true),
-		},
 		{
 			Keys: bson.D{
 				{Key: "latestReportGUID", Value: 1},
@@ -92,7 +86,7 @@ var collectionIndexes = map[string][]mongo.IndexModel{
 		},
 		{
 			Keys: bson.D{
-				{Key: "uiStatus.processing", Value: 1},
+				{Key: "uiStatus.processingStatus", Value: 1},
 			},
 			Options: options.Index().SetBackground(true),
 		},

diff --git a/routes/v1/attack_chains/routes.go b/routes/v1/attack_chains/routes.go
@@ -17,6 +17,5 @@ func AddRoutes(g *gin.Engine) {
 		WithValidatePostUniqueName(false).
 		WithValidatePostMandatoryName(true).
 		WithPostValidators(validateAttackChainId).
-		WithUniqueShortName(handlers.NameValueGetter[*types.AttackChain]).
 		Get()...)
 }
diff --git a/service_test.go b/service_test.go
@@ -1104,6 +1104,31 @@ func (suite *MainTestSuite) TestAttackChainsConfigs() {
 				},
 			},
 		},
+		//field or match
+		{
+			testName:        "uiStatus.processingStatus = processing query match test",
+			expectedIndexes: []int{2},
+			listRequest: armotypes.V2ListRequest{
+				OrderBy: "name:asc",
+				InnerFilters: []map[string]string{
+					{
+						"uiStatus.processingStatus": "processing",
+					},
+				},
+			},
+		},
+		{
+			testName:        "uiStatus.processingStatus = done query match test",
+			expectedIndexes: []int{0, 1},
+			listRequest: armotypes.V2ListRequest{
+				OrderBy: "name:asc",
+				InnerFilters: []map[string]string{
+					{
+						"uiStatus.processingStatus": "done",
+					},
+				},
+			},
+		},
 	}
 
 	testPostV2ListRequest(suite, consts.AttackChainsPath, attackChainConfigs, projectedDocs, searchQueries, commonCmpFilter, ignoreTime)

diff --git a/test_data/attack-chain-configs.json b/test_data/attack-chain-configs.json
@@ -41,7 +41,7 @@
         "uiStatus": {
             "firstSeen": "2022-04-28T14:59:44.147901",
             "wasViewedMainScreen": "2022-04-28T14:59:44.147901",
-            "processingStatus": "done"
+            "processingStatus": "processing"
         }
     }
 ]