sorting

twirapp · Dec 19, 2024 · a57abb7 · a57abb7
1 parent 559f905
commit a57abb7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/apps/api-gql/internal/entity/role.go b/apps/api-gql/internal/entity/role.go
@@ -31,6 +31,14 @@ const (
 	ChannelRoleTypeCustom      ChannelRoleEnum = "CUSTOM"
 )
 
+var AllChannelRoleTypeEnum = []ChannelRoleEnum{
+	ChannelRoleTypeBroadcaster,
+	ChannelRoleTypeModerator,
+	ChannelRoleTypeSubscriber,
+	ChannelRoleTypeVip,
+	ChannelRoleTypeCustom,
+}
+
 type ChannelRoleUser struct {
 	ID     uuid.UUID
 	UserID string

diff --git a/apps/api-gql/internal/services/roles/roles.go b/apps/api-gql/internal/services/roles/roles.go
@@ -3,6 +3,7 @@ package roles
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/google/uuid"
 	"github.com/samber/lo"
@@ -82,14 +83,14 @@ func (c *Service) GetManyByChannelID(ctx context.Context, channelID string) (
 		entities = append(entities, c.modelToEntity(dbRole))
 	}
 
-	// slices.SortFunc(
-	// 	entities,
-	// 	func(a, b entity.ChannelRole) int {
-	// 		typeIdx := lo.IndexOf(gqlmodel.AllRoleTypeEnum, a.Type)
-	//
-	// 		return typeIdx - lo.IndexOf(gqlmodel.AllRoleTypeEnum, b.Type)
-	// 	},
-	// )
+	slices.SortFunc(
+		entities,
+		func(a, b entity.ChannelRole) int {
+			typeIdx := lo.IndexOf(entity.AllChannelRoleTypeEnum, a.Type)
+
+			return typeIdx - lo.IndexOf(entity.AllChannelRoleTypeEnum, b.Type)
+		},
+	)
 
 	return entities, nil
 }