test: fix too long relation name and stuff

ory · Feb 3, 2021 · fd35cbc · fd35cbc
1 parent 57babd9
commit fd35cbc
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/internal/e2e/cases_test.go b/internal/e2e/cases_test.go
@@ -75,7 +75,7 @@ func runCases(c client, nspaces []*namespace.Namespace) func(*testing.T) {
 		t.Run("case=gets result paginated", func(t *testing.T) {
 			const nTuples = 10
 
-			rel := t.Name()
+			rel := fmt.Sprintf("some unique relation %T", c)
 			for i := 0; i < nTuples; i++ {
 				c.createTuple(t, &relationtuple.InternalRelationTuple{
 					Namespace: nspaces[0].Name,
@@ -98,6 +98,7 @@ func runCases(c client, nspaces []*namespace.Namespace) func(*testing.T) {
 					x.WithToken(resp.NextPageToken),
 					x.WithSize(1),
 				)
+				assert.Len(t, resp.RelationTuples, 1)
 			}
 
 			assert.Equal(t, nTuples, nPages)

diff --git a/internal/e2e/grpc_client_test.go b/internal/e2e/grpc_client_test.go
@@ -59,7 +59,6 @@ func (g *grpcClient) queryTuple(t require.TestingT, q *relationtuple.RelationQue
 
 	var resp relationtuple.GetResponse
 	require.NoError(t, json.Unmarshal([]byte(out), &resp), "%s", out)
-	fmt.Println(out)
 
 	return &resp
 }

diff --git a/internal/persistence/sql/relationtuples.go b/internal/persistence/sql/relationtuples.go
@@ -44,6 +44,8 @@ func (p *Persister) insertRelationTuple(ctx context.Context, rel *relationtuple.
 	// TODO sharding
 	shardID := "default"
 
+	p.l.WithFields(rel.ToLoggerFields()).Trace("creating in database")
+
 	return p.connection(ctx).RawQuery(fmt.Sprintf(
 		"INSERT INTO %s (shard_id, object, relation, subject, commit_time) VALUES (?, ?, ?, ?, ?)", tableFromNamespace(n)),
 		shardID, rel.Object, rel.Relation, rel.Subject.String(), commitTime,
@@ -111,7 +113,7 @@ func (p *Persister) GetRelationTuples(ctx context.Context, query *relationtuple.
 			pagination.Offset,
 		)
 	} else {
-		rawQuery = fmt.Sprintf("SELECT * FROM %s WHERE %s LIMIT %d OFFSET %d",
+		rawQuery = fmt.Sprintf("SELECT * FROM %s WHERE %s ORDER BY object, relation, subject, commit_time LIMIT %d OFFSET %d",
 			tableFromNamespace(n),
 			strings.Join(where, " AND "),
 			pagination.Limit+1,

diff --git a/internal/relationtuple/definitions.go b/internal/relationtuple/definitions.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/sirupsen/logrus"
+
 	acl "github.com/ory/keto/proto/ory/keto/acl/v1alpha1"
 
 	"github.com/tidwall/sjson"
@@ -279,6 +281,15 @@ func (r *InternalRelationTuple) ToURLQuery() url.Values {
 	return vals
 }
 
+func (r *InternalRelationTuple) ToLoggerFields() logrus.Fields {
+	return logrus.Fields{
+		"namespace": r.Namespace,
+		"object":    r.Object,
+		"relation":  r.Relation,
+		"subject":   r.Subject,
+	}
+}
+
 func (q *RelationQuery) FromProto(query *acl.ListRelationTuplesRequest_Query) *RelationQuery {
 	return &RelationQuery{
 		Namespace: query.Namespace,

diff --git a/internal/relationtuple/read_server.go b/internal/relationtuple/read_server.go
@@ -49,6 +49,12 @@ func (h *handler) getRelations(w http.ResponseWriter, r *http.Request, _ httprou
 		return
 	}
 
+	l := h.d.Logger()
+	for k := range q {
+		l = l.WithField(k, q.Get(k))
+	}
+	l.Debug("querying relation tuples")
+
 	var paginationOpts []x.PaginationOptionSetter
 	if pageToken := q.Get("page_token"); pageToken != "" {
 		paginationOpts = append(paginationOpts, x.WithToken(pageToken))

diff --git a/internal/relationtuple/write_server.go b/internal/relationtuple/write_server.go
@@ -51,6 +51,8 @@ func (h *handler) createRelation(w http.ResponseWriter, r *http.Request, _ httpr
 		return
 	}
 
+	h.d.Logger().WithFields(rel.ToLoggerFields()).Debug("creating relation tuple")
+
 	if err := h.d.RelationTupleManager().WriteRelationTuples(r.Context(), &rel); err != nil {
 		h.d.Logger().WithError(err).WithField("relationtuple", rel).Errorf("got an error while creating the relation tuple")
 		h.d.Writer().WriteError(w, r, errors.WithStack(herodot.ErrInternalServerError))