Share types between API

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>

pkg/server/api/console/v1/types/cursorkey.go

@@ -15,12 +15,8 @@
 package types
 
 import (
-	"errors"
-	"io"
-	"strconv"
-
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/getprobo/probo/pkg/page"
+	sharedTypes "github.com/getprobo/probo/pkg/server/api/types"
 )
 
 func NewCursor[O page.OrderField](
@@ -49,22 +45,5 @@ func NewCursor[O page.OrderField](
 	return page.NewCursor(size, from, direction, orderBy)
 }
 
-func MarshalCursorKeyScalar(ck page.CursorKey) graphql.Marshaler {
-	return graphql.WriterFunc(func(w io.Writer) {
-		_, _ = w.Write([]byte(strconv.Quote(ck.String())))
-	})
-}
-
-func UnmarshalCursorKeyScalar(v interface{}) (page.CursorKey, error) {
-	s, ok := v.(string)
-	if !ok {
-		return page.CursorKeyNil, errors.New("must be a string")
-	}
-
-	ck, err := page.ParseCursorKey(s)
-	if err != nil {
-		return page.CursorKeyNil, err
-	}
-
-	return ck, nil
-}
+var MarshalCursorKeyScalar = sharedTypes.MarshalCursorKeyScalar
+var UnmarshalCursorKeyScalar = sharedTypes.UnmarshalCursorKeyScalar

pkg/server/api/console/v1/types/gid.go

@@ -15,30 +15,8 @@
 package types
 
 import (
-	"errors"
-	"io"
-	"strconv"
-
-	"github.com/99designs/gqlgen/graphql"
-	"github.com/getprobo/probo/pkg/gid"
+	sharedTypes "github.com/getprobo/probo/pkg/server/api/types"
 )
 
-func MarshalGIDScalar(id gid.GID) graphql.Marshaler {
-	return graphql.WriterFunc(func(w io.Writer) {
-		w.Write([]byte(strconv.Quote(id.String())))
-	})
-}
-
-func UnmarshalGIDScalar(v interface{}) (gid.GID, error) {
-	s, ok := v.(string)
-	if !ok {
-		return gid.Nil, errors.New("must be a string")
-	}
-
-	id, err := gid.ParseGID(s)
-	if err != nil {
-		return gid.Nil, err
-	}
-
-	return id, nil
-}
+var MarshalGIDScalar = sharedTypes.MarshalGIDScalar
+var UnmarshalGIDScalar = sharedTypes.UnmarshalGIDScalar

pkg/server/api/console/v1/types/pageinfo.go

@@ -15,25 +15,16 @@
 package types
 
 import (
-	"go.gearno.de/x/ref"
 	"github.com/getprobo/probo/pkg/page"
+	sharedTypes "github.com/getprobo/probo/pkg/server/api/types"
 )
 
 func NewPageInfo[T page.Paginable[O], O page.OrderField](p *page.Page[T, O]) *PageInfo {
-	var (
-		startCursor *page.CursorKey
-		endCursor   *page.CursorKey
-	)
-
-	if len(p.Data) > 0 {
-		startCursor = ref.Ref(p.First().CursorKey(p.Cursor.OrderBy.Field))
-		endCursor = ref.Ref(p.Last().CursorKey(p.Cursor.OrderBy.Field))
-	}
-
+	data := sharedTypes.NewPageInfoData(p)
 	return &PageInfo{
-		HasNextPage:     p.Info.HasNext,
-		HasPreviousPage: p.Info.HasPrev,
-		StartCursor:     startCursor,
-		EndCursor:       endCursor,
+		HasNextPage:     data.HasNextPage,
+		HasPreviousPage: data.HasPreviousPage,
+		StartCursor:     data.StartCursor,
+		EndCursor:       data.EndCursor,
 	}
 }