mirror of
https://github.com/truewhile/MeBox.git
synced 2026-11-16 20:54:23 +08:00
app兼容接口开发
This commit is contained in:
@@ -35,16 +35,28 @@ func IsUserFavorite(ctx context.Context, repo *repository.Container, userID, med
|
|||||||
func setLocalFavorite(ctx context.Context, repo *repository.Container, userID, mediaID string, favorite bool) error {
|
func setLocalFavorite(ctx context.Context, repo *repository.Container, userID, mediaID string, favorite bool) error {
|
||||||
if favorite {
|
if favorite {
|
||||||
var existing model.Favorite
|
var existing model.Favorite
|
||||||
err := repo.DB.WithContext(ctx).
|
// 收藏行的删除是软删除;重新收藏时必须连已软删除的行一起查出来,
|
||||||
|
// 否则会再次插入同一 (user_id, media_id),撞上唯一索引后稳定返回
|
||||||
|
// 500,用户表现为“取消收藏后无法再收藏”。
|
||||||
|
err := repo.DB.WithContext(ctx).Unscoped().
|
||||||
Where("user_id = ? AND media_id = ?", userID, mediaID).
|
Where("user_id = ? AND media_id = ?", userID, mediaID).
|
||||||
First(&existing).Error
|
First(&existing).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
switch {
|
||||||
|
case errors.Is(err, gorm.ErrRecordNotFound):
|
||||||
return repo.DB.WithContext(ctx).Create(&model.Favorite{
|
return repo.DB.WithContext(ctx).Create(&model.Favorite{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
MediaID: mediaID,
|
MediaID: mediaID,
|
||||||
}).Error
|
}).Error
|
||||||
|
case err != nil:
|
||||||
|
return err
|
||||||
|
case existing.DeletedAt.Valid:
|
||||||
|
return repo.DB.WithContext(ctx).Unscoped().
|
||||||
|
Model(&model.Favorite{}).
|
||||||
|
Where("id = ?", existing.ID).
|
||||||
|
Update("deleted_at", nil).Error
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
return repo.DB.WithContext(ctx).
|
return repo.DB.WithContext(ctx).
|
||||||
Where("user_id = ? AND media_id = ?", userID, mediaID).
|
Where("user_id = ? AND media_id = ?", userID, mediaID).
|
||||||
|
|||||||
@@ -44,6 +44,19 @@ func TestSyncUserFavoriteWritesLocalForRemoteID(t *testing.T) {
|
|||||||
if favorite {
|
if favorite {
|
||||||
t.Fatal("expected remote favourite to be removed locally")
|
t.Fatal("expected remote favourite to be removed locally")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 软删除后重新收藏必须恢复原行:唯一索引 (user_id, media_id) 不允许
|
||||||
|
// 再插入一条,旧的实现会在这里返回约束错误。
|
||||||
|
if err := SyncUserFavorite(context.Background(), repos, nil, userID, remoteMediaID, true); err != nil {
|
||||||
|
t.Fatalf("SyncUserFavorite re-favorite: %v", err)
|
||||||
|
}
|
||||||
|
favorite, err = IsUserFavorite(context.Background(), repos, userID, remoteMediaID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("IsUserFavorite after re-favorite: %v", err)
|
||||||
|
}
|
||||||
|
if !favorite {
|
||||||
|
t.Fatal("expected re-favourite to restore the soft-deleted row")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFavoriteItemsIncludesRemoteFavourites(t *testing.T) {
|
func TestFavoriteItemsIncludesRemoteFavourites(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user