pull/282/head
zijiren233 2 months ago
parent f81dc099ee
commit fd9294fccd

@ -12,7 +12,6 @@ import (
// import fastjson serializer
_ "github.com/synctv-org/synctv/utils/fastJSONSerializer"
"gorm.io/gorm"
"gorm.io/gorm/clause"
)
var (
@ -379,9 +378,3 @@ func HandleUpdateResult(result *gorm.DB, entityName string) error {
}
return nil
}
func OnConflictDoNothing() *gorm.DB {
return db.Clauses(clause.OnConflict{
DoNothing: true,
})
}

@ -48,7 +48,7 @@ func FirstOrCreateRoomMemberRelation(roomID, userID string, conf ...CreateRoomMe
for _, c := range conf {
c(d)
}
err := OnConflictDoNothing().Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
err := db.Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
return roomMemberRelation, err
}

@ -111,7 +111,7 @@ func GetRoomByID(id string) (*model.Room, error) {
func CreateOrLoadRoomSettings(roomID string) (*model.RoomSettings, error) {
var rs model.RoomSettings
err := OnConflictDoNothing().Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
err := db.Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
return &rs, err
}

@ -62,7 +62,7 @@ func GetSettingItemValue(name string) (string, error) {
}
func FirstOrCreateSettingItemValue(s *model.Setting) error {
return OnConflictDoNothing().Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
return db.Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
Value: s.Value,
Type: s.Type,
Group: s.Group,

@ -119,7 +119,7 @@ func CreateOrLoadUserWithProvider(username, password string, p string, puid stri
c(user)
}
user.EnableAutoAddUsernameSuffix()
err = OnConflictDoNothing().Joins("JOIN user_providers ON users.id = user_providers.user_id").
err = db.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 {

Loading…
Cancel
Save