some ideas and minor fixes

Author: Jannes-Dailidow

client/mock/client.go

@@ -90,20 +90,20 @@ func WitchPre(fn func(method string, args map[string]any) error) MockOption {
 
 // --- Client implementation template ---
 
-// func (m *Client) <MethodUsername>(ctx context.Context, <Args>) <ReturnValues> {
+// func (m *Client) <MethodName>(ctx context.Context, <Args>) <ReturnValues> {
 //     if m.Pre != nil {
-//         err := m.Pre("<MethodUsername>", map[string]any{"<ArgUsername>": <ArgValue>, ...})
+//         err := m.Pre("<MethodName>", map[string]any{"<ArgUsername>": <ArgValue>, ...})
 //         if err != nil {
 //             return <ReturnValue?>, err
 //         }
 //     }
-//     if m.Overwrites.<MethodUsername> != nil {
-//         return m.Overwrites.<MethodUsername>(ctx, <Args>)
+//     if m.Overwrites.<MethodName> != nil {
+//         return m.Overwrites.<MethodName>(ctx, <Args>)
 //     }
 //     else if m.BaseClient != nil {
-//         return m.BaseClient.<MethodUsername>(ctx, <Args>)
+//         return m.BaseClient.<MethodName>(ctx, <Args>)
 //     }
-//     panic("Client.<MethodUsername> not implemented")
+//     panic("Client.<MethodName> not implemented")
 // }
 
 // --- Lifecycle & Initialization ---

tags/expr.go

@@ -138,12 +138,12 @@ func (e ValueExpr) hash() string {
 func (e AndExpr) hash() string {
 	hashes := slicest.Map(e.Exprs, func(e Expr) string { return e.hash() })
 	slices.Sort(hashes)
-	return string(exprAnd) + strings.Join(hashes, string(exprHashDelimiter))
+	return string(exprAnd) + string(exprBracesOpen) + strings.Join(hashes, string(exprHashDelimiter)) + string(exprBracesClose)
 }
 func (e OrExpr) hash() string {
 	hashes := slicest.Map(e.Exprs, func(e Expr) string { return e.hash() })
 	slices.Sort(hashes)
-	return string(exprOr) + strings.Join(hashes, string(exprHashDelimiter))
+	return string(exprOr) + string(exprBracesOpen) + strings.Join(hashes, string(exprHashDelimiter)) + string(exprBracesClose)
 }
 func (e NotExpr) hash() string {
 	return exprNot + string(exprBracesOpen) + e.Expr.hash() + string(exprBracesClose)

tags/multi_table_tags_bun.md

@@ -0,0 +1,61 @@
+# Tag Matcher
+"(user1 | user2) & !hagebau"
+
+# Tabellen
+public_keys:
+- id
+- key
+
+tags_to_pk:
+- pk_id
+- tag_id
+
+tags
+- id
+- name
+
+# SQL Request
+```sql
+SELECT DISTINCT pk.*
+FROM public_keys AS pk
+JOIN tags_to_pk AS ttpk ON ttpk.pk_id = pk.id
+JOIN tags AS t ON t.id = ttpk.tag_id
+WHERE pk.id IN (
+    SELECT ttpk1.pk_id
+    FROM tags_to_pk AS ttpk1
+    JOIN tags AS t1 ON t1.id = ttpk1.tag_id
+    WHERE t1.name IN ('user1', 'user2')
+)
+AND pk.id NOT IN (
+    SELECT ttpk2.pk_id
+    FROM tags_to_pk AS ttpk2
+    JOIN tags AS t2 ON t2.id = ttpk2.tag_id
+    WHERE t2.name = 'hagebau'
+);
+```
+
+# Bun implementation
+```go
+var publicKeys []PublicKey
+
+subInclude := db.NewSelect().
+	Model((*TagsToPk)(nil)).
+	Column("pk_id").
+	Join("JOIN tags AS t1 ON t1.id = tags_to_pk.tag_id").
+	Where("t1.name IN (?)", bun.In([]string{"user1", "user2"}))
+
+subExclude := db.NewSelect().
+	Model((*TagsToPk)(nil)).
+	Column("pk_id").
+	Join("JOIN tags AS t2 ON t2.id = tags_to_pk.tag_id").
+	Where("t2.name = ?", "hagebau")
+
+err := db.NewSelect().
+	Model(&publicKeys).
+	Distinct().
+	Join("JOIN tags_to_pk AS ttpk ON ttpk.pk_id = public_key.id").
+	Join("JOIN tags AS t ON t.id = ttpk.tag_id").
+	Where("public_key.id IN (?)", subInclude).
+	Where("public_key.id NOT IN (?)", subExclude).
+	Scan(ctx)
+```