From ce1b5e31d5d6a69dc91d88a6fd2f1317e07dc1ea Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 11 Jun 2023 03:57:56 -0400 Subject: [PATCH] fix: rewrite sql logic --- service/files/files.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/service/files/files.go b/service/files/files.go index f18cfce..a30f717 100644 --- a/service/files/files.go +++ b/service/files/files.go @@ -80,17 +80,14 @@ func Upload(r io.ReadSeeker, size int64, hash []byte) (model.Upload, error) { } result := db.Get().Where(&model.Upload{Hash: hashHex}).First(&upload) - if (result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound)) || result.RowsAffected > 0 { - err := result.Row().Scan(&upload) + if !errors.Is(result.Error, gorm.ErrRecordNotFound) { if err != nil { logger.Get().Error(ErrFailedQueryUpload.Error(), zap.Error(err)) return upload, ErrFailedQueryUpload } - if result.RowsAffected > 0 && upload.ID > 0 { - logger.Get().Info(ErrAlreadyExists.Error()) - return upload, nil - } + logger.Get().Info(ErrAlreadyExists.Error()) + return upload, nil } objectExistsResult, err := client.R().Get(getBusObjectUrl(hashHex))