Apply suggestions from code review

Co-authored-by: Joakim Bygdell <joakim.bygdell@nbis.se>

sda/cmd/s3inbox/proxy.go

@@ -203,7 +203,6 @@ func (p *Proxy) allowedResponse(w http.ResponseWriter, r *http.Request, token jw
 		// The following block is for treating the case when the client loses connection to the server and then it reconnects to a
 		// different instance of s3inbox. For more details see #1358.
 		if p.fileIds[r.URL.Path] == "" {
-
 			p.fileIds[r.URL.Path], err = p.database.GetFileIDByUserPathAndStatus(username, filepath, "registered")
 			if err != nil {
 				p.internalServerError(w, r, fmt.Sprintf("failed to retrieve fileID from database: %v", err))

sda/internal/database/db_functions.go

@@ -110,7 +110,7 @@ func (dbs *SDAdb) GetFileIDByUserPathAndStatus(submissionUser, filePath, status
 	// 2, 4, 8, 16, 32 seconds between each retry event.
 	for count := 1; count <= RetryTimes; count++ {
 		fileID, err = dbs.getFileIDByUserPathAndStatus(submissionUser, filePath, status)
-		if err == nil {
+		if err == nil || strings.Contains(err.Error(), "sql: no rows in result set") {
 			break
 		}
 		time.Sleep(time.Duration(math.Pow(2, float64(count))) * time.Second)

sda/internal/database/db_functions_test.go

@@ -1239,6 +1239,9 @@ func (suite *DatabaseTests) TestGetFileIDByUserPathAndStatus() {
 	if err != nil {
 		suite.FailNow("Failed to register file")
 	}
+	// sanity check - shold fail
+	_, err = db.getFileIDByUserPathAndStatus("wrong-user", filePath, "registered")
+	assert.EqualError(suite.T(), err, "sql: no rows in result set")
 
 	// check happy path
 	fileID2, err := db.getFileIDByUserPathAndStatus(user, filePath, "registered")