feat: Users API, ownership transfer and removal of the legacy role string

internal/infrastructure/useCases/ListUsersAndInvites.go

@@ -2,6 +2,7 @@ package useCases
 
 import (
 	"RenewCMS/internal/domain/invite"
+	"RenewCMS/internal/domain/role"
 	"RenewCMS/internal/domain/user"
 	"sort"
 	"time"
@@ -15,6 +16,7 @@ const (
 type ListUsersAndInvitesUseCase struct {
 	userRepository   user.Repository
 	inviteRepository invite.Repository
+	roles            role.Repository
 }
 
 type DirectoryEntry struct {
@@ -23,30 +25,38 @@ type DirectoryEntry struct {
 	Username    string
 	DisplayName string
 	Email       string
-	Role        string
+	Role        *RoleRef
 	Status      string
 	CreatedAt   time.Time
 }
 
-func NewListUsersAndInvitesUseCase(userRepository user.Repository, inviteRepository invite.Repository) *ListUsersAndInvitesUseCase {
-	return &ListUsersAndInvitesUseCase{userRepository, inviteRepository}
+func NewListUsersAndInvitesUseCase(userRepository user.Repository, inviteRepository invite.Repository, roles role.Repository) *ListUsersAndInvitesUseCase {
+	return &ListUsersAndInvitesUseCase{userRepository, inviteRepository, roles}
 }
 
-func (g *ListUsersAndInvitesUseCase) ListUsersAndInvites() []DirectoryEntry {
+func userEntry(account user.User, found *RoleRef) DirectoryEntry {
+	return DirectoryEntry{
+		ID:          account.ID,
+		Kind:        EntryKindUser,
+		Username:    account.Username,
+		DisplayName: account.DisplayName,
+		Email:       account.Email,
+		Role:        found,
+		Status:      string(invite.StatusAccepted),
+		CreatedAt:   account.CreatedAt,
+	}
+}
+
+func (g *ListUsersAndInvitesUseCase) ListUsersAndInvites() ([]DirectoryEntry, error) {
+	refs, err := roleRefsByID(g.roles)
+	if err != nil {
+		return nil, err
+	}
 	now := time.Now()
 	entries := []DirectoryEntry{}
 
 	for _, existingUser := range g.userRepository.GetAll() {
-		entries = append(entries, DirectoryEntry{
-			ID:          existingUser.ID,
-			Kind:        EntryKindUser,
-			Username:    existingUser.Username,
-			DisplayName: existingUser.DisplayName,
-			Email:       existingUser.Email,
-			Role:        string(existingUser.Role),
-			Status:      string(invite.StatusAccepted),
-			CreatedAt:   existingUser.CreatedAt,
-		})
+		entries = append(entries, userEntry(existingUser, lookupRoleRef(refs, existingUser.RoleID)))
 	}
 
 	for _, existingInvite := range g.inviteRepository.GetAll() {
@@ -58,6 +68,7 @@ func (g *ListUsersAndInvitesUseCase) ListUsersAndInvites() []DirectoryEntry {
 			ID:        existingInvite.ID,
 			Kind:      EntryKindInvite,
 			Email:     existingInvite.Email,
+			Role:      lookupRoleRef(refs, existingInvite.RoleID),
 			Status:    string(status),
 			CreatedAt: existingInvite.CreatedAt,
 		})
@@ -67,5 +78,5 @@ func (g *ListUsersAndInvitesUseCase) ListUsersAndInvites() []DirectoryEntry {
 		return entries[i].CreatedAt.After(entries[j].CreatedAt)
 	})
 
-	return entries
+	return entries, nil
 }