fix: atomic first or create recore

synctv-org · Oct 8, 2024 · 8e636fd · 8e636fd
1 parent c006f8b
commit 8e636fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/internal/db/db.go b/internal/db/db.go
@@ -11,6 +11,7 @@ import (
 	"github.com/synctv-org/synctv/utils"
 	_ "github.com/synctv-org/synctv/utils/fastJSONSerializer"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 var (
@@ -366,3 +367,9 @@ func HandleUpdateResult(result *gorm.DB, entityName string) error {
 	}
 	return nil
 }
+
+func OnConflictDoNothing() *gorm.DB {
+	return db.Clauses(clause.OnConflict{
+		DoNothing: true,
+	})
+}
diff --git a/internal/db/member.go b/internal/db/member.go
@@ -44,7 +44,7 @@ func FirstOrCreateRoomMemberRelation(roomID, userID string, conf ...CreateRoomMe
 	for _, c := range conf {
 		c(d)
 	}
-	err := db.Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
+	err := OnConflictDoNothing().Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
 	return roomMemberRelation, err
 }
 

diff --git a/internal/db/room.go b/internal/db/room.go
@@ -107,7 +107,7 @@ func GetRoomByID(id string) (*model.Room, error) {
 
 func CreateOrLoadRoomSettings(roomID string) (*model.RoomSettings, error) {
 	var rs model.RoomSettings
-	err := db.Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
+	err := OnConflictDoNothing().Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
 	return &rs, HandleNotFound(err, "room")
 }
 

diff --git a/internal/db/setting.go b/internal/db/setting.go
@@ -58,7 +58,7 @@ func GetSettingItemValue(name string) (string, error) {
 }
 
 func FirstOrCreateSettingItemValue(s *model.Setting) error {
-	return db.Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
+	return OnConflictDoNothing().Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
 		Value: s.Value,
 		Type:  s.Type,
 		Group: s.Group,

diff --git a/internal/db/user.go b/internal/db/user.go
@@ -116,7 +116,7 @@ func CreateOrLoadUserWithProvider(username, password string, p provider.OAuth2Pr
 		c(user)
 	}
 	user.EnableAutoAddUsernameSuffix()
-	err = db.Joins("JOIN user_providers ON users.id = user_providers.user_id").
+	err = OnConflictDoNothing().Joins("JOIN user_providers ON users.id = user_providers.user_id").
 		Where("user_providers.provider = ? AND user_providers.provider_user_id = ?", p, puid).
 		FirstOrCreate(user).Error
 	if err != nil {