re-implement ack behaviour from version 1.0 for compat

scnserver/db/impl/primary/compat.go

@@ -1,6 +1,7 @@
 package primary
 
 import (
+	"blackforestbytes.com/simplecloudnotifier/models"
 	"database/sql"
 	"errors"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
@@ -98,3 +99,59 @@ func (db *Database) ConvertToCompatID(ctx TxContext, newid string) (*int64, *str
 
 	return &oldid, &idtype, nil
 }
+
+func (db *Database) ConvertToCompatIDOrCreate(ctx TxContext, idtype string, newid string) (int64, error) {
+	id1, _, err := db.ConvertToCompatID(ctx, newid)
+	if err != nil {
+		return 0, err
+	}
+	if id1 != nil {
+		return *id1, nil
+	}
+
+	id2, err := db.CreateCompatID(ctx, idtype, newid)
+	if err != nil {
+		return 0, err
+	}
+	return id2, nil
+}
+
+func (db *Database) GetAck(ctx TxContext, msgid models.MessageID) (bool, error) {
+	tx, err := ctx.GetOrCreateTransaction(db)
+	if err != nil {
+		return false, err
+	}
+
+	rows, err := tx.Query(ctx, "SELECT * FROM compat_acks WHERE message_id = :msgid LIMIT 1", sq.PP{
+		"msgid": msgid,
+	})
+	if err != nil {
+		return false, err
+	}
+
+	res := rows.Next()
+
+	err = rows.Close()
+	if err != nil {
+		return false, err
+	}
+
+	return res, nil
+}
+
+func (db *Database) SetAck(ctx TxContext, userid models.UserID, msgid models.MessageID) error {
+	tx, err := ctx.GetOrCreateTransaction(db)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec(ctx, "INSERT INTO compat_acks (user_id, message_id) VALUES (:uid, :mid)", sq.PP{
+		"uid": userid,
+		"mid": msgid,
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

scnserver/db/impl/primary/messages.go

@@ -1,7 +1,7 @@
 package primary
 
 import (
-	"blackforestbytes.com/simplecloudnotifier/db/cursortoken"
+	ct "blackforestbytes.com/simplecloudnotifier/db/cursortoken"
 	"blackforestbytes.com/simplecloudnotifier/models"
 	"database/sql"
 	"gogs.mikescher.com/BlackForestBytes/goext/sq"
@@ -116,18 +116,18 @@ func (db *Database) DeleteMessage(ctx TxContext, messageID models.MessageID) err
 	return nil
 }
 
-func (db *Database) ListMessages(ctx TxContext, filter models.MessageFilter, pageSize int, inTok cursortoken.CursorToken) ([]models.Message, cursortoken.CursorToken, error) {
+func (db *Database) ListMessages(ctx TxContext, filter models.MessageFilter, pageSize int, inTok ct.CursorToken) ([]models.Message, ct.CursorToken, error) {
 	tx, err := ctx.GetOrCreateTransaction(db)
 	if err != nil {
-		return nil, cursortoken.CursorToken{}, err
+		return nil, ct.CursorToken{}, err
 	}
 
-	if inTok.Mode == cursortoken.CTMEnd {
-		return make([]models.Message, 0), cursortoken.End(), nil
+	if inTok.Mode == ct.CTMEnd {
+		return make([]models.Message, 0), ct.End(), nil
 	}
 
 	pageCond := "1=1"
-	if inTok.Mode == cursortoken.CTMNormal {
+	if inTok.Mode == ct.CTMNormal {
 		pageCond = "timestamp_real < :tokts OR (timestamp_real = :tokts AND message_id < :tokid )"
 	}
 
@@ -143,18 +143,18 @@ func (db *Database) ListMessages(ctx TxContext, filter models.MessageFilter, pag
 
 	rows, err := tx.Query(ctx, sqlQuery, prepParams)
 	if err != nil {
-		return nil, cursortoken.CursorToken{}, err
+		return nil, ct.CursorToken{}, err
 	}
 
 	data, err := models.DecodeMessages(rows)
 	if err != nil {
-		return nil, cursortoken.CursorToken{}, err
+		return nil, ct.CursorToken{}, err
 	}
 
 	if len(data) <= pageSize {
-		return data, cursortoken.End(), nil
+		return data, ct.End(), nil
 	} else {
-		outToken := cursortoken.Normal(data[pageSize-1].Timestamp(), data[pageSize-1].MessageID.String(), "DESC", filter.Hash())
+		outToken := ct.Normal(data[pageSize-1].Timestamp(), data[pageSize-1].MessageID.String(), "DESC", filter.Hash())
 		return data[0:pageSize], outToken, nil
 	}
 }

scnserver/db/impl/primary/schema/schema_3.ddl

@@ -183,6 +183,16 @@ CREATE UNIQUE INDEX "idx_compatids_new" ON compat_ids (new);
 CREATE UNIQUE INDEX "idx_compatids_old" ON compat_ids (old, type);
 
 
+CREATE TABLE compat_acks
+(
+    user_id         TEXT NOT NULL,
+    message_id      TEXT NOT NULL
+) STRICT;
+CREATE        INDEX "idx_compatacks_userid"           ON compat_acks (user_id);
+CREATE UNIQUE INDEX "idx_compatacks_messageid"        ON compat_acks (message_id);
+CREATE UNIQUE INDEX "idx_compatacks_userid_messageid" ON compat_acks (user_id, message_id);
+
+
 CREATE TABLE `meta`
 (
     meta_key     TEXT       NOT NULL,