This commit is contained in:
Anang Yusman 2026-01-27 18:05:34 +08:00
parent 1098c22738
commit 6ac6e6ea9c
2 changed files with 66 additions and 103 deletions

View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"jaecoo-be/app/database/entity" "jaecoo-be/app/database/entity"
res "jaecoo-be/app/module/products/response" res "jaecoo-be/app/module/products/response"
"path/filepath"
) )
func ProductsResponseMapper(product *entity.Products, host string) *res.ProductsResponse { func ProductsResponseMapper(product *entity.Products, host string) *res.ProductsResponse {
@ -24,9 +25,11 @@ func ProductsResponseMapper(product *entity.Products, host string) *res.Products
for _, c := range rawColors { for _, c := range rawColors {
var imageUrl *string var imageUrl *string
if c.ImagePath != nil && *c.ImagePath != "" { if c.ImagePath != nil {
url := host + "/products/viewer/" + *c.ImagePath filename := filepath.Base(*c.ImagePath)
url := host + "/products/viewer/" + filename
imageUrl = &url imageUrl = &url
} }
colors = append(colors, res.ProductColorResponse{ colors = append(colors, res.ProductColorResponse{
@ -37,6 +40,7 @@ func ProductsResponseMapper(product *entity.Products, host string) *res.Products
} }
} }
response := &res.ProductsResponse{ response := &res.ProductsResponse{
ID: product.ID, ID: product.ID,
Title: product.Title, Title: product.Title,
@ -52,7 +56,9 @@ func ProductsResponseMapper(product *entity.Products, host string) *res.Products
} }
if product.ThumbnailPath != nil && *product.ThumbnailPath != "" { if product.ThumbnailPath != nil && *product.ThumbnailPath != "" {
thumbnailUrl := host + "/products/viewer/" + *product.ThumbnailPath // Extract filename from path
filename := filepath.Base(*product.ThumbnailPath)
thumbnailUrl := host + "/products/viewer/" + filename
response.ThumbnailUrl = &thumbnailUrl response.ThumbnailUrl = &thumbnailUrl
} }

View File

@ -307,111 +307,68 @@ func (_i *productsService) Delete(id uint) (err error) {
return return
} }
// func (_i *productsService) Viewer(c *fiber.Ctx) (err error) { func (_i *productsService) Viewer(c *fiber.Ctx) (err error) {
// filename := c.Params("filename") filename := c.Params("filename")
// // Find product by filename (repository will search using LIKE pattern) // Find product by filename (repository will search using LIKE pattern)
// result, err := _i.Repo.FindByThumbnailPath(filename) result, err := _i.Repo.FindByThumbnailPath(filename)
// if err != nil { if err != nil {
// return c.Status(fiber.StatusNotFound).JSON(fiber.Map{ return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
// "error": true,
// "msg": "Product file not found",
// })
// }
// if result.ThumbnailPath == nil || *result.ThumbnailPath == "" {
// return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
// "error": true,
// "msg": "Product thumbnail path not found",
// })
// }
// ctx := context.Background()
// bucketName := _i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName
// objectName := *result.ThumbnailPath
// _i.Log.Info().Str("timestamp", time.Now().
// Format(time.RFC3339)).Str("Service:Resource", "Products:Viewer").
// Interface("data", objectName).Msg("")
// // Create minio connection
// minioClient, err := _i.MinioStorage.ConnectMinio()
// if err != nil {
// return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
// "error": true,
// "msg": err.Error(),
// })
// }
// fileContent, err := minioClient.GetObject(ctx, bucketName, objectName, minio.GetObjectOptions{})
// if err != nil {
// _i.Log.Error().Str("timestamp", time.Now().
// Format(time.RFC3339)).Str("Service:Resource", "Products:Viewer").
// Interface("Error getting file", err).Msg("")
// return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
// "error": true,
// "msg": "Failed to retrieve file",
// })
// }
// defer fileContent.Close()
// // Determine Content-Type based on file extension
// contentType := mime.TypeByExtension("." + getFileExtension(objectName))
// if contentType == "" {
// contentType = "application/octet-stream" // fallback if no MIME type matches
// }
// c.Set("Content-Type", contentType)
// if _, err := io.Copy(c.Response().BodyWriter(), fileContent); err != nil {
// return err
// }
// return
// }
func (_i *productsService) Viewer(c *fiber.Ctx) error {
// ambil full path setelah /viewer
objectPath := strings.TrimPrefix(c.Params("*"), "/")
if objectPath == "" {
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
"error": true, "error": true,
"msg": "File path is required", "msg": "Product file not found",
})
}
if result.ThumbnailPath == nil || *result.ThumbnailPath == "" {
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
"error": true,
"msg": "Product thumbnail path not found",
}) })
} }
ctx := context.Background() ctx := context.Background()
bucketName := _i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName bucketName := _i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName
objectName := *result.ThumbnailPath
_i.Log.Info().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service:Resource", "Products:Viewer").
Interface("data", objectName).Msg("")
// Create minio connection
minioClient, err := _i.MinioStorage.ConnectMinio() minioClient, err := _i.MinioStorage.ConnectMinio()
if err != nil { if err != nil {
return c.Status(500).JSON(fiber.Map{ return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": true, "error": true,
"msg": err.Error(), "msg": err.Error(),
}) })
} }
file, err := minioClient.GetObject(ctx, bucketName, objectPath, minio.GetObjectOptions{}) fileContent, err := minioClient.GetObject(ctx, bucketName, objectName, minio.GetObjectOptions{})
if err != nil { if err != nil {
return c.Status(404).JSON(fiber.Map{ _i.Log.Error().Str("timestamp", time.Now().
Format(time.RFC3339)).Str("Service:Resource", "Products:Viewer").
Interface("Error getting file", err).Msg("")
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": true, "error": true,
"msg": "Product file not found", "msg": "Failed to retrieve file",
}) })
} }
defer file.Close() defer fileContent.Close()
// content-type // Determine Content-Type based on file extension
contentType := mime.TypeByExtension(filepath.Ext(objectPath)) contentType := mime.TypeByExtension("." + getFileExtension(objectName))
if contentType == "" { if contentType == "" {
contentType = "application/octet-stream" contentType = "application/octet-stream" // fallback if no MIME type matches
} }
c.Set("Content-Type", contentType) c.Set("Content-Type", contentType)
_, err = io.Copy(c.Response().BodyWriter(), file) if _, err := io.Copy(c.Response().BodyWriter(), fileContent); err != nil {
return err return err
} }
return
}
func getFileExtension(filename string) string { func getFileExtension(filename string) string {
// split file name // split file name