code refactor

pkg/services/base.go

@@ -1,10 +1,13 @@
 package services
 
 import (
+	"fmt"
+
 	"github.com/mayswind/ezbookkeeping/pkg/datastore"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/mail"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/storage"
 	"github.com/mayswind/ezbookkeeping/pkg/uuid"
 )
 
@@ -76,3 +79,32 @@ func (s *ServiceUsingUuid) GenerateUuid(uuidType uuid.UuidType) int64 {
 func (s *ServiceUsingUuid) GenerateUuids(uuidType uuid.UuidType, count uint8) []int64 {
 	return s.container.GenerateUuids(uuidType, count)
 }
+
+// ServiceUsingStorage represents a service that need to use storage
+type ServiceUsingStorage struct {
+	container *storage.StorageContainer
+}
+
+// ExistsAvatar returns whether the user avatar exists from the current avatar object storage
+func (s *ServiceUsingStorage) ExistsAvatar(uid int64, fileExtension string) (bool, error) {
+	return s.container.ExistsAvatar(s.getUserAvatarPath(uid, fileExtension))
+}
+
+// ReadAvatar returns the user avatar from the current avatar object storage
+func (s *ServiceUsingStorage) ReadAvatar(uid int64, fileExtension string) (storage.ObjectInStorage, error) {
+	return s.container.ReadAvatar(s.getUserAvatarPath(uid, fileExtension))
+}
+
+// SaveAvatar returns whether save the user avatar into the current avatar object storage successfully
+func (s *ServiceUsingStorage) SaveAvatar(uid int64, object storage.ObjectInStorage, fileExtension string) error {
+	return s.container.SaveAvatar(s.getUserAvatarPath(uid, fileExtension), object)
+}
+
+// DeleteAvatar returns whether delete the user avatar from the current avatar object storage successfully
+func (s *ServiceUsingStorage) DeleteAvatar(uid int64, fileExtension string) error {
+	return s.container.DeleteAvatar(s.getUserAvatarPath(uid, fileExtension))
+}
+
+func (s *ServiceUsingStorage) getUserAvatarPath(uid int64, fileExtension string) string {
+	return fmt.Sprintf("%d.%s", uid, fileExtension)
+}

pkg/services/users.go

@@ -3,7 +3,10 @@ package services
 import (
 	"bytes"
 	"fmt"
+	"io"
+	"mime/multipart"
 	"net/url"
+	"os"
 	"time"
 
 	"xorm.io/xorm"
@@ -12,9 +15,11 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/datastore"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/locales"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
 	"github.com/mayswind/ezbookkeeping/pkg/mail"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/storage"
 	"github.com/mayswind/ezbookkeeping/pkg/templates"
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 	"github.com/mayswind/ezbookkeeping/pkg/uuid"
@@ -28,6 +33,7 @@ type UserService struct {
 	ServiceUsingConfig
 	ServiceUsingMailer
 	ServiceUsingUuid
+	ServiceUsingStorage
 }
 
 // Initialize a user service singleton instance
@@ -45,6 +51,9 @@ var (
 		ServiceUsingUuid: ServiceUsingUuid{
 			container: uuid.Container,
 		},
+		ServiceUsingStorage: ServiceUsingStorage{
+			container: storage.Container,
+		},
 	}
 )
 
@@ -126,6 +135,50 @@ func (s *UserService) GetUserByEmail(c *core.Context, email string) (*models.Use
 	return user, nil
 }
 
+// GetUserAvatar returns the user avatar image data and image file extension according to user uid
+func (s *UserService) GetUserAvatar(c *core.Context, uid int64, fileExtension string) ([]byte, error) {
+	if uid <= 0 {
+		return nil, errs.ErrUserIdInvalid
+	}
+
+	user := &models.User{}
+	has, err := s.UserDB().NewSession(c).ID(uid).Cols("uid", "deleted", "custom_avatar_type").Where("deleted=?", false).Get(user)
+
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.CustomAvatarType == "" {
+		return nil, errs.ErrUserAvatarNotSet
+	}
+
+	if user.CustomAvatarType != fileExtension {
+		return nil, errs.ErrUserAvatarExtensionInvalid
+	}
+
+	avatarFile, err := s.ReadAvatar(user.Uid, user.CustomAvatarType)
+
+	if os.IsNotExist(err) {
+		return nil, errs.ErrUserAvatarNoExists
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	defer avatarFile.Close()
+
+	avatarData, err := io.ReadAll(avatarFile)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return avatarData, nil
+}
+
 // CreateUser saves a new user model to database
 func (s *UserService) CreateUser(c *core.Context, user *models.User) error {
 	exists, err := s.ExistsUsername(c, user.Username)
@@ -294,16 +347,63 @@ func (s *UserService) UpdateUser(c *core.Context, user *models.User, modifyUserL
 	return keyProfileUpdated, emailSetToUnverified, nil
 }
 
-// UpdateUserAvatar updated the custom avatar type of specified user
-func (s *UserService) UpdateUserAvatar(c *core.Context, uid int64, customAvatarType string) error {
+// UpdateUserAvatar updates the custom avatar type of specified user
+func (s *UserService) UpdateUserAvatar(c *core.Context, uid int64, avatarFile multipart.File, fileExtension string, oldFileExtension string) error {
 	if uid <= 0 {
 		return errs.ErrUserIdInvalid
 	}
 
+	defer avatarFile.Close()
+
+	err := s.SaveAvatar(uid, avatarFile, fileExtension)
+
+	if err != nil {
+		return err
+	}
+
 	now := time.Now().Unix()
 
 	updateModel := &models.User{
-		CustomAvatarType: customAvatarType,
+		CustomAvatarType: fileExtension,
+		UpdatedUnixTime:  now,
+	}
+
+	err = s.UserDB().DoTransaction(c, func(sess *xorm.Session) error {
+		_, err := sess.ID(uid).Cols("custom_avatar_type", "updated_unix_time").Where("deleted=?", false).Update(updateModel)
+		return err
+	})
+
+	if err != nil {
+		return err
+	}
+
+	if fileExtension != oldFileExtension && oldFileExtension != "" {
+		err = s.DeleteAvatar(uid, oldFileExtension)
+
+		if err != nil {
+			log.WarnfWithRequestId(c, "[users.UpdateUserAvatar] failed to delete old avatar with extension \"%s\" for user \"uid:%d\", because %s", oldFileExtension, uid, err.Error())
+		}
+	}
+
+	return nil
+}
+
+// RemoveUserAvatar removes the custom avatar type of specified user
+func (s *UserService) RemoveUserAvatar(c *core.Context, uid int64, fileExtension string) error {
+	if uid <= 0 {
+		return errs.ErrUserIdInvalid
+	}
+
+	err := s.DeleteAvatar(uid, fileExtension)
+
+	if err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	now := time.Now().Unix()
+
+	updateModel := &models.User{
+		CustomAvatarType: "",
 		UpdatedUnixTime:  now,
 	}