controller/auth.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"git.lumeweb.com/LumeWeb/portal/controller/request"
 	"git.lumeweb.com/LumeWeb/portal/controller/response"
-	"git.lumeweb.com/LumeWeb/portal/middleware"
 	"git.lumeweb.com/LumeWeb/portal/service/auth"
 	"github.com/kataras/iris/v12"
 )
@@ -100,13 +99,3 @@ func (a *AuthController) PostLogout() {
 	// Return a success response to the client.
 	a.Ctx.StatusCode(iris.StatusNoContent)
 }
-
-func (a *AuthController) GetStatus() {
-	middleware.VerifyJwt(a.Ctx)
-
-	if a.Ctx.IsStopped() {
-		return
-	}
-
-	a.respondJSON(&response.AuthStatusResponse{Status: true})
-}

controller/files.go

@@ -128,7 +128,7 @@ func (f *FilesController) GetStatusBy(cidString string) {
 		break
 	}
 
-	f.respondJSON(&response.FileStatusResponse{Status: statusCode})
+	f.respondJSON(&response.StatusResponse{Status: statusCode})
 
 }
 

controller/response/auth_status.go

@@ -1,5 +0,0 @@
-package response
-
-type AuthStatusResponse struct {
-	Status bool `json:"status"`
-}

controller/response/status.go

@@ -1,5 +1,5 @@
 package response
 
-type FileStatusResponse struct {
+type StatusResponse struct {
 	Status string `json:"status"`
 }

service/files/files.go

@@ -80,15 +80,18 @@ func Upload(r io.ReadSeeker, size int64, hash []byte) (model.Upload, error) {
 	}
 
 	result := db.Get().Where(&model.Upload{Hash: hashHex}).First(&upload)
-	if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+	if (result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound)) || result.RowsAffected > 0 {
+		err := result.Row().Scan(&upload)
 		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
 		}
+	}
 
 	objectExistsResult, err := client.R().Get(getBusObjectUrl(hashHex))