Migrate all callers to unified filemanager.Service
Signed-off-by: Ludovic Vielle <ludovic@probo.com>
This commit is contained in:
@@ -202,7 +202,7 @@ func (s FileService) GenerateFileURL(
|
||||
return "", fmt.Errorf("cannot get file: %w", err)
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
|
||||
@@ -866,7 +866,7 @@ func (s FrameworkService) GenerateLightLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
@@ -908,7 +908,7 @@ func (s FrameworkService) GenerateDarkLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import (
|
||||
"go.gearno.de/crypto/uuid"
|
||||
"go.gearno.de/kit/pg"
|
||||
"go.probo.inc/probo/pkg/coredata"
|
||||
"go.probo.inc/probo/pkg/filemanager"
|
||||
"go.probo.inc/probo/pkg/filevalidation"
|
||||
"go.probo.inc/probo/pkg/gid"
|
||||
"go.probo.inc/probo/pkg/validator"
|
||||
@@ -295,7 +296,7 @@ func (s OrganizationService) Update(
|
||||
}
|
||||
}
|
||||
|
||||
fileSize, err := s.svc.fileManager.GetFileSize(req.File.Content)
|
||||
fileSize, err := filemanager.GetFileSize(req.File.Content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot get file size: %w", err)
|
||||
}
|
||||
@@ -359,7 +360,7 @@ func (s OrganizationService) Update(
|
||||
}
|
||||
}
|
||||
|
||||
fileSize, err := s.svc.fileManager.GetFileSize(req.HorizontalLogoFile.Content)
|
||||
fileSize, err := filemanager.GetFileSize(req.HorizontalLogoFile.Content)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot get file size: %w", err)
|
||||
}
|
||||
@@ -450,7 +451,7 @@ func (s OrganizationService) GenerateLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
@@ -492,7 +493,7 @@ func (s OrganizationService) GenerateHorizontalLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@ import (
|
||||
"go.probo.inc/probo/pkg/coredata"
|
||||
"go.probo.inc/probo/pkg/crypto/cipher"
|
||||
"go.probo.inc/probo/pkg/esign"
|
||||
"go.probo.inc/probo/pkg/file"
|
||||
"go.probo.inc/probo/pkg/filemanager"
|
||||
"go.probo.inc/probo/pkg/filevalidation"
|
||||
"go.probo.inc/probo/pkg/gid"
|
||||
@@ -80,7 +79,6 @@ type (
|
||||
html2pdfConverter *html2pdf.Converter
|
||||
acmeService *certmanager.ACMEService
|
||||
fileManager *filemanager.Service
|
||||
file *file.Service
|
||||
logger *log.Logger
|
||||
slack *slack.Service
|
||||
esign *esign.Service
|
||||
@@ -145,7 +143,6 @@ func NewService(
|
||||
esignService *esign.Service,
|
||||
connectorRegistry *connector.ConnectorRegistry,
|
||||
invitationTokenValidity time.Duration,
|
||||
fileService *file.Service,
|
||||
) (*Service, error) {
|
||||
if bucket == "" {
|
||||
return nil, fmt.Errorf("bucket is required")
|
||||
@@ -165,7 +162,6 @@ func NewService(
|
||||
html2pdfConverter: html2pdfConverter,
|
||||
acmeService: acmeService,
|
||||
fileManager: fileManagerService,
|
||||
file: fileService,
|
||||
logger: logger,
|
||||
slack: slackService,
|
||||
esign: esignService,
|
||||
|
||||
@@ -27,6 +27,7 @@ import (
|
||||
"go.gearno.de/crypto/uuid"
|
||||
"go.gearno.de/kit/pg"
|
||||
"go.probo.inc/probo/pkg/coredata"
|
||||
"go.probo.inc/probo/pkg/filemanager"
|
||||
"go.probo.inc/probo/pkg/filevalidation"
|
||||
"go.probo.inc/probo/pkg/gid"
|
||||
"go.probo.inc/probo/pkg/page"
|
||||
@@ -160,7 +161,7 @@ func (s TrustCenterFileService) Create(
|
||||
filename := req.File.Filename
|
||||
contentType := req.File.ContentType
|
||||
|
||||
fileSize, err := s.svc.fileManager.GetFileSize(req.File.Content)
|
||||
fileSize, err := filemanager.GetFileSize(req.File.Content)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot get file size: %w", err)
|
||||
}
|
||||
@@ -313,7 +314,7 @@ func (s TrustCenterFileService) GenerateFileURL(
|
||||
return "", err
|
||||
}
|
||||
|
||||
fileURL, err := s.svc.fileManager.GenerateFileURL(ctx, storedFile, duration)
|
||||
fileURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, storedFile, duration)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
|
||||
@@ -305,7 +305,7 @@ func (s TrustCenterReferenceService) GenerateLogoURL(
|
||||
return "", fmt.Errorf("cannot load trust center reference: %w", err)
|
||||
}
|
||||
|
||||
return s.svc.file.GenerateFileURL(ctx, reference.LogoFileID)
|
||||
return s.svc.fileManager.GenerateFileURL(ctx, reference.LogoFileID)
|
||||
}
|
||||
|
||||
func (s TrustCenterReferenceService) uploadLogoFile(
|
||||
|
||||
@@ -500,7 +500,7 @@ func (s TrustCenterService) GenerateNDAFileURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
@@ -546,7 +546,7 @@ func (s TrustCenterService) GenerateLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
@@ -592,7 +592,7 @@ func (s TrustCenterService) GenerateDarkLogoURL(
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
presignedURL, err := s.svc.fileManager.GenerateFileURL(ctx, file, expiresIn)
|
||||
presignedURL, err := s.svc.fileManager.GeneratePresignedFileURL(ctx, file, expiresIn)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot generate file URL: %w", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user