Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

refactor: enhance resource management by adding configurable upload limits and supported types direcly to the service

Smaug67395ddafaaec7fb
diff --git a/backend/app/app.go b/backend/app/app.go
index 0c36c680..ea9e57fe 100644
--- a/backend/app/app.go
+++ b/backend/app/app.go
@@ -63,7 +63,12 @@ func InitApp(config Config) *App {
app.Repos = repoManager
// Initialize service manager
- serviceManager, err := services.NewServiceManager(repoManager, app.Snowflake, app.MinioClient)
+ resourceConfig := services.ResourceConfig{
+ MaxUploadsSize: config.Cdn.MaxUploadsSize,
+ SupportedTypes: config.Cdn.SupportedTypes,
+ SupportedTypesImages: config.Cdn.SupportedTypesImages,
+ }
+ serviceManager, err := services.NewServiceManager(repoManager, app.Snowflake, app.MinioClient, resourceConfig)
if err != nil {
log.Fatalf("Failed to initialize service manager: %v", err)
}
diff --git a/backend/controllers/resources.controller.go b/backend/controllers/resources.controller.go
index 882a5c26..ce0a7c1d 100644
--- a/backend/controllers/resources.controller.go
+++ b/backend/controllers/resources.controller.go
@@ -61,11 +61,8 @@ func (ctr *Controller) UploadFile(c *gin.Context) (int, any) {
header.Size,
fileContent,
mimeType,
- userId,
parentId,
- ctr.app.Config.Cdn.MaxUploadsSize,
- ctr.app.Config.Cdn.SupportedTypes,
- ctr.app.MinioClient,
+ userId,
)
if err != nil {
return http.StatusBadRequest, err
@@ -109,8 +106,6 @@ func (ctr *Controller) UploadAvatar(c *gin.Context) (int, any) {
fileContent,
mimeType,
userId,
- ctr.app.Config.Cdn.SupportedTypesImages,
- ctr.app.MinioClient,
)
if err != nil {
return http.StatusBadRequest, err
diff --git a/backend/services/manager.go b/backend/services/manager.go
index 8350b8ce..4cff3b37 100644
--- a/backend/services/manager.go
+++ b/backend/services/manager.go
@@ -24,10 +24,10 @@ type ServiceManager struct {
}
// NewServiceManager creates a new service manager and initializes all services
-func NewServiceManager(repos *repositories.RepositoryManager, snowflake *snowflake.Snowflake, minioClient *minio.Client) (*ServiceManager, error) {
+func NewServiceManager(repos *repositories.RepositoryManager, snowflake *snowflake.Snowflake, minioClient *minio.Client, resourceConfig ResourceConfig) (*ServiceManager, error) {
sm := &ServiceManager{}
- if err := sm.initializeServices(repos, snowflake, minioClient); err != nil {
+ if err := sm.initializeServices(repos, snowflake, minioClient, resourceConfig); err != nil {
return nil, fmt.Errorf("failed to initialize services: %w", err)
}
@@ -37,7 +37,7 @@ func NewServiceManager(repos *repositories.RepositoryManager, snowflake *snowfla
}
// initializeServices creates and initializes all service instances
-func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManager, snowflake *snowflake.Snowflake, minioClient *minio.Client) error {
+func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManager, snowflake *snowflake.Snowflake, minioClient *minio.Client, resourceConfig ResourceConfig) error {
// Initialize Auth Service
sm.Auth = NewAuthService(repos.User, repos.Session, repos.Log, snowflake)
@@ -57,7 +57,7 @@ func (sm *ServiceManager) initializeServices(repos *repositories.RepositoryManag
sm.Session = NewSessionService(repos.Session)
// Initialize Resource Service
- sm.Resource = NewResourceService(repos.Node, snowflake)
+ sm.Resource = NewResourceService(repos.Node, snowflake, minioClient, resourceConfig)
// Initialize Backup Service
sm.Backup = NewBackupService(repos.Node)
diff --git a/backend/services/resource.service.go b/backend/services/resource.service.go
index 9c044138..f09aa1cf 100644
--- a/backend/services/resource.service.go
+++ b/backend/services/resource.service.go
@@ -18,29 +18,39 @@ import (
"github.com/minio/minio-go/v7"
)
+type ResourceConfig struct {
+ MaxUploadsSize float64
+ SupportedTypes []string
+ SupportedTypesImages []string
+}
+
type ResourceService interface {
- UploadFile(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake, parentId *types.Snowflake, maxUploadsSize float64, supportedTypes []string, minioClient *minio.Client) (*models.Node, error)
- UploadAvatar(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake, supportedTypes []string, minioClient *minio.Client) error
+ UploadFile(filename string, fileSize int64, fileContent []byte, mimeType string, parentId *types.Snowflake, userId types.Snowflake) (*models.Node, error)
+ UploadAvatar(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake) error
}
type resourceService struct {
- nodeRepo repositories.NodeRepository
- snowflake *snowflake.Snowflake
+ nodeRepo repositories.NodeRepository
+ snowflake *snowflake.Snowflake
+ minioClient *minio.Client
+ config ResourceConfig
}
-func NewResourceService(nodeRepo repositories.NodeRepository, snowflake *snowflake.Snowflake) ResourceService {
+func NewResourceService(nodeRepo repositories.NodeRepository, snowflake *snowflake.Snowflake, minioClient *minio.Client, config ResourceConfig) ResourceService {
return &resourceService{
- nodeRepo: nodeRepo,
- snowflake: snowflake,
+ nodeRepo: nodeRepo,
+ snowflake: snowflake,
+ minioClient: minioClient,
+ config: config,
}
}
-func (s *resourceService) UploadFile(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake, parentId *types.Snowflake, maxUploadsSize float64, supportedTypes []string, minioClient *minio.Client) (*models.Node, error) {
- if minioClient == nil {
+func (s *resourceService) UploadFile(filename string, fileSize int64, fileContent []byte, mimeType string, parentId *types.Snowflake, userId types.Snowflake) (*models.Node, error) {
+ if s.minioClient == nil {
return nil, errors.New("minio client not initialized")
}
- if !slices.Contains(supportedTypes, mimeType) {
+ if !slices.Contains(s.config.SupportedTypes, mimeType) {
return nil, errors.New("file type not supported")
}
@@ -48,7 +58,7 @@ func (s *resourceService) UploadFile(filename string, fileSize int64, fileConten
if err != nil {
return nil, err
}
- if totalSize+fileSize > int64(maxUploadsSize) {
+ if totalSize+fileSize > int64(s.config.MaxUploadsSize) {
return nil, errors.New("total size of uploads exceeds the limit")
}
@@ -88,7 +98,7 @@ func (s *resourceService) UploadFile(filename string, fileSize int64, fileConten
}
objectName := fmt.Sprintf("%d/%d%s", userId, id, ext)
- _, err = minioClient.PutObject(context.Background(), os.Getenv("MINIO_BUCKET"), objectName, bytes.NewReader(fileContent), fileSize, minio.PutObjectOptions{ContentType: mimeType})
+ _, err = s.minioClient.PutObject(context.Background(), os.Getenv("MINIO_BUCKET"), objectName, bytes.NewReader(fileContent), fileSize, minio.PutObjectOptions{ContentType: mimeType})
if err != nil {
return nil, err
}
@@ -96,16 +106,16 @@ func (s *resourceService) UploadFile(filename string, fileSize int64, fileConten
return node, nil
}
-func (s *resourceService) UploadAvatar(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake, supportedTypes []string, minioClient *minio.Client) error {
- if minioClient == nil {
+func (s *resourceService) UploadAvatar(filename string, fileSize int64, fileContent []byte, mimeType string, userId types.Snowflake) error {
+ if s.minioClient == nil {
return errors.New("minio client not initialized")
}
- if !slices.Contains(supportedTypes, mimeType) {
+ if !slices.Contains(s.config.SupportedTypesImages, mimeType) {
return errors.New("file type not supported")
}
objectName := fmt.Sprintf("%d/avatar", userId)
- _, err := minioClient.PutObject(context.Background(), os.Getenv("MINIO_BUCKET"), objectName, bytes.NewReader(fileContent), fileSize, minio.PutObjectOptions{ContentType: mimeType})
+ _, err := s.minioClient.PutObject(context.Background(), os.Getenv("MINIO_BUCKET"), objectName, bytes.NewReader(fileContent), fileSize, minio.PutObjectOptions{ContentType: mimeType})
return err
}