Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions apps/api-gql/internal/delivery/gql/dataloader/data-loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ import (

"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/vikstrous/dataloadgen"
"go.uber.org/fx"

"github.com/twirapp/twir/apps/api-gql/internal/auth"
"github.com/twirapp/twir/apps/api-gql/internal/delivery/gql/gqlmodel"
channelsemotesusages "github.com/twirapp/twir/apps/api-gql/internal/services/channels_emotes_usages"
"github.com/twirapp/twir/apps/api-gql/internal/services/commands_groups"
"github.com/twirapp/twir/apps/api-gql/internal/services/commands_responses"
twitchservice "github.com/twirapp/twir/apps/api-gql/internal/services/twitch"
"github.com/twirapp/twir/libs/cache/twitch"
"github.com/vikstrous/dataloadgen"
"go.uber.org/fx"
plansrepository "github.com/twirapp/twir/libs/repositories/plans"
)

type ctxKey string
Expand All @@ -32,6 +34,7 @@ type Opts struct {
CommandsResponsesService *commands_responses.Service
TwitchService *twitchservice.Service
EmoteStatisticService *channelsemotesusages.Service
PlansRepository plansrepository.Repository
}

type dataLoader struct {
Expand All @@ -43,6 +46,7 @@ type dataLoader struct {
commandsGroupsByIdLoader *dataloadgen.Loader[uuid.UUID, *gqlmodel.CommandGroup]
commandsResponsesByIDLoader *dataloadgen.Loader[uuid.UUID, []gqlmodel.CommandResponse]
emoteStatistic *dataloadgen.Loader[EmoteRangeKey, []gqlmodel.EmoteStatisticUsage]
plansByChannelIDLoader *dataloadgen.Loader[GetPlayByChannelId, *gqlmodel.Plan]
}

type LoaderFactory struct {
Expand Down Expand Up @@ -90,6 +94,11 @@ func (c *LoaderFactory) Load() *dataLoader {
dataloadgen.WithWait(time.Millisecond),
)

loader.plansByChannelIDLoader = dataloadgen.NewLoader(
loader.getPlansByChannelIDs,
dataloadgen.WithWait(time.Millisecond),
)

return loader
}

Expand Down
77 changes: 77 additions & 0 deletions apps/api-gql/internal/delivery/gql/dataloader/plans.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package dataloader

import (
"context"

"github.com/twirapp/twir/apps/api-gql/internal/delivery/gql/gqlmodel"
"github.com/twirapp/twir/apps/api-gql/internal/delivery/gql/mappers"
)

func (c *dataLoader) getPlansByChannelIDs(ctx context.Context, inputs []GetPlayByChannelId) (
[]*gqlmodel.Plan,
[]error,
) {
uniquePlanIDsMap := make(map[string]struct{})
for _, i := range inputs {
if i.PlanID == nil || *i.PlanID == "" {
continue
}

if _, ok := uniquePlanIDsMap[*i.PlanID]; ok {
continue
}

uniquePlanIDsMap[*i.PlanID] = struct{}{}
}

uniquePlanIDsSlice := make([]string, 0, len(uniquePlanIDsMap))
for planID := range uniquePlanIDsMap {
uniquePlanIDsSlice = append(uniquePlanIDsSlice, planID)
}

plans, err := c.deps.PlansRepository.GetManyByIDs(ctx, uniquePlanIDsSlice)
if err != nil {
return nil, []error{err}
}

plansByID := make(map[string]*gqlmodel.Plan)
for _, p := range plans {
if !p.IsNil() {
plansByID[p.ID] = mappers.PlanToGql(p)
}
}

result := make([]*gqlmodel.Plan, len(inputs))
for i, ch := range inputs {
if ch.PlanID == nil || *ch.PlanID == "" {
continue
}

plan, ok := plansByID[*ch.PlanID]
if !ok {
continue
}

result[i] = plan
}

return result, nil
}

type GetPlayByChannelId struct {
ChannelID string
PlanID *string
}

func GetPlanByChannelID(ctx context.Context, input GetPlayByChannelId) (*gqlmodel.Plan, error) {
loaders := GetLoaderForRequest(ctx)
return loaders.plansByChannelIDLoader.Load(ctx, input)
}

func GetPlansByChannelIDs(ctx context.Context, inputs []GetPlayByChannelId) (
[]*gqlmodel.Plan,
error,
) {
loaders := GetLoaderForRequest(ctx)
return loaders.plansByChannelIDLoader.LoadAll(ctx, inputs)
}
25 changes: 25 additions & 0 deletions apps/api-gql/internal/delivery/gql/mappers/plan.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package mappers

import (
"github.com/twirapp/twir/apps/api-gql/internal/delivery/gql/gqlmodel"
"github.com/twirapp/twir/libs/entities/plan"
)

func PlanToGql(e plan.Plan) *gqlmodel.Plan {
return &gqlmodel.Plan{
ID: e.ID,
Name: e.Name,
MaxCommands: e.MaxCommands,
MaxTimers: e.MaxTimers,
MaxVariables: e.MaxVariables,
MaxAlerts: e.MaxAlerts,
MaxEvents: e.MaxEvents,
MaxChatAlertsMessages: e.MaxChatAlertsMessages,
MaxCustomOverlays: e.MaxCustomOverlays,
MaxEightballAnswers: e.MaxEightballAnswers,
MaxCommandsResponses: e.MaxCommandsResponses,
MaxModerationRules: e.MaxModerationRules,
MaxKeywords: e.MaxKeywords,
MaxGreetings: e.MaxGreetings,
}
}
31 changes: 6 additions & 25 deletions apps/api-gql/internal/delivery/gql/resolvers/user.resolver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/samber/lo"
model "github.com/twirapp/twir/libs/gomodels"
"github.com/twirapp/twir/apps/api-gql/internal/delivery/gql/gqlmodel"
model "github.com/twirapp/twir/libs/gomodels"
)

func (r *authenticatedUserResolver) getAvailableDashboards(
Expand All @@ -25,6 +25,7 @@ func (r *authenticatedUserResolver) getAvailableDashboards(
Flags: []gqlmodel.ChannelRolePermissionEnum{
gqlmodel.ChannelRolePermissionEnumCanAccessDashboard,
},
PlanID: channel.PlanID,
}

if channel.User != nil {
Expand All @@ -38,6 +39,7 @@ func (r *authenticatedUserResolver) getAvailableDashboards(
ID: obj.ID,
Flags: []gqlmodel.ChannelRolePermissionEnum{gqlmodel.ChannelRolePermissionEnumCanAccessDashboard},
APIKey: obj.APIKey,
PlanID: obj.PlanID,
}

var roles []model.ChannelRoleUser
Expand All @@ -56,7 +58,7 @@ func (r *authenticatedUserResolver) getAvailableDashboards(
}

for _, role := range roles {
if role.Role == nil || role.Role.Channel == nil || len(role.Role.Permissions) == 0 {
if role.Role == nil || role.Role.Channel == nil || role.Role.Channel.User == nil || len(role.Role.Permissions) == 0 {
continue
}

Expand All @@ -66,8 +68,10 @@ func (r *authenticatedUserResolver) getAvailableDashboards(
}

dashboard := gqlmodel.Dashboard{
ID: role.Role.Channel.ID,
Flags: append(dashboardsEntities[role.Role.Channel.ID].Flags, flags...),
ID: role.Role.Channel.ID,
Flags: append(dashboardsEntities[role.Role.Channel.ID].Flags, flags...),
PlanID: role.Role.Channel.PlanID,
APIKey: role.Role.Channel.User.ApiKey,
}

if role.Role.Channel.User != nil {
Expand Down
4 changes: 3 additions & 1 deletion apps/api-gql/internal/delivery/gql/schema/user.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ type AuthenticatedUser implements TwirUser {
twitchProfile: TwirUserTwitchInfo! @goField(forceResolver: true)
selectedDashboardId: String!
availableDashboards: [Dashboard!]! @goField(forceResolver: true)
planId: String
}

type Dashboard {
id: String!
flags: [ChannelRolePermissionEnum!]!
twitchProfile: TwirUserTwitchInfo! @goField(forceResolver: true)
apiKey: String!
plan: Plan! @goField(forceResolver: true)
planId: String
plan: Plan @goField(forceResolver: true)
}

type Plan {
Expand Down
Loading
Loading