memory relationship reader bug fixed

Author: tolgaOzen

docs/v1/apidocs.swagger.json

@@ -6,12 +6,12 @@
     "version": "v0.0.0-alpha9",
     "contact": {
       "name": "API Support",
-      "url": "https://github.com/Permify/base/issues",
-      "email": "hello@base.co"
+      "url": "https://github.com/Permify/permify/issues",
+      "email": "hello@permify.co"
     },
     "license": {
       "name": "GNU Affero General Public License v3.0",
-      "url": "https://github.com/Permify/base/blob/master/LICENSE"
+      "url": "https://github.com/Permify/permify/blob/master/LICENSE"
     }
   },
   "tags": [

internal/repositories/memory/relationshipReader.go

@@ -37,13 +37,14 @@ func (r *RelationshipReader) QueryRelationships(ctx context.Context, filter *bas
 
 	index, args := utils.GetIndexNameAndArgsByFilters(filter)
 	var it memdb.ResultIterator
+
 	it, err = txn.Get(RelationTuplesTable, index, args...)
 	if err != nil {
 		return nil, errors.New(base.ErrorCode_ERROR_CODE_EXECUTION.String())
 	}
 
 	fit := memdb.NewFilterIterator(it, utils.FilterQuery(filter))
-	for obj := fit.Next(); obj != nil; obj = it.Next() {
+	for obj := fit.Next(); obj != nil; obj = fit.Next() {
 		t := obj.(repositories.RelationTuple)
 		collection.Add(t.ToTuple())
 	}

pkg/cmd/validate.go

@@ -95,7 +95,7 @@ func validate() func(cmd *cobra.Command, args []string) error {
 					Entity:        q.Entity,
 					Permission:    q.Action,
 					Subject:       q.Subject,
-					Depth:         20,
+					Depth:         100,
 				})
 				if err != nil {
 					return err
@@ -111,9 +111,9 @@ func validate() func(cmd *cobra.Command, args []string) error {
 				} else {
 					color.Danger.Printf("%v. %s ? => ", i+1, query)
 					if res.Can == base.PermissionCheckResponse_RESULT_ALLOWED {
-						color.Danger.Println("expected: ✗ ❌ , actual: ✗ ✅ ")
+						color.Danger.Println("expected: ✗ ❌ , actual: ✓ ✅ ")
 					} else {
-						color.Danger.Println("expected: ✓ ✅ , actual: ✓ ❌ ")
+						color.Danger.Println("expected: ✓ ✅ , actual: ✗ ❌ ")
 					}
 					color.Danger.Println("FAILED.")
 					os.Exit(1)

pkg/dsl/ast/node.go

@@ -150,7 +150,7 @@ func (sch *Schema) GetRelationReferenceIfExist(name string) ([]RelationTypeState
 // EntityStatement -
 type EntityStatement struct {
 	Token              token.Token // token.ENTITY
-	Name               token.Token // snapshot.IDENT
+	Name               token.Token // token.IDENT
 	RelationStatements []Statement
 	ActionStatements   []Statement
 	Option             token.Token // token.OPTION
@@ -201,7 +201,7 @@ func (ls *EntityStatement) String() string {
 // RelationStatement -
 type RelationStatement struct {
 	Token         token.Token // token.RELATION
-	Name          token.Token // snapshot.IDENT
+	Name          token.Token // token.IDENT
 	RelationTypes []Statement
 	Option        token.Token // token.OPTION
 }
@@ -240,8 +240,8 @@ func (ls *RelationStatement) String() string {
 
 // RelationTypeStatement -
 type RelationTypeStatement struct {
-	Sign  token.Token // snapshot.sign
-	Token token.Token // snapshot.IDENT
+	Sign  token.Token // token.SIGN
+	Token token.Token // token.IDENT
 }
 
 // statementNode -
@@ -270,11 +270,11 @@ func (ls *RelationTypeStatement) IsEntityReference() bool {
 
 // Identifier -
 type Identifier struct {
-	Token token.Token // snapshot.IDENT
+	Token token.Token // token.IDENT
 	Value string
 }
 
-// statementNode -
+// expressionNode -
 func (ls *Identifier) expressionNode() {}
 
 // TokenLiteral -
@@ -305,7 +305,7 @@ func (ls *Identifier) GetValue() string {
 // ActionStatement -
 type ActionStatement struct {
 	Token               token.Token // token.ACTION
-	Name                token.Token // snapshot.IDENT
+	Name                token.Token // token.IDENT
 	ExpressionStatement Statement
 }
 
@@ -351,7 +351,7 @@ func (es *ExpressionStatement) String() string {
 
 // InfixExpression -
 type InfixExpression struct {
-	Token    token.Token // The operator snapshot, e.g. and, or
+	Token    token.Token // The operator token, e.g. and, or
 	Left     Expression
 	Operator Operator
 	Right    Expression

pkg/dsl/parser/parser.go

@@ -170,7 +170,7 @@ func (p *Parser) Parse() (*ast.Schema, error) {
 	return schema, nil
 }
 
-// parseStatement method based on defined snapshot types
+// parseStatement method based on defined token types
 func (p *Parser) parseStatement() (ast.Statement, error) {
 	switch p.currentToken.Type {
 	case token.ENTITY:
@@ -493,18 +493,18 @@ func (p *Parser) noInfixParseFnError(t token.Type) {
 
 // illegal -
 func (p *Parser) illegal() {
-	msg := fmt.Sprintf("%v:%v:illegal snapshot found", p.l.GetLinePosition(), p.l.GetColumnPosition())
+	msg := fmt.Sprintf("%v:%v:illegal token found", p.l.GetLinePosition(), p.l.GetColumnPosition())
 	p.errors = append(p.errors, msg)
 }
 
 // peekError -
 func (p *Parser) peekError(t ...token.Type) {
-	msg := fmt.Sprintf("%v:%v:expected next snapshot to be %s, got %s instead", p.l.GetLinePosition(), p.l.GetColumnPosition(), t, p.peekToken.Type)
+	msg := fmt.Sprintf("%v:%v:expected next token to be %s, got %s instead", p.l.GetLinePosition(), p.l.GetColumnPosition(), t, p.peekToken.Type)
 	p.errors = append(p.errors, msg)
 }
 
 // currentError -
 func (p *Parser) currentError(t ...token.Type) {
-	msg := fmt.Sprintf("%v:%v:expected snapshot to be %s, got %s instead", p.l.GetLinePosition(), p.l.GetColumnPosition(), t, p.currentToken.Type)
+	msg := fmt.Sprintf("%v:%v:expected token to be %s, got %s instead", p.l.GetLinePosition(), p.l.GetColumnPosition(), t, p.currentToken.Type)
 	p.errors = append(p.errors, msg)
 }

pkg/pb/base/v1/openapi.pb.go

@@ -12,12 +12,12 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     version: "v0.0.0-alpha9";
     contact: {
       name: "API Support";
-      url: "https://github.com/Permify/base/issues";
-      email: "hello@base.co";
+      url: "https://github.com/Permify/permify/issues";
+      email: "hello@permify.co";
     };
     license: {
       name: "GNU Affero General Public License v3.0";
-      url: "https://github.com/Permify/base/blob/master/LICENSE";
+      url: "https://github.com/Permify/permify/blob/master/LICENSE";
     }
   };
   consumes: "application/json";