Merge pull request #172 from stz184/fixed-issue-deleting-users

* Fixes photoview/photoview#168
This commit is contained in:
Viktor Strate Kløvedal
2021-01-25 09:30:52 +01:00
committed by GitHub

View File

@@ -211,17 +211,52 @@ func (r *mutationResolver) CreateUser(ctx context.Context, username string, pass
}
func (r *mutationResolver) DeleteUser(ctx context.Context, id int) (*models.User, error) {
var user models.User
deletedAlbumIDs := make([]int, 0)
if err := r.Database.First(&user, id).Error; err != nil {
err := r.Database.Transaction(func(tx *gorm.DB) error {
if err := tx.First(&user, id).Error; err != nil {
return err
}
userAlbums := user.Albums
if err := tx.Model(&user).Association("Albums").Find(&userAlbums); err != nil {
return err
}
if err := tx.Model(&user).Association("Albums").Clear(); err != nil {
return err
}
for _, album := range userAlbums {
var associatedUsers = tx.Model(album).Association("Owners").Count()
if associatedUsers == 0 {
deletedAlbumIDs = append(deletedAlbumIDs, album.ID)
if err := tx.Delete(album).Error; err != nil {
return err
}
}
}
if err := tx.Delete(&user).Error; err != nil {
return err
}
return nil
})
if err != nil {
return nil, err
}
if err := r.Database.Delete(&user).Error; err != nil {
return nil, err
// If there is only one associated user, clean up the cache folder and delete the album row
for _, deletedAlbumID := range deletedAlbumIDs {
cachePath := path.Join(scanner.MediaCachePath(), strconv.Itoa(int(deletedAlbumID)))
if err := os.RemoveAll(cachePath); err != nil {
return &user, err
}
}
return &user, nil
}