wip rework

gw2auth · Dec 8, 2023 · ccab53b · ccab53b
1 parent 5cc4e98
commit ccab53b
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/web/dev_application.go b/web/dev_application.go
@@ -246,8 +246,8 @@ func translateQuery(paramNum int, query cloudscapeQuery) (string, []any, error)
 		">=": ">=",
 		"<":  "<",
 		"<=": "<=",
-		":":  "=",  // special case for authorized_scopes
-		"!:": "!=", // special case for authorized_scopes
+		":":  "=",
+		"!:": "!=",
 	}
 
 	builder := util.NewSQLBuilder(paramNum)
@@ -264,13 +264,6 @@ func translateQuery(paramNum int, query cloudscapeQuery) (string, []any, error)
 		}
 
 		if tk.PropertyKey == "authorized_scopes" {
-			prefix := ""
-			suffix := ""
-			if strings.HasPrefix(tk.Operator, "!") {
-				prefix = "NOT ("
-				suffix = ")"
-			}
-
 			var values []any
 			if tk.Value == "" {
 				values = []any{}
@@ -283,25 +276,18 @@ func translateQuery(paramNum int, query cloudscapeQuery) (string, []any, error)
 
 			if tk.Operator == ":" || tk.Operator == "!:" {
 				builder.AddSlice(values, func(nums []int) string {
-					return fmt.Sprintf("%s%s = ANY ARRAY[ %s ]%s", prefix, prop, strings.Join(util.SQLParams(nums), ","), suffix)
+					return fmt.Sprintf("%s %s ANY ARRAY[ %s ]", prop, op, strings.Join(util.SQLParams(nums), ","))
 				})
-				/*
-					builder.Add(values, func(i int) string {
-						return fmt.Sprintf("%s%s = ANY(%s)%s", prefix, prop, util.SQLParam(i), suffix)
-					})
-				*/
 			} else {
 				builder.AddSlice(values, func(nums []int) string {
-					return fmt.Sprintf("%s%s = ARRAY[ %s ]%s", prefix, prop, strings.Join(util.SQLParams(nums), ","), suffix)
+					return fmt.Sprintf("%s %s ARRAY[ %s ]", prop, op, strings.Join(util.SQLParams(nums), ","))
 				})
 			}
 		} else {
 			builder.Add(tk.Value, func(i int) string {
 				return fmt.Sprintf("%s %s %s", prop, op, util.SQLParam(i))
 			})
 		}
-
-		paramNum++
 	}
 
 	operation, ok := operationToSQL[query.Operation]