models: Painstakingly converted half the model package to a models & repostiry stucture. All binaries are probably dead at this point.

internal/loader/channel.go

@@ -5,18 +5,19 @@ import (
 	"errors"
 	"strings"
 
-	"git.aiterp.net/rpdata/api/model/channel"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/channels"
 	"github.com/graph-gophers/dataloader"
 )
 
 // Channel gets a character by key
-func (loader *Loader) Channel(key, value string) (channel.Channel, error) {
+func (loader *Loader) Channel(key, value string) (models.Channel, error) {
 	if !strings.HasPrefix(key, "Channel.") {
 		key = "Channel." + key
 	}
 
 	if loader.loaders[key] == nil {
-		return channel.Channel{}, errors.New("unsupported key")
+		return models.Channel{}, errors.New("unsupported key")
 	}
 
 	loader.loadPrimed(key)
@@ -24,10 +25,10 @@ func (loader *Loader) Channel(key, value string) (channel.Channel, error) {
 	thunk := loader.loaders[key].Load(loader.ctx, dataloader.StringKey(value))
 	res, err := thunk()
 	if err != nil {
-		return channel.Channel{}, err
+		return models.Channel{}, err
 	}
 
-	channel, ok := res.(channel.Channel)
+	channel, ok := res.(models.Channel)
 	if !ok {
 		return channel, errors.New("incorrect type")
 	}
@@ -48,10 +49,10 @@ func channelNameBatch(ctx context.Context, keys dataloader.Keys) []*dataloader.R
 	var results []*dataloader.Result
 	names := keys.Keys()
 
-	channels, err := channel.ListNames(names...)
+	channels, err := channels.ListNames(names...)
 	if err != nil {
 		for range names {
-			results = append(results, &dataloader.Result{Data: channel.Channel{}, Error: err})
+			results = append(results, &dataloader.Result{Data: models.Channel{}, Error: err})
 		}
 
 		return results
@@ -69,7 +70,7 @@ func channelNameBatch(ctx context.Context, keys dataloader.Keys) []*dataloader.R
 		}
 
 		if !found {
-			results = append(results, &dataloader.Result{Data: channel.Channel{}, Error: err})
+			results = append(results, &dataloader.Result{Data: models.Channel{}, Error: err})
 		}
 	}
 

internal/loader/character.go

@@ -6,11 +6,13 @@ import (
 	"strings"
 
 	"git.aiterp.net/rpdata/api/model/character"
+	"git.aiterp.net/rpdata/api/models"
+	"git.aiterp.net/rpdata/api/models/characters"
 	"github.com/graph-gophers/dataloader"
 )
 
 // Character gets a character by key
-func (loader *Loader) Character(key, value string) (character.Character, error) {
+func (loader *Loader) Character(key, value string) (models.Character, error) {
 	if !strings.HasPrefix(key, "Character.") {
 		key = "Character." + key
 	}
@@ -18,25 +20,25 @@ func (loader *Loader) Character(key, value string) (character.Character, error)
 	loader.loadPrimed(key)
 
 	if loader.loaders[key] == nil {
-		return character.Character{}, errors.New("unsupported key")
+		return models.Character{}, errors.New("unsupported key")
 	}
 
 	thunk := loader.loaders[key].Load(loader.ctx, dataloader.StringKey(value))
 	res, err := thunk()
 	if err != nil {
-		return character.Character{}, err
+		return models.Character{}, err
 	}
 
-	char, ok := res.(character.Character)
+	char, ok := res.(models.Character)
 	if !ok {
-		return character.Character{}, errors.New("incorrect type")
+		return models.Character{}, errors.New("incorrect type")
 	}
 
 	return char, nil
 }
 
 // Characters gets characters by key
-func (loader *Loader) Characters(key string, values ...string) ([]character.Character, error) {
+func (loader *Loader) Characters(key string, values ...string) ([]models.Character, error) {
 	if !strings.HasPrefix(key, "Character.") {
 		key = "Character." + key
 	}
@@ -55,10 +57,10 @@ func (loader *Loader) Characters(key string, values ...string) ([]character.Char
 		}
 	}
 
-	chars := make([]character.Character, len(res))
+	chars := make([]models.Character, len(res))
 
 	for i := range res {
-		char, ok := res[i].(character.Character)
+		char, ok := res[i].(models.Character)
 		if !ok {
 			return nil, errors.New("incorrect type")
 		}
@@ -84,7 +86,7 @@ func characterIDBatch(ctx context.Context, keys dataloader.Keys) []*dataloader.R
 	results := make([]*dataloader.Result, 0, len(keys))
 	ids := keys.Keys()
 
-	characters, err := character.ListIDs(ids...)
+	characters, err := characters.List(&characters.Filter{IDs: ids})
 	if err != nil {
 		for range ids {
 			results = append(results, &dataloader.Result{Error: err})
@@ -105,7 +107,7 @@ func characterIDBatch(ctx context.Context, keys dataloader.Keys) []*dataloader.R
 		}
 
 		if !found {
-			results = append(results, &dataloader.Result{Data: character.Character{}, Error: ErrNotFound})
+			results = append(results, &dataloader.Result{Data: models.Character{}, Error: ErrNotFound})
 		}
 	}
 
@@ -137,7 +139,7 @@ func characterNickBatch(ctx context.Context, keys dataloader.Keys) []*dataloader
 		}
 
 		if !found {
-			results = append(results, &dataloader.Result{Data: character.Character{}, Error: err})
+			results = append(results, &dataloader.Result{Data: models.Character{}, Error: err})
 		}
 	}
 

internal/loader/loader.go

@@ -29,9 +29,9 @@ func New() *Loader {
 	return &Loader{
 		ctx: context.Background(),
 		loaders: map[string]*dataloader.Loader{
-			"Character.id":   dataloader.NewBatchedLoader(characterIDBatch, dataloader.WithWait(time.Millisecond)),
-			"Character.nick": dataloader.NewBatchedLoader(characterNickBatch, dataloader.WithWait(time.Millisecond)),
-			"Channel.name":   dataloader.NewBatchedLoader(channelNameBatch, dataloader.WithWait(time.Millisecond)),
+			"Character.id":   dataloader.NewBatchedLoader(characterIDBatch, dataloader.WithWait(time.Millisecond*2)),
+			"Character.nick": dataloader.NewBatchedLoader(characterNickBatch, dataloader.WithWait(time.Millisecond*2)),
+			"Channel.name":   dataloader.NewBatchedLoader(channelNameBatch, dataloader.WithWait(time.Millisecond*2)),
 		},
 		primedKeys: make(map[string]map[string]bool),
 	}