Fixed a bug related to notification versions

When notifications were sent, Notification.Save()
was called twice resulting in a new version. Fixed.
Also, notification keys are prefixed by "n:id" instead
of "n:".

Author: vrypan

api/endpoints.go

@@ -243,7 +243,7 @@ func H_Notify(c *gin.Context) {
 			c.JSON(http.StatusBadRequest, gin.H{"error": err})
 			return
 		}
-		ver, err = notification.Save()
+		ver, err = notification.Update()
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err})
 			return

cmd/export.go

@@ -44,6 +44,7 @@ func exportData(cmd *cobra.Command, args []string) {
 	exportEntities("l_user", []byte("l:user:"), outDir, &models.UserLog{})
 	exportEntities("s_id", []byte("s:id:"), outDir, &models.Subscription{})
 	exportEntities("f_id", []byte("f:id:"), outDir, &models.Frame{})
+	exportEntities("n_", []byte("n:"), outDir, &models.Notification{})
 	exportKeys("f_name", []byte("f:name:"), outDir)
 	exportKeys("f_endpoint", []byte("f:endpoint:"), outDir)
 	exportKeys("s_url", []byte("s:url:"), outDir)

models/notification.go

@@ -180,16 +180,16 @@ func (n *Notification) Send() error {
 }
 
 func (n *Notification) Prefix() string {
-	return "n:" + n.Id + ":000:"
+	return "n:id:" + n.Id + ":000:"
 }
 func (n *Notification) PrefixBytes() []byte {
-	return []byte("n:" + n.Id + ":000:")
+	return []byte("n:id:" + n.Id + ":000:")
 }
 
 func (n *Notification) Save() (int, error) {
 	nextVersion := uint64(0)
 	var err error
-	prefix := []byte("n:" + n.Id + ":")
+	prefix := []byte("n:id:" + n.Id + ":")
 	for {
 		keys, next, err := db.GetKeysWithPrefix(prefix, prefix, 100)
 		if err != nil {
@@ -200,23 +200,36 @@ func (n *Notification) Save() (int, error) {
 			break
 		}
 	}
-	nextKey := []byte("n:" + n.Id + ":" + fmt.Sprintf("%03d", nextVersion))
+	nextKey := []byte("n:id:" + n.Id + ":" + fmt.Sprintf("%03d", nextVersion))
 	n.Version = &nextVersion
 	notificationBytes, err := proto.Marshal(n)
 	if err != nil {
 		return 0, fmt.Errorf("Error marshaling notification: %v", err)
 	}
 	err = db.Set(nextKey, notificationBytes)
 	if err != nil {
-		return 0, fmt.Errorf("Error putting notification: %v", err)
+		return 0, fmt.Errorf("Error saving notification: %v", err)
 	}
 	return int(nextVersion), nil
 }
 
+func (n *Notification) Update() (int, error) {
+	key := []byte("n:id:" + n.Id + ":" + fmt.Sprintf("%03d", n.GetVersion()))
+	notificationBytes, err := proto.Marshal(n)
+	if err != nil {
+		return 0, fmt.Errorf("Error marshaling notification: %v", err)
+	}
+	err = db.Set(key, notificationBytes)
+	if err != nil {
+		return 0, fmt.Errorf("Error saving notification: %v", err)
+	}
+	return int(*n.Version), nil
+}
+
 func (n *Notification) Load(id string) ([]*Notification, error) {
 	var notifications []*Notification
-	prefix := []byte("n:" + id + ":")
-	next := []byte("n:" + id + ":0")
+	prefix := []byte("n:id:" + id + ":")
+	next := []byte("n:id:" + id + ":0")
 	for {
 		keys, next, err := db.GetKeysWithPrefix(prefix, next, 100)
 		if err != nil {