fix must_not

SENERGY-Platform · Feb 16, 2024 · d241a14 · d241a14
1 parent 01edc6a
commit d241a14
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 4 deletions.
diff --git a/lib/apiv3_test.go b/lib/apiv3_test.go
@@ -1269,6 +1269,86 @@ func TestApiV3(t *testing.T) {
 
 	t.Run("get rights of unknown with admin", testRequestWithToken(config, admintoken, "GET", "/v3/administrate/rights/aspects/unknown", nil, 404, nil))
 
+	t.Run("filter creator by jwt ref", testRequestWithToken(config, admintoken, "POST", "/v3/query/aspects", model.QueryMessage{
+		Resource: "aspects",
+		Find: &model.QueryFind{
+			QueryListCommons: model.QueryListCommons{
+				Rights:   "r",
+				SortDesc: true,
+			},
+			Search: "",
+			Filter: &model.Selection{
+				Condition: model.ConditionConfig{
+					Feature:   "creator",
+					Operation: "!=",
+					Ref:       "jwt.user",
+				},
+			},
+		},
+	}, 200, nil))
+
+	t.Run("filter creator by jwt ref client", func(t *testing.T) {
+		result, code, err := client.Query[[]any](c, admintoken, model.QueryMessage{
+			Resource: "aspects",
+			Find: &model.QueryFind{
+				QueryListCommons: model.QueryListCommons{
+					Rights:   "r",
+					SortDesc: true,
+				},
+				Search: "",
+				Filter: &model.Selection{
+					Condition: model.ConditionConfig{
+						Feature:   "creator",
+						Operation: "!=",
+						Ref:       "jwt.user",
+					},
+				},
+			},
+		})
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		if code != 200 {
+			t.Error(code)
+			return
+		}
+		if len(result) == 0 {
+			t.Error(result)
+			return
+		}
+
+		result, code, err = client.Query[[]any](c, testtoken, model.QueryMessage{
+			Resource: "aspects",
+			Find: &model.QueryFind{
+				QueryListCommons: model.QueryListCommons{
+					Rights:   "r",
+					SortDesc: true,
+				},
+				Search: "",
+				Filter: &model.Selection{
+					Condition: model.ConditionConfig{
+						Feature:   "creator",
+						Operation: "!=",
+						Ref:       "jwt.user",
+					},
+				},
+			},
+		})
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		if code != 200 {
+			t.Error(code)
+			return
+		}
+		if len(result) != 0 {
+			t.Error(result)
+			return
+		}
+	})
+
 }
 
 func jsonNormaliseMap(in []map[string]interface{}) (out []map[string]interface{}) {

diff --git a/lib/query/selection.go b/lib/query/selection.go
@@ -116,10 +116,12 @@ func (this *Query) GetConditionFilter(token auth.Token, condition model.Conditio
 			}, nil
 		} else {
 			return map[string]interface{}{
-				"must_not": []map[string]interface{}{
-					{
-						"term": map[string]interface{}{
-							condition.Feature: val,
+				"bool": map[string]interface{}{
+					"must_not": []map[string]interface{}{
+						{
+							"term": map[string]interface{}{
+								condition.Feature: val,
+							},
 						},
 					},
 				},