Logs and posts are now on the new architecture.

graph2/complexity.go

@@ -5,8 +5,6 @@ import (
 	"git.aiterp.net/rpdata/api/models"
 	"git.aiterp.net/rpdata/api/models/channels"
 	"git.aiterp.net/rpdata/api/models/files"
-	"git.aiterp.net/rpdata/api/models/logs"
-	"git.aiterp.net/rpdata/api/models/posts"
 	"git.aiterp.net/rpdata/api/models/stories"
 )
 
@@ -33,7 +31,7 @@ func complexity() (cr graphcore.ComplexityRoot) {
 	cr.Query.Post = func(childComplexity int, id string) int {
 		return childComplexity + findComplexity
 	}
-	cr.Query.Posts = func(childComplexity int, filter *posts.Filter) int {
+	cr.Query.Posts = func(childComplexity int, filter *models.PostFilter) int {
 		return childComplexity + listComplexity
 	}
 	cr.Query.UnknownNicks = func(childComplexity int, filter *graphcore.UnknownNicksFilter) int {
@@ -42,7 +40,7 @@ func complexity() (cr graphcore.ComplexityRoot) {
 	cr.Query.Log = func(childComplexity int, id string) int {
 		return childComplexity + findComplexity
 	}
-	cr.Query.Logs = func(childComplexity int, filter *logs.Filter) int {
+	cr.Query.Logs = func(childComplexity int, filter *models.LogFilter) int {
 		if filter != nil && filter.Open != nil && *filter.Open == true {
 			return childComplexity + findComplexity
 		}

graph2/gqlgen.yml

@@ -30,11 +30,11 @@ models:
   Post:
     model: git.aiterp.net/rpdata/api/models.Post
   PostsFilter:
-    model: git.aiterp.net/rpdata/api/models/posts.Filter
+    model: git.aiterp.net/rpdata/api/models.PostFilter
   Log:
     model: git.aiterp.net/rpdata/api/models.Log
   LogsFilter:
-    model: git.aiterp.net/rpdata/api/models/logs.Filter
+    model: git.aiterp.net/rpdata/api/models.LogFilter
   LogImporter:
     model: git.aiterp.net/rpdata/api/models.LogImporter
   Comment:

graph2/resolvers/log.go

@@ -3,74 +3,25 @@ package resolvers
 import (
 	"context"
 	"errors"
-	"strings"
 	"time"
 
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
-	"git.aiterp.net/rpdata/api/internal/auth"
-	"git.aiterp.net/rpdata/api/internal/loader"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/changekeys"
-	"git.aiterp.net/rpdata/api/models/changes"
-	"git.aiterp.net/rpdata/api/models/channels"
-	"git.aiterp.net/rpdata/api/models/logs"
-	"github.com/99designs/gqlgen/graphql"
 )
 
 // Queries
 
 func (r *queryResolver) Log(ctx context.Context, id string) (*models.Log, error) {
-	log, err := logs.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &log, nil
+	return r.s.Logs.Find(ctx, id)
 }
 
-func (r *queryResolver) Logs(ctx context.Context, filter *logs.Filter) ([]*models.Log, error) {
-	logs, err := logs.List(filter)
-	if err != nil {
-		return nil, err
-	}
-
-	reqCtx := graphql.GetRequestContext(ctx)
-	maybeCharacters := strings.Contains(reqCtx.RawQuery, "characters")
-	maybeChannels := strings.Contains(reqCtx.RawQuery, "channels")
-
-	if len(logs) >= 100 && (maybeCharacters || maybeChannels) {
-		loader := loader.FromContext(ctx)
-		if loader == nil {
-			return nil, errors.New("no loader")
-		}
-
-		for _, log := range logs {
-			if maybeChannels {
-				loader.PrimeChannels("name", log.ChannelName)
-			}
-
-			if maybeCharacters {
-				loader.PrimeCharacters("id", log.CharacterIDs...)
-			}
-		}
-	}
-
-	logs2 := make([]*models.Log, len(logs))
-	for i := range logs {
-		logs2[i] = &logs[i]
-	}
-
-	return logs2, nil
+func (r *queryResolver) Logs(ctx context.Context, filter *models.LogFilter) ([]*models.Log, error) {
+	return r.s.Logs.List(ctx, filter)
 }
 
 // Mutations
 
 func (r *mutationResolver) AddLog(ctx context.Context, input graphcore.LogAddInput) (*models.Log, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("log.add") {
-		return nil, errors.New("You are not permitted to add logs")
-	}
-
 	open := input.Open != nil && *input.Open == true
 	title := ""
 	if input.Title != nil {
@@ -85,33 +36,10 @@ func (r *mutationResolver) AddLog(ctx context.Context, input graphcore.LogAddInp
 		description = *input.Description
 	}
 
-	existingChannel, _ := channels.FindName(input.Channel)
-
-	log, err := logs.Add(input.Date, input.Channel, title, event, description, open)
-	if !token.Authenticated() || !token.Permitted("log.add") {
-		return nil, errors.New("Failed to create log: " + err.Error())
-	}
-
-	go func() {
-		if existingChannel.Name == "" {
-			channel, err := channels.FindName(input.Channel)
-			if err == nil {
-				changes.Submit("Channel", "add", token.UserID, true, changekeys.Listed(channel), channel)
-			}
-		}
-
-		changes.Submit("Log", "add", token.UserID, true, changekeys.Listed(log), log)
-	}()
-
-	return &log, nil
+	return r.s.Logs.Create(ctx, title, description, input.Channel, event, open)
 }
 
 func (r *mutationResolver) ImportLog(ctx context.Context, input graphcore.LogImportInput) ([]*models.Log, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("log.add") {
-		return nil, errors.New("You are not permitted to add logs")
-	}
-
 	date := time.Time{}
 	if input.Date != nil {
 		date = *input.Date
@@ -127,67 +55,20 @@ func (r *mutationResolver) ImportLog(ctx context.Context, input graphcore.LogImp
 		tz = parsedTZ
 	}
 
-	results, err := logs.Import(input.Importer, date, tz, input.ChannelName, input.Data)
-	if err != nil {
-		return nil, err
-	}
-
-	newLogs := make([]*models.Log, 0, len(results))
-	for _, result := range results {
-		go func(result logs.ImportedLog) {
-			changes.Submit("Log", "add", token.UserID, true, changekeys.Many(result.Log), result.Log)
-			changes.Submit("Post", "add", token.UserID, true, changekeys.Many(result.Log, result.Posts), result.Posts)
-		}(result)
-
-		log, err := logs.UpdateCharacters(result.Log, nil)
-		if err != nil {
-			log = result.Log
-		}
-
-		newLogs = append(newLogs, &log)
-	}
-
-	return newLogs, nil
+	return r.s.Logs.Import(ctx, input.Importer, date, tz, input.ChannelName, input.Data)
 }
 
 func (r *mutationResolver) EditLog(ctx context.Context, input graphcore.LogEditInput) (*models.Log, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("log.edit") {
-		return nil, errors.New("You are not permitted to edit logs")
+	update := models.LogUpdate{
+		Open:        input.Open,
+		Description: input.Description,
+		EventName:   input.Event,
+		Title:       input.Title,
 	}
 
-	log, err := logs.FindID(input.ID)
-	if err != nil {
-		return nil, errors.New("Log not found")
-	}
-
-	log, err = logs.Edit(log, input.Title, input.Event, input.Description, input.Open)
-	if err != nil {
-		return nil, errors.New("Failed to edit log: " + err.Error())
-	}
-
-	go changes.Submit("Log", "edit", token.UserID, true, changekeys.Listed(log), log)
-
-	return &log, nil
+	return r.s.Logs.Update(ctx, input.ID, update)
 }
 
 func (r *mutationResolver) RemoveLog(ctx context.Context, input graphcore.LogRemoveInput) (*models.Log, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("log.remove") {
-		return nil, errors.New("You are not permitted to remove logs")
-	}
-
-	log, err := logs.FindID(input.ID)
-	if err != nil {
-		return nil, errors.New("Log not found")
-	}
-
-	log, err = logs.Remove(log)
-	if err != nil {
-		return nil, errors.New("Failed to remove log: " + err.Error())
-	}
-
-	go changes.Submit("Log", "remove", token.UserID, true, changekeys.Listed(log), log)
-
-	return &log, nil
+	return r.s.Logs.Delete(ctx, input.ID)
 }

graph2/resolvers/post.go

@@ -2,180 +2,39 @@ package resolvers
 
 import (
 	"context"
-	"errors"
-
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
-	"git.aiterp.net/rpdata/api/internal/auth"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/changekeys"
-	"git.aiterp.net/rpdata/api/models/changes"
-	"git.aiterp.net/rpdata/api/models/logs"
-	"git.aiterp.net/rpdata/api/models/posts"
 )
 
 // Queries
 
 func (r *queryResolver) Post(ctx context.Context, id string) (*models.Post, error) {
-	post, err := posts.FindID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &post, nil
+	return r.s.Logs.FindPosts(ctx, id)
 }
 
-func (r *queryResolver) Posts(ctx context.Context, filter *posts.Filter) ([]*models.Post, error) {
-	// Some sanity checks to avoid querying an insame amount of posts.
-	if filter == nil {
-		filter = &posts.Filter{Limit: 256}
-	} else {
-		if (filter.Limit <= 0 || filter.Limit > 256) && filter.LogID == nil {
-			return nil, errors.New("a limit of 0 (no limit) or >256 without a logId is not allowed")
-		}
-
-		if len(filter.Kind) > 32 {
-			return nil, errors.New("You cannot specify more than 32 kinds")
-		}
-
-		if len(filter.ID) > 32 {
-			return nil, errors.New("You cannot specify more than 32 IDs")
-		}
-	}
-
-	posts, err := posts.List(filter)
-	if err != nil {
-		return nil, err
-	}
-
-	posts2 := make([]*models.Post, len(posts))
-	for i := range posts {
-		posts2[i] = &posts[i]
-	}
-
-	return posts2, nil
+func (r *queryResolver) Posts(ctx context.Context, filter *models.PostFilter) ([]*models.Post, error) {
+	return r.s.Logs.ListPosts(ctx, filter)
 }
 
 // Mutation
 
 func (r *mutationResolver) AddPost(ctx context.Context, input graphcore.PostAddInput) (*models.Post, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("post.add") {
-		return nil, errors.New("You are not permitted to edit logs")
-	}
-
-	log, err := logs.FindID(input.LogID)
-	if err != nil {
-		return nil, err
-	}
-
-	post, err := posts.Add(log, input.Time, input.Kind, input.Nick, input.Text)
-	if err != nil {
-		return nil, err
-	}
-
-	go logs.UpdateCharacters(log, nil)
-	go changes.Submit("Post", "add", token.UserID, true, changekeys.Many(log, post), post)
-
-	return &post, nil
+	return r.s.Logs.AddPost(ctx, input.LogID, input.Time, input.Kind, input.Nick, input.Text)
 }
 
 func (r *mutationResolver) EditPost(ctx context.Context, input graphcore.PostEditInput) (*models.Post, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("post.edit") {
-		return nil, errors.New("You are not permitted to edit logs")
-	}
-
-	post, err := posts.FindID(input.ID)
-	if err != nil {
-		return nil, errors.New("Post not found")
-	}
-
-	if input.Nick != nil {
-		go func() {
-			log, err := logs.FindID(post.LogID)
-			if err != nil {
-				return
-			}
-
-			logs.UpdateCharacters(log, nil)
-		}()
-	}
-
-	post, err = posts.Edit(post, input.Time, input.Kind, input.Nick, input.Text)
-	if err != nil {
-		return nil, errors.New("Adding post failed: " + err.Error())
-	}
-
-	go func() {
-		log, err := logs.FindID(post.LogID)
-		if err != nil {
-			log = models.Log{ID: post.LogID}
-		}
-
-		changes.Submit("Post", "edit", token.UserID, true, changekeys.Many(log, post), post)
-	}()
-
-	return &post, nil
+	return r.s.Logs.EditPost(ctx, input.ID, models.PostUpdate{
+		Time: input.Time,
+		Kind: input.Kind,
+		Nick: input.Nick,
+		Text: input.Text,
+	})
 }
 
 func (r *mutationResolver) MovePost(ctx context.Context, input graphcore.PostMoveInput) ([]*models.Post, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("post.move") {
-		return nil, errors.New("You are not permitted to edit logs")
-	}
-
-	post, err := posts.FindID(input.ID)
-	if err != nil {
-		return nil, errors.New("Post not found")
-	}
-
-	posts, err := posts.Move(post, input.ToPosition)
-	if err != nil {
-		return nil, errors.New("Moving posts failed: " + err.Error())
-	}
-
-	go func() {
-		log, err := logs.FindID(post.LogID)
-		if err != nil {
-			log = models.Log{ID: post.LogID}
-		}
-
-		changes.Submit("Post", "move", token.UserID, true, changekeys.Many(log, posts), posts)
-	}()
-
-	posts2 := make([]*models.Post, len(posts))
-	for i := range posts {
-		posts2[i] = &posts[i]
-	}
-
-	return posts2, nil
+	return r.s.Logs.MovePost(ctx, input.ID, input.ToPosition)
 }
 
 func (r *mutationResolver) RemovePost(ctx context.Context, input graphcore.PostRemoveInput) (*models.Post, error) {
-	token := auth.TokenFromContext(ctx)
-	if !token.Authenticated() || !token.Permitted("post.remove") {
-		return nil, errors.New("You are not permitted to edit logs")
-	}
-
-	post, err := posts.FindID(input.ID)
-	if err != nil {
-		return nil, errors.New("Post not found (before removing, of course)")
-	}
-
-	post, err = posts.Remove(post)
-	if err != nil {
-		return nil, errors.New("Could not remove post: " + err.Error())
-	}
-
-	go func() {
-		log, err := logs.FindID(post.LogID)
-		if err != nil {
-			return
-		}
-
-		logs.UpdateCharacters(log, nil)
-		changes.Submit("Post", "remove", token.UserID, true, changekeys.Many(log, post), post)
-	}()
-
-	return &post, nil
+	return r.s.Logs.DeletePost(ctx, input.ID)
 }

graph2/schema/types/Post.gql

@@ -75,8 +75,8 @@ input PostRemoveInput {
 
 # Filter for posts query
 input PostsFilter {
-  id: [String!]
-  kind: [String!]
+  ids: [String!]
+  kinds: [String!]
   logId: String
   limit: Int
 }

graph2/types/log.go

@@ -7,10 +7,10 @@ import (
 
 	"git.aiterp.net/rpdata/api/internal/loader"
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/posts"
 )
 
 type logResolver struct {
+	logs       *services.LogService
 	characters *services.CharacterService
 }
 
@@ -34,20 +34,10 @@ func (r *logResolver) Characters(ctx context.Context, log *models.Log) ([]*model
 }
 
 func (r *logResolver) Posts(ctx context.Context, log *models.Log, kinds []string) ([]*models.Post, error) {
-	posts, err := posts.List(&posts.Filter{LogID: &log.ShortID, Kind: kinds, Limit: 0})
-	if err != nil {
-		return nil, err
-	}
-
-	posts2 := make([]*models.Post, len(posts))
-	for i := range posts {
-		posts2[i] = &posts[i]
-	}
-
-	return posts2, nil
+	return r.logs.ListPosts(ctx, &models.PostFilter{LogID: &log.ShortID})
 }
 
 // LogResolver is a resolver
 func LogResolver(s *services.Bundle) *logResolver {
-	return &logResolver{characters: s.Characters}
+	return &logResolver{characters: s.Characters, logs: s.Logs}
 }