fix/notification: fix sync issue by getting last comment from author

Author: dtrckd

cmd/notifier.go

@@ -22,7 +22,6 @@ package cmd
 
 import (
     "fmt"
-    "time"
     "log"
     "context"
     "encoding/json"
@@ -113,8 +112,9 @@ func processContractNotification(msg *redis.Message) {
         return
     }
 
+    // @deprecated
     // Add a little sleep to wait for UpdateContractHook as it writes after publishing
-    time.Sleep(1 * time.Second)
+    //time.Sleep(1 * time.Second)
 
     // Push notification
     if err := graph.PushContractNotifications(notif); err != nil {

db/dql.go

@@ -402,20 +402,19 @@ var dqlQueries map[string]string = map[string]string{
             {{.user_payload}}
         }
     }`,
-    // @debug sub filter comments on username/author...
     "getLastComment": `{
         all(func: uid({{.tid}})) @normalize {
             title: Tension.title
             Tension.receiver {
                 rootnameid: Node.rootnameid
                 receiverid: Node.nameid
             }
-            Tension.comments(first:1, orderdesc: Post.createdAt) {
+            Tension.comments(first:1, orderdesc: Post.createdAt) @cascade {
                 message: Post.message
+                Post.createdBy @filter(eq(User.username, "{{.username}}"))
             }
         }
     }`,
-    // @debug sub filter comments on username/author...
     "getLastContractComment": `{
         all(func: uid({{.cid}})) @normalize {
             Contract.tension {
@@ -424,8 +423,9 @@ var dqlQueries map[string]string = map[string]string{
                     receiverid: Node.nameid
                 }
             }
-            Contract.comments(first:1, orderdesc: Post.createdAt) {
+            Contract.comments(first:1, orderdesc: Post.createdAt) @cascade {
                 message: Post.message
+                Post.createdBy @filter(eq(User.username, "{{.username}}"))
             }
         }
     }`,

graph/contract_resolver.go

@@ -181,12 +181,14 @@ func updateContractHook(ctx context.Context, obj interface{}, next graphql.Resol
             }
         }
         if ok {
+            // Execute query
+            data, err := next(ctx)
+            if err != nil { return data, err }
             // Notify users by email
             if input.Set.Comments != nil && len(input.Set.Comments) > 0 {
                 PublishContractEvent(model.ContractNotif{Uctx: uctx, Tid: contract.Tension.ID, Contract: contract, ContractEvent: model.NewComment})
             }
-            // Execute query
-            return next(ctx)
+            return data, err
         } else {
             return nil, LogErr("Access denied", fmt.Errorf("You are not authorized to access this ressource."))
         }

graph/notifications.go

@@ -47,8 +47,8 @@ var ctx context.Context = context.Background()
 // Publisher functions (Redis)
 //
 
-// Will trigger processTensionNotification in cmd/notifier.go
-// and PushEventNotifications
+// Will trigger Event notifications in cmd/notifier.go
+// PublishTensionEvent -> cmd.processTensionNotification -> PushEventNotifications
 func PublishTensionEvent(notif model.EventNotif) error {
     payload, _ := json.Marshal(notif)
     if err := cache.Publish(ctx, "api-tension-notification", payload).Err(); err != nil {
@@ -59,8 +59,8 @@ func PublishTensionEvent(notif model.EventNotif) error {
     return nil
 }
 
-// Will trigger processContractNotification in cmd/notifier.go
-// and PushContractNotifications
+// Will trigger Contract notifications in cmd/notifier.go
+// PublishContractEvent -> cmd.processContractNotification -> PushContractNotifications
 func PublishContractEvent(notif model.ContractNotif) error {
     payload, _ := json.Marshal(notif)
     if err := cache.Publish(ctx, "api-contract-notification", payload).Err(); err != nil {
@@ -71,8 +71,8 @@ func PublishContractEvent(notif model.ContractNotif) error {
     return nil
 }
 
-// Will trigger processNotifNotification in cmd/notifier.go
-// and PushNotifNotifications
+// Will trigger Notif notifications in cmd/notifier.go
+// PublishNotifEvent -> cmd.processNotifNotification -> PushNotifNotifications
 func PublishNotifEvent(notif model.NotifNotif) error {
     payload, _ := json.Marshal(notif)
     if err := cache.Publish(ctx, "api-notif-notification", payload).Err(); err != nil {
@@ -165,7 +165,7 @@ func PushEventNotifications(notif model.EventNotif) error {
     }
     // +
     // Add mentions and **set tension data**
-    if m, err := db.GetDB().Meta("getLastComment", map[string]string{"tid":notif.Tid}); err != nil {
+    if m, err := db.GetDB().Meta("getLastComment", map[string]string{"tid":notif.Tid, "username":notif.Uctx.Username}); err != nil {
         return err
     } else if len(m) > 0 {
         notif.Rootnameid = m[0]["rootnameid"].(string)
@@ -293,7 +293,7 @@ func PushContractNotifications(notif model.ContractNotif) error {
     }
     // +
     // Add mentionned and **set tension data**
-    if m, err := db.GetDB().Meta("getLastContractComment", map[string]string{"cid":notif.Contract.ID}); err != nil {
+    if m, err := db.GetDB().Meta("getLastContractComment", map[string]string{"cid":notif.Contract.ID, "username":notif.Uctx.Username}); err != nil {
         return err
     } else if len(m) > 0 {
         notif.Rootnameid = m[0]["rootnameid"].(string)

graph/tension_resolver.go

@@ -152,10 +152,12 @@ func updateTensionHook(ctx context.Context, obj interface{}, next graphql.Resolv
         ok, contract, err = TensionEventHook(uctx, ids[0], input.Set.History, blob)
         if err != nil { return nil, err }
         if ok {
-            // History and notification Logics --
-            // In order to notify user on the given event, we need to know their ids to pass and link them
-            // to the notification (UserEvent edge) function. To do so we first cut the history from the original
-            // input, and push then the history (see the PushHistory function).
+            // History and notification Logics
+            // --
+            // In order to notify user on the given event, we need to know
+            // their ids to pass and link them to the user's notifications (UserEvent edge).
+            // To do so we first cut the history from the original input,
+            // and push then the history (see the [[PushHistory]] function).
             ctx = context.WithValue(ctx, "cut_history", true)
             // Execute query
             data, err := next(ctx)