Merge pull request #78 from swibly/develop

internal/controller/http/v1/auth.go

@@ -225,7 +225,7 @@ func UploadUserImage(ctx *gin.Context) {
 		return
 	}
 
-	if err := service.User.SetProfilePicture(issuer.ID, userProfilePicture.Image); err != nil {
+	if err := service.User.SetProfilePicture(issuer, userProfilePicture.Image); err != nil {
 		if errors.Is(err, aws.ErrUnsupportedFileType) {
 			log.Print(err)
 			ctx.JSON(http.StatusBadRequest, gin.H{"error": dict.UnsupportedFileType})
@@ -277,7 +277,7 @@ func RemoveUserImage(ctx *gin.Context) {
 
 	issuer := ctx.Keys["auth_user"].(*dto.UserProfile)
 
-	if err := service.User.RemoveProfilePicture(issuer.ID, issuer.Email); err != nil {
+	if err := service.User.RemoveProfilePicture(issuer); err != nil {
 		log.Print(err)
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": dict.InternalServerError})
 		return

internal/service/repository/project.go

@@ -344,6 +344,19 @@ func (pr *projectRepository) Update(projectID uint, updateModel *dto.ProjectUpda
 	}
 
 	if updateModel.BannerImage != nil {
+		var project model.Project
+		if err := tx.Where("id = ?", projectID).First(&project).Error; err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		if project.BannerURL != "" {
+			if err := aws.DeleteProjectImage(project.BannerURL); err != nil {
+				tx.Rollback()
+				return err
+			}
+		}
+
 		url, err := aws.UploadProjectImage(projectID, updateModel.BannerImage)
 		if err != nil {
 			tx.Rollback()
@@ -779,7 +792,7 @@ func (pr *projectRepository) UnsafeDelete(id uint) error {
 		return err
 	}
 
-	if err := aws.DeleteProjectImage(id); err != nil {
+	if err := aws.DeleteProjectImage(project.BannerURL); err != nil {
 		tx.Rollback()
 		return err
 	}
@@ -877,7 +890,7 @@ func (pr *projectRepository) ClearTrash(userID uint) error {
 	}
 
 	for _, project := range projects {
-		if err := aws.DeleteProjectImage(project.ID); err != nil {
+		if err := aws.DeleteProjectImage(project.BannerURL); err != nil {
 			tx.Rollback()
 			return err
 		}

internal/service/repository/user.go

@@ -139,11 +139,20 @@ func (u userRepository) Delete(id uint) error {
 	}
 
 	for _, projectID := range projectIDs {
-		if err := tx.Where("id = ?", projectID).Unscoped().Delete(&model.Project{}).Error; err != nil {
+		var project model.Project
+		if err := tx.Where("id = ?", projectID).First(&project).Error; err != nil {
 			tx.Rollback()
 			return err
 		}
-		if err := aws.DeleteProjectImage(projectID); err != nil {
+
+		if project.BannerURL != "" {
+			if err := aws.DeleteProjectImage(project.BannerURL); err != nil {
+				tx.Rollback()
+				return err
+			}
+		}
+
+		if err := tx.Where("id = ?", projectID).Unscoped().Delete(&model.Project{}).Error; err != nil {
 			tx.Rollback()
 			return err
 		}

internal/service/usecase/user.go

@@ -106,25 +106,29 @@ func (uuc UserUseCase) Update(id uint, newModel *dto.UserUpdate) error {
 	return uuc.ur.Update(id, newModel)
 }
 
-func (uuc UserUseCase) SetProfilePicture(id uint, file *multipart.FileHeader) error {
-	url, err := aws.UploadUserImage(id, file)
+func (uuc UserUseCase) SetProfilePicture(user *dto.UserProfile, file *multipart.FileHeader) error {
+	if err := aws.DeleteUserImage(user.ProfilePicture); err != nil {
+		return err
+	}
+
+	url, err := aws.UploadUserImage(user.ID, file)
 	if err != nil {
 		return err
 	}
 
-	return uuc.Update(id, &dto.UserUpdate{
+	return uuc.Update(user.ID, &dto.UserUpdate{
 		ProfilePicture: &url,
 	})
 }
 
-func (uuc UserUseCase) RemoveProfilePicture(id uint, email string) error {
-	hasher := sha256.Sum256([]byte(email))
+func (uuc UserUseCase) RemoveProfilePicture(user *dto.UserProfile) error {
+	hasher := sha256.Sum256([]byte(user.Email))
 
-	if err := aws.DeleteUserImage(id); err != nil {
+	if err := aws.DeleteUserImage(user.ProfilePicture); err != nil {
 		return err
 	}
 
-	return uuc.Update(id, &dto.UserUpdate{
+	return uuc.Update(user.ID, &dto.UserUpdate{
 		ProfilePicture: utils.ToPtr(fmt.Sprintf("https://www.gravatar.com/avatar/%s?s=512&d=monsterid&r=g", hex.EncodeToString(hasher[:]))),
 	})
 }

pkg/aws/s3.go

@@ -7,8 +7,10 @@ import (
 	"io"
 	"mime/multipart"
 	"path"
+	"path/filepath"
 	"slices"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
@@ -84,7 +86,7 @@ func UploadProjectImage(projectID uint, file *multipart.FileHeader) (string, err
 		return "", ErrUnableToDecode
 	}
 
-	outputPath := fmt.Sprintf("projects/%d.webp", projectID)
+	outputPath := fmt.Sprintf("projects/%d-%d.webp", time.Now().Unix(), projectID)
 	var buf bytes.Buffer
 
 	err = webp.Encode(&buf, img, nil)
@@ -100,8 +102,8 @@ func UploadProjectImage(projectID uint, file *multipart.FileHeader) (string, err
 	return url, nil
 }
 
-func DeleteProjectImage(projectID uint) error {
-	return AWS.DeleteFile(fmt.Sprintf("projects/%d.webp", projectID))
+func DeleteProjectImage(filename string) error {
+	return AWS.DeleteFile(fmt.Sprintf("projects/%s", filepath.Base(filename)))
 }
 
 func UploadUserImage(userID uint, file *multipart.FileHeader) (string, error) {
@@ -128,7 +130,7 @@ func UploadUserImage(userID uint, file *multipart.FileHeader) (string, error) {
 		return "", ErrUnableToDecode
 	}
 
-	outputPath := fmt.Sprintf("users/%d.webp", userID)
+	outputPath := fmt.Sprintf("users/%d-%d.webp", time.Now().Unix(), userID)
 	var buf bytes.Buffer
 
 	err = webp.Encode(&buf, img, nil)
@@ -144,6 +146,6 @@ func UploadUserImage(userID uint, file *multipart.FileHeader) (string, error) {
 	return url, nil
 }
 
-func DeleteUserImage(userID uint) error {
-	return AWS.DeleteFile(fmt.Sprintf("users/%d.webp", userID))
+func DeleteUserImage(filename string) error {
+	return AWS.DeleteFile(fmt.Sprintf("users/%s", filepath.Base(filename)))
 }