Fixed lastUpdated logic

mrusme · Dec 12, 2022 · fb63143 · fb63143
1 parent e76bb1e
commit fb63143
Showing 1 changed file with 29 additions and 22 deletions.
diff --git a/api/v1/bookmarks/update.go b/api/v1/bookmarks/update.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/go-playground/validator/v10"
+	"github.com/mrusme/xbsapi/ent/bookmark"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -71,29 +72,26 @@ func (h *handler) Update(ctx *fiber.Ctx) error {
 			})
 	}
 
-	dbBookmarkTmp := h.entClient.Bookmark.
-		UpdateOneID(id)
-
-	if updateBookmark.Bookmarks != "" {
-		dbBookmarkTmp = dbBookmarkTmp.
-			SetBookmarks(updateBookmark.Bookmarks)
-	}
-
-	if updateBookmark.LastUpdated != "" {
-		t, err := time.Parse(LAST_UPDATED_FORMAT, updateBookmark.LastUpdated)
-		if err != nil {
-			return ctx.
-				Status(fiber.StatusInternalServerError).
-				JSON(fiber.Map{
-					"success": false,
-					"message": err.Error(),
-				})
-		}
-		dbBookmarkTmp = dbBookmarkTmp.
-			SetLastUpdated(t)
+	lastUpdated, err := time.Parse(LAST_UPDATED_FORMAT, updateBookmark.LastUpdated)
+	if err != nil {
+		return ctx.
+			Status(fiber.StatusInternalServerError).
+			JSON(fiber.Map{
+				"success": false,
+				"message": err.Error(),
+			})
 	}
 
-	dbBookmark, err := dbBookmarkTmp.Save(context.Background())
+	now := time.Now()
+	dbBookmarkN, err := h.entClient.Bookmark.
+		Update().
+		Where(bookmark.And(
+			bookmark.ID(id),
+			bookmark.LastUpdated(lastUpdated),
+		)).
+		SetBookmarks(updateBookmark.Bookmarks).
+		SetLastUpdated(now).
+		Save(context.Background())
 
 	if err != nil {
 		return ctx.
@@ -104,8 +102,17 @@ func (h *handler) Update(ctx *fiber.Ctx) error {
 			})
 	}
 
+	if dbBookmarkN != 0 {
+		return ctx.
+			Status(fiber.StatusConflict).
+			JSON(fiber.Map{
+				"success": false,
+				"message": "Internal sync error",
+			})
+	}
+
 	showBookmark := BookmarkShowModel{
-		LastUpdated: dbBookmark.LastUpdated.Format(LAST_UPDATED_FORMAT),
+		LastUpdated: now.Format(LAST_UPDATED_FORMAT),
 	}
 
 	return ctx.