Added character service and such.

graph2/types/log.go

@@ -3,13 +3,16 @@ package types
 import (
 	"context"
 	"errors"
+	"git.aiterp.net/rpdata/api/services"
 
 	"git.aiterp.net/rpdata/api/internal/loader"
 	"git.aiterp.net/rpdata/api/models"
 	"git.aiterp.net/rpdata/api/models/posts"
 )
 
-type logResolver struct{}
+type logResolver struct {
+	characters *services.CharacterService
+}
 
 func (r *logResolver) Channel(ctx context.Context, log *models.Log) (*models.Channel, error) {
 	loader := loader.FromContext(ctx)
@@ -21,22 +24,13 @@ func (r *logResolver) Channel(ctx context.Context, log *models.Log) (*models.Cha
 }
 
 func (r *logResolver) Characters(ctx context.Context, log *models.Log) ([]*models.Character, error) {
-	loader := loader.FromContext(ctx)
-	if loader == nil {
-		return nil, errors.New("no loader")
+	if len(log.CharacterIDs) == 0 {
+		return []*models.Character{}, nil
 	}
 
-	characters, err := loader.Characters("id", log.CharacterIDs...)
-	if err != nil {
-		return nil, err
-	}
-
-	characters2 := make([]*models.Character, len(characters))
-	for i := range characters {
-		characters2[i] = &characters[i]
-	}
-
-	return characters2, nil
+	return r.characters.List(ctx, models.CharacterFilter{
+		IDs: log.CharacterIDs,
+	})
 }
 
 func (r *logResolver) Posts(ctx context.Context, log *models.Log, kinds []string) ([]*models.Post, error) {
@@ -54,4 +48,6 @@ func (r *logResolver) Posts(ctx context.Context, log *models.Log, kinds []string
 }
 
 // LogResolver is a resolver
-var LogResolver logResolver
+func LogResolver(s *services.Bundle) *logResolver {
+	return &logResolver{characters: s.Characters}
+}