fix: remove low file code from domain

This commit is contained in:
Floriansylvain
2025-12-22 02:41:09 +01:00
parent 76245c47c9
commit ce787d26ff
5 changed files with 26 additions and 18 deletions
+8 -1
View File
@@ -1,6 +1,7 @@
package image package image
import ( import (
"RenewCMS/internal/domain/image"
"RenewCMS/internal/infrastructure/useCases" "RenewCMS/internal/infrastructure/useCases"
"encoding/json" "encoding/json"
"net/http" "net/http"
@@ -32,8 +33,14 @@ func (h *Handler) PostImage(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
return return
} }
defer file.Close()
newImage, err := h.CreateUseCase.CreateImage(file, *fileHeader) newImage, err := h.CreateUseCase.CreateImage(image.ImageInput{
Content: file,
Filename: fileHeader.Filename,
Size: fileHeader.Size,
ContentType: fileHeader.Header.Get("Content-Type"),
})
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
+8
View File
@@ -1,9 +1,17 @@
package image package image
import ( import (
"io"
"time" "time"
) )
type ImageInput struct {
Content io.Reader
Filename string
Size int64
ContentType string
}
type Image struct { type Image struct {
ID uint32 `json:"id"` ID uint32 `json:"id"`
Path string `json:"path"` Path string `json:"path"`
@@ -1,10 +1,6 @@
package image package image
import (
"mime/multipart"
)
type Repository interface { type Repository interface {
Create(file multipart.File, fileHeader multipart.FileHeader) (Image, error) Create(input ImageInput) (Image, error)
Delete(id uint32) error Delete(id uint32) error
} }
@@ -5,7 +5,7 @@ import (
"RenewCMS/internal/infrastructure/persistence/mappers" "RenewCMS/internal/infrastructure/persistence/mappers"
entity "RenewCMS/internal/infrastructure/persistence/models" entity "RenewCMS/internal/infrastructure/persistence/models"
"errors" "errors"
"mime/multipart" "io"
"os" "os"
"path/filepath" "path/filepath"
@@ -28,11 +28,10 @@ var contentTypeExtensions = map[string]string{
"image/svg+xml": ".svg", "image/svg+xml": ".svg",
} }
func (i ImageRepository) Create(file multipart.File, fileHeader multipart.FileHeader) (domain.Image, error) { func (i ImageRepository) Create(input domain.ImageInput) (domain.Image, error) {
uploadDir := os.Getenv("UPLOAD_DIR") uploadDir := os.Getenv("UPLOAD_DIR")
fileBytes := make([]byte, fileHeader.Size) fileBytes, err := io.ReadAll(input.Content)
_, err := file.Read(fileBytes)
if err != nil { if err != nil {
return domain.Image{}, err return domain.Image{}, err
} }
@@ -42,8 +41,7 @@ func (i ImageRepository) Create(file multipart.File, fileHeader multipart.FileHe
return domain.Image{}, err return domain.Image{}, err
} }
contentType := fileHeader.Header.Get("Content-Type") extension := contentTypeExtensions[input.ContentType]
extension := contentTypeExtensions[contentType]
if extension == "" { if extension == "" {
return domain.Image{}, errors.New("the file must be a PNG, JPEG, WEBP, or SVG image") return domain.Image{}, errors.New("the file must be a PNG, JPEG, WEBP, or SVG image")
} }
@@ -64,13 +62,13 @@ func (i ImageRepository) Create(file multipart.File, fileHeader multipart.FileHe
func (i ImageRepository) Delete(id uint32) error { func (i ImageRepository) Delete(id uint32) error {
uploadDir := os.Getenv("UPLOAD_DIR") uploadDir := os.Getenv("UPLOAD_DIR")
var image entity.Image var entityImage entity.Image
err := i.db.Model(&entity.Image{}).First(&image, id).Error err := i.db.Model(&entity.Image{}).First(&entityImage, id).Error
if err != nil { if err != nil {
return err return err
} }
fileName := filepath.Base(image.Path) fileName := filepath.Base(entityImage.Path)
err = os.Remove(filepath.Join(uploadDir, fileName)) err = os.Remove(filepath.Join(uploadDir, fileName))
if err != nil { if err != nil {
return err return err
@@ -2,7 +2,6 @@ package useCases
import ( import (
"RenewCMS/internal/domain/image" "RenewCMS/internal/domain/image"
"mime/multipart"
) )
type CreateImageUseCase struct { type CreateImageUseCase struct {
@@ -13,6 +12,6 @@ func NewCreateImageUseCase(imageRepository image.Repository) *CreateImageUseCase
return &CreateImageUseCase{imageRepository} return &CreateImageUseCase{imageRepository}
} }
func (g *CreateImageUseCase) CreateImage(file multipart.File, fileHeader multipart.FileHeader) (image.Image, error) { func (g *CreateImageUseCase) CreateImage(input image.ImageInput) (image.Image, error) {
return g.imageRepository.Create(file, fileHeader) return g.imageRepository.Create(input)
} }