wip: list accounts transformers

internal/api/controllers/accounts.go

@@ -6,26 +6,38 @@ import (
 	"github.com/google/uuid"
 	"github.com/zeiss/typhoon/internal/api/models"
 	"github.com/zeiss/typhoon/internal/api/ports"
-
-	openapi "github.com/zeiss/typhoon/pkg/apis"
 )
 
 // AccountsController is the interface that wraps the methods to access accounts.
 type AccountsController interface {
 	// CreateAccount creates a new account.
 	CreateAccount(ctx context.Context, name string, operatorID uuid.UUID) (*models.Account, error)
-	// UpdateAccount updates an account.
-	UpdateAccount(ctx context.Context, req UpdateOperatorAccountRequestObject) (*models.Account, error)
 	// DeleteToken deletes a token.
 	DeleteToken(ctx context.Context, accountID uuid.UUID) error
 	// CreateSigningKeyGroup creates a new signing key group.
 	CreateSigningKeyGroup(ctx context.Context) (*models.Account, error)
 	// ListSigningKeys of an account.
 	ListSigningKeys(ctx context.Context, accountID uuid.UUID, pagination models.Pagination[models.NKey]) (models.Pagination[models.NKey], error)
+	// ListAccounts ...
+	ListAccounts(ctx context.Context, input ListAccountsInput) (ListAccountsOutput, error)
+}
+
+// ListAccountsInput ...
+type ListAccountsInput struct {
+	SystemID uuid.UUID
+	Limit    int
+	Offset   int
+}
+
+// ListAccountsOutput ...
+type ListAccountsOutput struct {
+	Accounts []models.Account
+	Total    int
+	Offset   int
+	Limit    int
 }
 
-// CreateOperatorAccountRequestObject ...
-type UpdateOperatorAccountRequestObject = openapi.UpdateOperatorAccountRequestObject
+var _ AccountsController = (*accountsController)(nil)
 
 type accountsController struct {
 	db ports.Repositories
@@ -122,60 +134,9 @@ func (c *accountsController) CreateAccount(ctx context.Context, name string, ope
 	// return account, nil
 }
 
-// UpdateAccount ...
-func (c *accountsController) UpdateAccount(ctx context.Context, req UpdateOperatorAccountRequestObject) (*models.Account, error) {
-	return nil, nil
-	// account, err := c.db.GetAccount(ctx, req.AccountId)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// // TODO: support multiple signing keys
-	// if len(account.Operator.SigningKeys) < 1 {
-	// 	return nil, fmt.Errorf("operator %s has no signing keys", account.Operator.KeyID)
-	// }
-
-	// osk, err := nkeys.FromSeed(account.Operator.SigningKeys[0].Seed)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// ac, err := jwt.DecodeAccountClaims(account.Token.Token)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// ac.Exports = make([]*jwt.Export, 0)
-
-	// if len(*req.Body.Claims.Exports) > 0 {
-	// 	for _, e := range *req.Body.Claims.Exports {
-	// 		export := &jwt.Export{
-	// 			Name:                 utils.PtrStr(e.Name),
-	// 			Subject:              jwt.Subject(utils.PtrStr(e.Subject)),
-	// 			Type:                 jwt.ExportType(*e.Type),
-	// 			ResponseType:         jwt.ResponseType(*e.ResponseType),
-	// 			AccountTokenPosition: *e.AccountTokenPosition,
-	// 			Info: jwt.Info{
-	// 				Description: utils.PtrStr(e.Info.Description),
-	// 				InfoURL:     utils.PtrStr(e.Info.InfoUrl),
-	// 			},
-	// 		}
-
-	// 		ac.Exports.Add(export)
-	// 	}
-	// }
-
-	// token, err := ac.Encode(osk)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// account.Token.Token = token
-
-	// err = c.db.UpdateAccount(ctx, account)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// return account, nil
+// ListAccounts ...
+func (c *accountsController) ListAccounts(ctx context.Context, input ListAccountsInput) (ListAccountsOutput, error) {
+	return ListAccountsOutput{}, nil
 }
 
 // DeleteToken ...

internal/api/models/account.go

@@ -7,6 +7,9 @@ import (
 	"gorm.io/gorm"
 )
 
+// AccountPagination is the pagination for operators.
+type AccountPagination Pagination[Operator]
+
 // Account ...
 type Account struct {
 	// ID is the unique identifier for the account.

internal/api/models/cluster.go

@@ -4,12 +4,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	openapi "github.com/zeiss/typhoon/pkg/apis"
 	"gorm.io/gorm"
 )
 
-var _ ToAPI[openapi.Cluster] = (*Cluster)(nil)
-
 // Cluster ...
 type Cluster struct {
 	// ID is the unique identifier for the cluster.
@@ -29,12 +26,3 @@ type Cluster struct {
 	// DeletedAt is the time the cluster was deleted.
 	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"index"`
 }
-
-// ToAPI converts the database model to the API model.
-func (c *Cluster) ToAPI() *openapi.Cluster {
-	return &openapi.Cluster{
-		Name:        c.Name,
-		Description: &c.Description,
-		ServerURL:   c.ServerURL,
-	}
-}

internal/api/models/system.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	openapi "github.com/zeiss/typhoon/pkg/apis"
 	"gorm.io/gorm"
 )
 
@@ -55,19 +54,3 @@ type System struct {
 	// DeletedAt is the time the system was deleted.
 	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"index"`
 }
-
-// FromAPI converts the API model to the database model.
-func (s *System) FromAPI(api *openapi.System) {
-	s.Name = api.Name
-	s.Description = *api.Description
-
-	for _, cluster := range api.Clusters {
-		c := Cluster{
-			Name:        cluster.Name,
-			Description: *cluster.Description,
-			ServerURL:   cluster.ServerURL,
-		}
-
-		s.Clusters = append(s.Clusters, c)
-	}
-}

internal/api/services/accounts.go

@@ -1 +1,21 @@
 package services
+
+import (
+	"context"
+
+	"github.com/gofiber/fiber/v2"
+	openapi "github.com/zeiss/typhoon/pkg/apis"
+	"github.com/zeiss/typhoon/pkg/apis/transformers"
+)
+
+// ListAccounts ...
+func (a *ApiHandlers) ListAccounts(ctx context.Context, request openapi.ListAccountsRequestObject) (openapi.ListAccountsResponseObject, error) {
+	input := transformers.FromListAccountRequest(request)
+
+	output, err := a.accounts.ListAccounts(ctx, input)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return transformers.ToListAccountResponse(output), nil
+}

internal/api/services/api.go

@@ -1,7 +1,6 @@
 package services
 
 import (
-	"bytes"
 	"context"
 
 	"github.com/zeiss/typhoon/internal/api/controllers"
@@ -48,16 +47,6 @@ func (a *ApiHandlers) DeleteSystem(ctx context.Context, req openapi.DeleteSystem
 	return openapi.DeleteSystem204Response(openapi.DeleteSystem204Response{}), nil
 }
 
-// DeleteOperatorAccountToken ...
-func (a *ApiHandlers) DeleteOperatorAccountToken(ctx context.Context, req openapi.DeleteOperatorAccountTokenRequestObject) (openapi.DeleteOperatorAccountTokenResponseObject, error) {
-	err := a.accounts.DeleteToken(ctx, req.AccountId)
-	if err != nil {
-		return nil, err
-	}
-
-	return openapi.DeleteOperatorAccountToken204Response(openapi.DeleteOperatorAccountToken204Response{}), nil
-}
-
 // CreateOperatorSigningKeyGroup ...
 func (a *ApiHandlers) CreateOperatorSigningKeyGroup(ctx context.Context, req openapi.CreateOperatorSigningKeyGroupRequestObject) (openapi.CreateOperatorSigningKeyGroupResponseObject, error) {
 	key, err := a.operators.CreateOperatorSigningKeyGroup(ctx, req.OperatorId, req.Body.Name, utils.PtrStr(req.Body.Description))
@@ -96,58 +85,6 @@ func (a *ApiHandlers) CreateOperator(ctx context.Context, req openapi.CreateOper
 	return openapi.CreateOperator201JSONResponse(openapi.Operator{Id: &operator.ID, Name: operator.Name}), nil
 }
 
-// CreateOperatorAccount ...
-func (a *ApiHandlers) CreateOperatorAccount(ctx context.Context, req openapi.CreateOperatorAccountRequestObject) (openapi.CreateOperatorAccountResponseObject, error) {
-	account, err := a.accounts.CreateAccount(ctx, req.Body.Name, req.OperatorId)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := openapi.CreateOperatorAccount201JSONResponse(
-		openapi.Account{
-			Id:        &account.ID,
-			Name:      account.Name,
-			CreatedAt: &account.CreatedAt,
-			UpdatedAt: &account.UpdatedAt,
-			DeletedAt: &account.DeletedAt.Time,
-		},
-	)
-
-	return openapi.CreateOperatorAccount201JSONResponse(resp), nil
-}
-
-// CreateOperatorAccountUser ...
-func (a *ApiHandlers) CreateOperatorAccountUser(ctx context.Context, req openapi.CreateOperatorAccountUserRequestObject) (openapi.CreateOperatorAccountUserResponseObject, error) {
-	user, err := a.users.CreateUser(ctx, req.Body.Name, req.AccountId)
-	if err != nil {
-		return nil, err
-	}
-
-	return openapi.CreateOperatorAccountUser201JSONResponse(openapi.User{Id: &user.ID, Name: user.Name}), nil
-}
-
-// GetOperatorAccountUserCredentials ...
-func (a *ApiHandlers) GetOperatorAccountUserCredentials(ctx context.Context, req openapi.GetOperatorAccountUserCredentialsRequestObject) (openapi.GetOperatorAccountUserCredentialsResponseObject, error) {
-	credentials, err := a.users.GetCredentials(ctx, req.UserId)
-	if err != nil {
-		return nil, err
-	}
-
-	body := bytes.NewReader(credentials)
-
-	return openapi.GetOperatorAccountUserCredentials200ApplicationoctetStreamResponse(openapi.GetOperatorAccountUserCredentials200ApplicationoctetStreamResponse{Body: body, ContentLength: int64(body.Len())}), nil
-}
-
-// UpdateOperatorAccount ...
-func (a *ApiHandlers) UpdateOperatorAccount(ctx context.Context, req openapi.UpdateOperatorAccountRequestObject) (openapi.UpdateOperatorAccountResponseObject, error) {
-	account, err := a.accounts.UpdateAccount(ctx, controllers.UpdateOperatorAccountRequestObject(req))
-	if err != nil {
-		return nil, err
-	}
-
-	return openapi.UpdateOperatorAccount200JSONResponse(openapi.Account{Name: account.Name}), nil
-}
-
 // // GetOperator ...
 // func (a *ApiHandlers) GetOperator(ctx context.Context, req openapi.GetOperatorRequestObject) (openapi.GetOperatorResponseObject, error) {
 // 	operator, err := a.operators.GetOperator(ctx, req.OperatorId)

internal/api/services/systems.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"net/http"
 
 	"github.com/zeiss/typhoon/internal/api/models"
 	"github.com/zeiss/typhoon/internal/utils"
@@ -81,17 +80,3 @@ func (a *ApiHandlers) CreateSystem(ctx context.Context, req openapi.CreateSystem
 
 	return openapi.CreateSystem201JSONResponse(res), nil
 }
-
-// GetSystemOperator ...
-func (a *ApiHandlers) GetSystemOperator(ctx context.Context, req openapi.GetSystemOperatorRequestObject) (openapi.GetSystemOperatorResponseObject, error) {
-	system, err := a.systems.GetSystem(ctx, req.SystemId)
-	if err != nil {
-		return nil, err
-	}
-
-	if system.OperatorID == nil {
-		return openapi.GetSystemOperatordefaultJSONResponse(openapi.GetGroupdefaultJSONResponse{StatusCode: http.StatusNotFound, Body: openapi.ErrorNotFound("could not find an operator")}), nil
-	}
-
-	return openapi.GetSystemOperator200JSONResponse(openapi.Operator{Id: utils.PtrUUID(system.Operator.ID), Name: system.Operator.Name}), nil
-}

internal/api/services/teams.go

@@ -24,5 +24,5 @@ func (a *ApiHandlers) GetTeam(ctx context.Context, req openapi.GetTeamRequestObj
 		return openapi.GetTeamdefaultJSONResponse{}, nil
 	}
 
-	return openapi.GetTeam200JSONResponse(openapi.Team{Id: utils.UUIDPtr(team.ID), Name: team.Name, Description: team.Description, CreatedAt: utils.PtrTime(team.CreatedAt), UpdatedAt: utils.PtrTime(team.UpdatedAt), DeletedAt: utils.PtrTime(team.DeletedAt.Time)}), nil
+	return openapi.GetTeam200JSONResponse(openapi.Team{Id: utils.PtrUUID(team.ID), Name: team.Name, Description: team.Description, CreatedAt: utils.PtrTime(team.CreatedAt), UpdatedAt: utils.PtrTime(team.UpdatedAt), DeletedAt: utils.PtrTime(team.DeletedAt.Time)}), nil
 }

internal/utils/utils.go

@@ -11,6 +11,15 @@ func PtrInt(i int) *int {
 	return &i
 }
 
+// IntPtr returns a pointer to an int.
+func IntPtr(i *int) int {
+	if i == nil {
+		return 0
+	}
+
+	return *i
+}
+
 // PtrUUID returns a pointer to a UUID.
 func PtrUUID(u uuid.UUID) *uuid.UUID {
 	return &u
@@ -44,7 +53,7 @@ func TimePtr(t *time.Time) time.Time {
 	return *t
 }
 
-// PtrUUID returns a pointer to a UUID.
-func UUIDPtr(u uuid.UUID) *uuid.UUID {
-	return &u
+// UUIDPtr returns a pointer to a UUID.
+func UUIDPtr(u *uuid.UUID) uuid.UUID {
+	return *u
 }