[CI-5600] Preserve subfolder structure of attachments (#251)

* [CI-5600] Preserve subfolder structure of attachments

* refactor

* fix AI review comments

* fix: rename separator variable to pathComponent

Author: AndrasEszes

test/test.go

@@ -282,7 +282,7 @@ func (results Results) Upload(apiToken, endpointBaseURL, appSlug, buildSlug stri
 				return fmt.Errorf("failed to get file info for %s: %w", asset, err)
 			}
 			uploadReq.Assets = append(uploadReq.Assets, FileInfo{
-				FileName: filepath.Base(asset),
+				FileName: relativeFilePath(asset, result.Name),
 				FileSize: int(fi.Size()),
 			})
 		}
@@ -306,7 +306,7 @@ func (results Results) Upload(apiToken, endpointBaseURL, appSlug, buildSlug stri
 
 		for _, upload := range uploadResponse.Assets {
 			for _, file := range result.AttachmentPaths {
-				if filepath.Base(file) == upload.FileName {
+				if relativeFilePath(file, result.Name) == upload.FileName {
 					fi, err := os.Open(file)
 					if err != nil {
 						return fmt.Errorf("failed to open test result attachment (%s): %w", file, err)
@@ -335,3 +335,11 @@ func (results Results) calculateTotalSizeOfXMLContent() int {
 	}
 	return totalSize
 }
+
+func relativeFilePath(absoluteFilePath, reportName string) string {
+	pathComponent := string(filepath.Separator) + reportName + string(filepath.Separator)
+	if strings.Contains(absoluteFilePath, pathComponent) {
+		return strings.SplitN(absoluteFilePath, pathComponent, 2)[1]
+	}
+	return filepath.Base(absoluteFilePath)
+}