improved error handling, using existing schema

+ using existing AvatarInfo schema instead of redundant schema

+ improved error handling, so that the branding information is always
  being updated, even if its not possible to remove the old files.

+ added updated wire_gen.go file

Author: broccoli

cmd/wire_gen.go

@@ -275,13 +275,17 @@ func (sc *SiteInfoController) UpdateBranding(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-	currentBranding, _ := sc.siteInfoService.GetSiteBranding(ctx)
-	err := sc.siteInfoService.CleanUpRemovedBrandingFiles(ctx, req, currentBranding)
-	if err != nil {
-		log.Error(err)
+	currentBranding, getBrandingErr := sc.siteInfoService.GetSiteBranding(ctx)
+	if getBrandingErr == nil {
+		cleanUpErr := sc.siteInfoService.CleanUpRemovedBrandingFiles(ctx, req, currentBranding)
+		if cleanUpErr != nil {
+			log.Errorf("failed to clean up removed branding file(s): %v", cleanUpErr)
+		}
+	} else {
+		log.Errorf("failed to get current site branding: %v", getBrandingErr)
 	}
-	err = sc.siteInfoService.SaveSiteBranding(ctx, req)
-	handler.HandleResponse(ctx, err, nil)
+	saveErr := sc.siteInfoService.SaveSiteBranding(ctx, req)
+	handler.HandleResponse(ctx, saveErr, nil)
 }
 
 // UpdateSiteWrite update site write info

internal/controller_admin/siteinfo_controller.go

@@ -380,10 +380,7 @@ func (us *UserService) cleanUpRemovedAvatar(
 		return
 	}
 
-	var oldAvatar, newAvatar struct {
-		Type   string `json:"type"`
-		Custom string `json:"custom"`
-	}
+	var oldAvatar, newAvatar schema.AvatarInfo
 
 	_ = json.Unmarshal([]byte(oldAvatarJSON), &oldAvatar)
 	_ = json.Unmarshal([]byte(newAvatarJSON), &newAvatar)

internal/service/content/user_service.go

@@ -22,6 +22,7 @@ package siteinfo
 import (
 	"context"
 	"encoding/json"
+	errpkg "errors"
 	"fmt"
 	"strings"
 
@@ -448,6 +449,7 @@ func (s *SiteInfoService) CleanUpRemovedBrandingFiles(
 	newBranding *schema.SiteBrandingReq,
 	currentBranding *schema.SiteBrandingResp,
 ) error {
+	var allErrors []error
 	currentFiles := map[string]string{
 		"logo":        currentBranding.Logo,
 		"mobile_logo": currentBranding.MobileLogo,
@@ -467,18 +469,21 @@ func (s *SiteInfoService) CleanUpRemovedBrandingFiles(
 		if currentFile != "" && currentFile != newFile {
 			fileRecord, err := s.fileRecordService.GetFileRecordByURL(ctx, currentFile)
 			if err != nil {
-				log.Error(err)
+				allErrors = append(allErrors, err)
 				continue
 			}
 			if fileRecord == nil {
-				log.Error("could not fetch file record by url")
+				err := errpkg.New("file record is nil for key " + key)
+				allErrors = append(allErrors, err)
 				continue
 			}
 			if err := s.fileRecordService.DeleteAndMoveFileRecord(ctx, fileRecord); err != nil {
-				log.Error(err)
+				allErrors = append(allErrors, err)
 			}
 		}
 	}
-
+	if len(allErrors) > 0 {
+		return errpkg.Join(allErrors...)
+	}
 	return nil
 }