feat: support collate requests

Author: Teajey

go/client/sock/client.go

@@ -47,6 +47,16 @@ type QueryListRequest struct {
 	Intersect bool           `msgpack:"intersect,omitempty"`
 }
 
+type GetCollateRequest struct {
+	Key string `msgpack:"key,omitempty"`
+}
+
+type QueryCollateRequest struct {
+	Query     map[string]any `msgpack:"query"`
+	Key       string         `msgpack:"key,omitempty"`
+	Intersect bool           `msgpack:"intersect,omitempty"`
+}
+
 type singleResponse struct {
 	File         any    `msgpack:"file"`
 	PrevFileName string `msgpack:"prev_file_name"`
@@ -151,6 +161,44 @@ func (c *Client) runSingleRequest(singleReq any, tag string) (*singleResponse, e
 	}
 }
 
+func (c *Client) runCollateRequest(collateReq any, tag string) ([]string, error) {
+	conn, err := net.Dial("unix", c.socketPath)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to dial: %w", err)
+	}
+	defer conn.Close()
+
+	req := taggedRequest{
+		Tag:   tag,
+		Value: collateReq,
+	}
+
+	enc := msgpack.NewEncoder(conn)
+	if err := enc.Encode(req); err != nil {
+		return nil, fmt.Errorf("Failed to encode request: %w", err)
+	}
+
+	var resp *taggedResponse
+	dec := msgpack.NewDecoder(conn)
+	if err := dec.Decode(&resp); err != nil {
+		return nil, fmt.Errorf("Failed to decode response: %w", err)
+	}
+
+	switch resp.Tag {
+	case "Ok":
+		var collateResp []string
+		err := msgpack.Unmarshal(resp.Value, &collateResp)
+		if err != nil {
+			return nil, fmt.Errorf("Could not unmarshal response value: %w", err)
+		}
+		return collateResp, nil
+	case "InternalServerError":
+		return nil, fmt.Errorf("Custard had internal server error")
+	default:
+		return nil, fmt.Errorf("Unrecognised tag from server: %s", resp.Tag)
+	}
+}
+
 func (c *Client) GetSingle(req GetSingleRequest) (*singleResponse, error) {
 	return c.runSingleRequest(req, "SingleGet")
 }
@@ -166,3 +214,11 @@ func (c *Client) GetList(req GetListRequest) ([]listResponse, error) {
 func (c *Client) QueryList(req QueryListRequest) ([]listResponse, error) {
 	return c.runListRequest(req, "ListQuery")
 }
+
+func (c *Client) GetCollate(req GetCollateRequest) ([]string, error) {
+	return c.runCollateRequest(req, "CollateGet")
+}
+
+func (c *Client) QueryCollate(req QueryCollateRequest) ([]string, error) {
+	return c.runCollateRequest(req, "CollateQuery")
+}

go/client/sock/test/client_test.go

@@ -1,6 +1,7 @@
 package sock_test
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/Teajey/custard/go/client/sock"
@@ -87,3 +88,32 @@ func TestQueryList(t *testing.T) {
 		t.Fatalf("Unexpected response length: %d", respLen)
 	}
 }
+
+func TestGetCollate(t *testing.T) {
+	client := sock.NewClient("/tmp/custard")
+	resp, err := client.GetCollate(sock.GetCollateRequest{
+		Key: "tags",
+	})
+	if err != nil {
+		t.Fatalf("Request failed: %s", err)
+	}
+	expected := []string{"code", "music", "ramble", "sketch", "travel"}
+	if !slices.Equal(expected, resp) {
+		t.Fatalf("Expected %v but got %v", expected, resp)
+	}
+}
+
+func TestQueryCollate(t *testing.T) {
+	client := sock.NewClient("/tmp/custard")
+	resp, err := client.QueryCollate(sock.QueryCollateRequest{
+		Key:   "tags",
+		Query: map[string]any{"tags": []string{"code"}},
+	})
+	if err != nil {
+		t.Fatalf("Request failed: %s", err)
+	}
+	expected := []string{"code", "sketch"}
+	if !slices.Equal(expected, resp) {
+		t.Fatalf("Expected %v but got %v", expected, resp)
+	}
+}