Refactor DB to remove restrictive query system

1 files changed, 8 insertions, 5 deletions

diff --git a/backend/internal/ibd/client.go b/backend/internal/ibd/client.go
index 25c5173..c8575e3 100644
--- a/backend/internal/ibd/client.go
+++ b/backend/internal/ibd/client.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ansg191/ibd-trader-backend/internal/database"
 	"github.com/ansg191/ibd-trader-backend/internal/ibd/transport"
+	"github.com/ansg191/ibd-trader-backend/internal/keys"
 )
 
 var ErrNoAvailableCookies = errors.New("no available cookies")
@@ -16,20 +17,22 @@ var ErrNoAvailableTransports = errors.New("no available transports")
 
 type Client struct {
 	transports []transport.Transport
-	cookies    database.CookieSource
+	db         database.Executor
+	kms        keys.KeyManagementService
 }
 
 func NewClient(
-	cookies database.CookieSource,
+	db database.Executor,
+	kms keys.KeyManagementService,
 	transports ...transport.Transport,
 ) *Client {
-	return &Client{transports, cookies}
+	return &Client{transports, db, kms}
 }
 
 func (c *Client) getCookie(ctx context.Context, subject *string) (uint, *http.Cookie, error) {
 	if subject == nil {
 		// No subject requirement, get any cookie
-		cookie, err := c.cookies.GetAnyCookie(ctx)
+		cookie, err := database.GetAnyCookie(ctx, c.db, c.kms)
 		if err != nil {
 			return 0, nil, err
 		}
@@ -41,7 +44,7 @@ func (c *Client) getCookie(ctx context.Context, subject *string) (uint, *http.Co
 	}
 
 	// Get cookie by subject
-	cookies, err := c.cookies.GetCookies(ctx, *subject, false)
+	cookies, err := database.GetCookies(ctx, c.db, c.kms, *subject, false)
 	if err != nil {
 		return 0, nil, err
 	}