Changes to change system.

graph2/resolvers/changes.go

@@ -2,39 +2,25 @@ package resolvers
 
 import (
 	"context"
-	"errors"
-
 	"git.aiterp.net/rpdata/api/models"
-	"git.aiterp.net/rpdata/api/models/changes"
 )
 
 /// Queries
 
-func (r *queryResolver) Changes(ctx context.Context, filter *changes.Filter) ([]*models.Change, error) {
-	changes, err := changes.List(filter)
-	if err != nil {
-		return nil, err
+func (r *queryResolver) Changes(ctx context.Context, filter *models.ChangeFilter) ([]*models.Change, error) {
+	if filter == nil {
+		filter = &models.ChangeFilter{}
 	}
 
-	changes2 := make([]*models.Change, len(changes))
-	for i := range changes {
-		changes2[i] = &changes[i]
-	}
-
-	return changes2, nil
+	return r.s.Changes.List(ctx, *filter)
 }
 
 /// Subscriptions
 
-func (r *subscriptionResolver) Changes(ctx context.Context, keys []*models.ChangeKey) (<-chan *models.Change, error) {
-	if len(keys) == 0 {
-		return nil, errors.New("At least one key is required for a subscription")
+func (r *subscriptionResolver) Changes(ctx context.Context, filter *models.ChangeFilter) (<-chan *models.Change, error) {
+	if filter == nil {
+		filter = &models.ChangeFilter{}
 	}
 
-	keys2 := make([]models.ChangeKey, len(keys))
-	for i := range keys {
-		keys2[i] = *keys[i]
-	}
-
-	return changes.Subscribe(ctx, keys2, false), nil
+	return r.s.Changes.Subscribe(ctx, *filter), nil
 }