fix(node): graphql resolver on event target addr

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Mar 22, 2019 · 7983568 · 7983568
1 parent 237f9dd
commit 7983568
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 88 deletions.
diff --git a/client/react-native/common/schema.graphql b/client/react-native/common/schema.graphql
diff --git a/core/api/node/graphql/gqlgen.gen.yml b/core/api/node/graphql/gqlgen.gen.yml
diff --git a/core/api/node/graphql/graph/generated/generated.gen.go b/core/api/node/graphql/graph/generated/generated.gen.go
diff --git a/core/api/node/graphql/resolver.go b/core/api/node/graphql/resolver.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"regexp"
 	"strings"
 	"time"
 
@@ -141,7 +142,33 @@ func (r *bertyEntityEventResolver) ID(ctx context.Context, obj *entity.Event) (s
 }
 
 func (r *bertyEntityEventResolver) TargetAddr(ctx context.Context, obj *entity.Event) (string, error) {
-	return "conversation:" + obj.TargetAddr, nil
+	kindStr := obj.Kind.String()
+
+	ok, err := regexp.MatchString("^Contact.*", kindStr)
+	if err != nil {
+		return "", err
+	}
+	if ok {
+		return "contact:" + obj.TargetAddr, nil
+	}
+
+	ok, err = regexp.MatchString("^Conversation.*", kindStr)
+	if err != nil {
+		return "", err
+	}
+	if ok {
+		return "conversation:" + obj.TargetAddr, nil
+	}
+
+	ok, err = regexp.MatchString("^Device.*", kindStr)
+	if err != nil {
+		return "", err
+	}
+	if ok {
+		return "device:" + obj.TargetAddr, nil
+	}
+
+	return obj.TargetAddr, nil
 }
 
 func (r *bertyEntityEventResolver) Attributes(ctx context.Context, obj *entity.Event) ([]byte, error) {
@@ -404,7 +431,13 @@ func (r *queryResolver) EventList(ctx context.Context, filter *entity.Event, raw
 			filter.ID = strings.SplitN(filter.ID, ":", 2)[1]
 		}
 		if filter.TargetAddr != "" {
-			filter.TargetAddr = strings.SplitN(filter.TargetAddr, ":", 2)[1]
+			ok, err := regexp.MatchString("^(contact|conversation|device):.*", filter.TargetAddr)
+			if err != nil {
+				return nil, err
+			}
+			if ok {
+				filter.TargetAddr = strings.SplitN(filter.TargetAddr, ":", 2)[1]
+			}
 		}
 	}
 
@@ -501,7 +534,13 @@ func (r *queryResolver) EventUnseen(ctx context.Context, filter *entity.Event, r
 			filter.ID = strings.SplitN(filter.ID, ":", 2)[1]
 		}
 		if filter.TargetAddr != "" {
-			filter.TargetAddr = strings.SplitN(filter.TargetAddr, ":", 2)[1]
+			ok, err := regexp.MatchString("^(contact|conversation|device):.*", filter.TargetAddr)
+			if err != nil {
+				return nil, err
+			}
+			if ok {
+				filter.TargetAddr = strings.SplitN(filter.TargetAddr, ":", 2)[1]
+			}
 		}
 	}
 

diff --git a/core/api/node/graphql/service.gen.graphql b/core/api/node/graphql/service.gen.graphql
diff --git a/core/entity/event.pb.go b/core/entity/event.pb.go
diff --git a/core/entity/event.proto b/core/entity/event.proto
@@ -81,7 +81,7 @@ message Event {
   TargetType target_type = 20;
 
   // TragetAddr can be a contact ID, a conversation ID, a device ID
-  string target_addr = 21;
+  string target_addr = 21 [(gql.graphql_id) = true];
 
   // Metadata represents additional metadata and is not stored in database
   repeated MetadataKeyValue metadata = 99 [(gogoproto.moretags) = "gorm:\"-\""];