chore: remove support for multiple queries in GetRelationTuples (#304)

Closes #299

check/engine.go

@@ -49,7 +49,7 @@ func (e *Engine) subjectIsAllowed(ctx context.Context, requested *models.Interna
 		prevRelationsLen := len(subjectRelations)
 
 		// compute one indirection
-		indirect, err := e.d.RelationTupleManager().GetRelationTuples(ctx, []*models.RelationQuery{{Subject: sr.DeriveSubject()}})
+		indirect, err := e.d.RelationTupleManager().GetRelationTuples(ctx, &models.RelationQuery{Subject: sr.DeriveSubject()})
 		if err != nil {
 			// TODO fix error handling
 			_, _ = fmt.Fprintf(os.Stderr, "%+v", err)
@@ -82,7 +82,7 @@ func (e *Engine) subjectIsAllowed(ctx context.Context, requested *models.Interna
 }
 
 func (e *Engine) SubjectIsAllowed(ctx context.Context, r *models.InternalRelationTuple) (bool, error) {
-	subjectRelations, err := e.d.RelationTupleManager().GetRelationTuples(ctx, []*models.RelationQuery{{Subject: r.Subject}})
+	subjectRelations, err := e.d.RelationTupleManager().GetRelationTuples(ctx, &models.RelationQuery{Subject: r.Subject})
 	if err != nil {
 		return false, err
 	}

cmd/relationtuple/get.go

@@ -80,9 +80,9 @@ func newGetCmd() *cobra.Command {
 				return err
 			}
 			resp, err := cl.ReadRelationTuples(context.Background(), &models.ReadRelationTuplesRequest{
-				TupleSets: []*models.ReadRelationTuplesRequest_Query{query},
-				Page:      0,
-				PerPage:   100,
+				Query:   query,
+				Page:    0,
+				PerPage: 100,
 			})
 			if err != nil {
 				_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Could not make request: %s\n", err)

expand/engine.go

@@ -34,10 +34,10 @@ func (e *Engine) BuildTree(ctx context.Context, subject models.Subject, restDept
 			Subject: subject,
 		}
 
-		rels, err := e.d.RelationTupleManager().GetRelationTuples(ctx, []*models.RelationQuery{{
+		rels, err := e.d.RelationTupleManager().GetRelationTuples(ctx, &models.RelationQuery{
 			Relation: us.Relation,
 			Object:   us.Object,
-		}})
+		})
 		if err != nil {
 			// TODO error handling
 			return nil, err

models/relation.proto

@@ -26,7 +26,7 @@ message ReadRelationTuplesRequest {
   // All conditions are concatenated with
   // an OR operator. If any query matches
   // the relation will be in the response
-  repeated Query tuple_sets = 1;
+  Query query = 1;
   int32 page = 2;
   int32 per_page = 3;
 }

persistence/definitions.go

@@ -1,3 +1,9 @@
 package persistence
 
-type Persister interface{}
+import (
+	"github.com/ory/keto/relationtuple"
+)
+
+type Persister interface {
+	relationtuple.Manager
+}

persistence/memory/relations.go

@@ -61,25 +61,21 @@ func buildRelationQueryFilter(query *models.RelationQuery) queryFilter {
 	}
 }
 
-func (p *Persister) GetRelationTuples(_ context.Context, queries []*models.RelationQuery, options ...relationtuple.PaginationOptionSetter) ([]*models.InternalRelationTuple, error) {
+func (p *Persister) GetRelationTuples(_ context.Context, query *models.RelationQuery, options ...relationtuple.PaginationOptionSetter) ([]*models.InternalRelationTuple, error) {
 	p.RLock()
 	defer p.RUnlock()
 
-	filters := make([]queryFilter, len(queries))
-	for i, q := range queries {
-		filters[i] = buildRelationQueryFilter(q)
+	if query == nil {
+		return nil, nil
 	}
 
+	filter := buildRelationQueryFilter(query)
+
 	var res []*models.InternalRelationTuple
 	for _, r := range p.relations {
-		for _, filter := range filters {
-			// this is lazy-evaluating the OR of all filters
-			if filter(r) {
-				// If one filter matches add relation to response and break inner loop
-				// to check next relation
-				res = append(res, r)
-				break
-			}
+		if filter(r) {
+			// If one filter matches add relation to response
+			res = append(res, r)
 		}
 	}