jaecoo
/
jaecoo-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jaecoo:2360ed406da34d97caebe5327d6b69264846bf6e
Branches Tags
jaecoo:main
..
compare: jaecoo:383094d1b5011f1d690264217c966d1a27017420
Branches Tags
jaecoo:main

No commits in common. "2360ed406da34d97caebe5327d6b69264846bf6e" and "383094d1b5011f1d690264217c966d1a27017420" have entirely different histories.
2360ed406d ... 383094d1b5

18 changed files with 93 additions and 575 deletions
Show Stats Expand all files Collapse all files

2
app/database/entity/galleries.entity.go
View File

@ -13,7 +13,5 @@ type Galleries struct {
IsActive *bool `json:"is_active" gorm:"type:bool;default:true"`
CreatedAt time.Time `json:"created_at" gorm:"default:now()"`
UpdatedAt time.Time `json:"updated_at" gorm:"default:now()"`
Category string `json:"category" db:"category"`
}

24
app/database/entity/products.entity.go
View File

@ -5,16 +5,16 @@ import (
)
type Products struct {
ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"`
Title string `json:"title" gorm:"type:varchar"`
Variant *string `json:"variant" gorm:"type:varchar"`
Price *string `json:"price" gorm:"type:varchar"`
ThumbnailPath *string `json:"thumbnail_path" gorm:"type:varchar"`
Colors *string `json:"colors" gorm:"type:text"` // JSON array stored as text
Specifications *string `json:"specifications" gorm:"type:text"` // JSON array stored as text
Status *string `json:"status" gorm:"type:varchar"`
StatusId *int `json:"status_id" gorm:"type:int4;default:1"`
IsActive *bool `json:"is_active" gorm:"type:bool;default:true"`
CreatedAt time.Time `json:"created_at" gorm:"default:now()"`
UpdatedAt time.Time `json:"updated_at" gorm:"default:now()"`
ID uint `json:"id" gorm:"primaryKey;type:int4;autoIncrement"`
Title string `json:"title" gorm:"type:varchar"`
Variant *string `json:"variant" gorm:"type:varchar"`
Price *string `json:"price" gorm:"type:varchar"`
ThumbnailPath *string `json:"thumbnail_path" gorm:"type:varchar"`
Colors *string `json:"colors" gorm:"type:text"` // JSON array stored as text
Status *string `json:"status" gorm:"type:varchar"`
StatusId *int `json:"status_id" gorm:"type:int4;default:1"`
IsActive *bool `json:"is_active" gorm:"type:bool;default:true"`
CreatedAt time.Time `json:"created_at" gorm:"default:now()"`
UpdatedAt time.Time `json:"updated_at" gorm:"default:now()"`
}

13
app/module/banners/controller/banners.controller.go
View File

@ -1,21 +1,18 @@
package controller
import (
"jaecoo-be/app/middleware"
"jaecoo-be/app/module/banners/request"
"jaecoo-be/app/module/banners/service"
"jaecoo-be/utils/paginator"
"strconv"
"github.com/gofiber/fiber/v2"
"github.com/rs/zerolog"
utilRes "jaecoo-be/utils/response"
)
type bannersController struct {
bannersService service.BannersService
Log zerolog.Logger
}
@ -64,14 +61,7 @@ func (_i *bannersController) All(c *fiber.Ctx) error {
req := reqContext.ToParamRequest()
req.Pagination = paginate
// ✅ ambil ClientId dari middleware
clientId := middleware.GetClientID(c)
// ✅ ambil Authorization token (kalau dibutuhkan)
_i.Log.Info().Interface("clientId", clientId).Msg("")
bannersData, paging, err := _i.bannersService.GetAll(clientId,req)
bannersData, paging, err := _i.bannersService.GetAll(req)
if err != nil {
return err
}
@ -84,7 +74,6 @@ func (_i *bannersController) All(c *fiber.Ctx) error {
})
}
// Show Banner
// @Summary Get Banner by ID
// @Description API for getting Banner by ID

9
app/module/banners/repository/banners.repository.go
View File

@ -7,7 +7,6 @@ import (
"jaecoo-be/utils/paginator"
"strings"
"github.com/google/uuid"
"github.com/rs/zerolog"
)
@ -17,7 +16,7 @@ type bannersRepository struct {
}
type BannersRepository interface {
GetAll(clientId *uuid.UUID, req request.BannersQueryRequest) (banners []*entity.Banners, paging paginator.Pagination, err error)
GetAll(req request.BannersQueryRequest) (banners []*entity.Banners, paging paginator.Pagination, err error)
FindOne(id uint) (banner *entity.Banners, err error)
Create(banner *entity.Banners) (bannerReturn *entity.Banners, err error)
Update(id uint, banner *entity.Banners) (err error)
@ -35,15 +34,11 @@ func NewBannersRepository(db *database.Database, log zerolog.Logger) BannersRepo
}
}
func (_i *bannersRepository) GetAll(clientId *uuid.UUID, req request.BannersQueryRequest) (banners []*entity.Banners, paging paginator.Pagination, err error) {
func (_i *bannersRepository) GetAll(req request.BannersQueryRequest) (banners []*entity.Banners, paging paginator.Pagination, err error) {
var count int64
query := _i.DB.DB.Model(&entity.Banners{})
if clientId != nil {
query = query.Where("banners.client_id = ?", clientId)
}
if req.Title != nil && *req.Title != "" {
title := strings.ToLower(*req.Title)
query = query.Where("LOWER(title) LIKE ?", "%"+title+"%")

12
app/module/banners/service/banners.service.go
View File

@ -23,7 +23,6 @@ import (
"time"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
"github.com/minio/minio-go/v7"
"github.com/rs/zerolog"
)
@ -38,7 +37,7 @@ type bannersService struct {
}
type BannersService interface {
GetAll(clientId *uuid.UUID,req request.BannersQueryRequest) (banners []*response.BannersResponse, paging paginator.Pagination, err error)
GetAll(req request.BannersQueryRequest) (banners []*response.BannersResponse, paging paginator.Pagination, err error)
GetOne(id uint) (banner *response.BannersResponse, err error)
Create(c *fiber.Ctx, req request.BannersCreateRequest) (banner *response.BannersResponse, err error)
Update(c *fiber.Ctx, id uint, req request.BannersUpdateRequest) (banner *response.BannersResponse, err error)
@ -61,17 +60,14 @@ func NewBannersService(repo repository.BannersRepository, log zerolog.Logger, cf
}
}
func (_i *bannersService) GetAll(
clientId *uuid.UUID,
req request.BannersQueryRequest,
) (banners []*response.BannersResponse, paging paginator.Pagination, err error) {
bannersEntity, paging, err := _i.Repo.GetAll(clientId, req)
func (_i *bannersService) GetAll(req request.BannersQueryRequest) (banners []*response.BannersResponse, paging paginator.Pagination, err error) {
bannersEntity, paging, err := _i.Repo.GetAll(req)
if err != nil {
return
}
host := _i.Cfg.App.Domain
for _, banner := range bannersEntity {
banners = append(banners, mapper.BannersResponseMapper(banner, host))
}

1
app/module/galleries/mapper/galleries.mapper.go
View File

@ -13,7 +13,6 @@ func GalleriesResponseMapper(gallery *entity.Galleries, host string) *res.Galler
response := &res.GalleriesResponse{
ID: gallery.ID,
Title: gallery.Title,
Category: gallery.Category,
Description: gallery.Description,
ThumbnailPath: gallery.ThumbnailPath,
StatusId: gallery.StatusId,

7
app/module/galleries/request/galleries.request.go
View File

@ -33,8 +33,6 @@ type GalleriesCreateRequest struct {
Title string `json:"title" validate:"required"`
Description *string `json:"description"`
ThumbnailPath *string `json:"thumbnail_path"`
Category string `json:"category" validate:"required"`
}
func (req GalleriesCreateRequest) ToEntity() *entity.Galleries {
@ -42,7 +40,6 @@ func (req GalleriesCreateRequest) ToEntity() *entity.Galleries {
Title: req.Title,
Description: req.Description,
ThumbnailPath: req.ThumbnailPath,
Category: req.Category,
}
}
@ -50,18 +47,14 @@ type GalleriesUpdateRequest struct {
Title *string `json:"title"`
Description *string `json:"description"`
ThumbnailPath *string `json:"thumbnail_path"`
Category string `json:"category" validate:"required"`
IsActive *bool `json:"is_active"`
}
func (req GalleriesUpdateRequest) ToEntity() *entity.Galleries {
return &entity.Galleries{
Title: getStringValue(req.Title),
Description: req.Description,
ThumbnailPath: req.ThumbnailPath,
Category: req.Category,
IsActive: req.IsActive,
}
}

1
app/module/galleries/response/galleries.response.go
View File

@ -7,7 +7,6 @@ import (
type GalleriesResponse struct {
ID uint `json:"id"`
Title string `json:"title"`
Category string `json:"category"`
Description *string `json:"description"`
ThumbnailPath *string `json:"thumbnail_path"`
ThumbnailUrl *string `json:"thumbnail_url"`

4
app/module/products/controller/products.controller.go
View File

@ -229,9 +229,9 @@ func (_i *productsController) Update(c *fiber.Ctx) error {
req.Price = &price
}
// Handle colors (JSON array of objects with name and image_path)
// Handle colors (JSON array string)
if colorsStr := c.FormValue("colors"); colorsStr != "" {
var colors []request.ProductColorRequest
var colors []string
if err := json.Unmarshal([]byte(colorsStr), &colors); err == nil {
req.Colors = colors
}

65
app/module/products/mapper/products.mapper.go
View File

@ -14,57 +14,31 @@ func ProductsResponseMapper(product *entity.Products, host string) *res.Products
var colors []res.ProductColorResponse
if product.Colors != nil && *product.Colors != "" {
var rawColors []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
_ = json.Unmarshal([]byte(*product.Colors), &rawColors)
for _, c := range rawColors {
var imageUrl *string
if c.ImagePath != nil {
filename := filepath.Base(*c.ImagePath)
url := host + "/products/viewer/" + filename
imageUrl = &url
}
colors = append(colors, res.ProductColorResponse{
Name: c.Name,
ImagePath: c.ImagePath,
ImageUrl: imageUrl,
})
}
if product.Colors != nil && *product.Colors != "" {
var rawColors []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
var specifications []res.ProductSpecificationResponse
_ = json.Unmarshal([]byte(*product.Colors), &rawColors)
if product.Specifications != nil && *product.Specifications != "" {
var rawSpecs []struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
for _, c := range rawColors {
var imageUrl *string
if c.ImagePath != nil {
filename := filepath.Base(*c.ImagePath)
url := host + "/products/viewer/" + filename
imageUrl = &url
}
_ = json.Unmarshal([]byte(*product.Specifications), &rawSpecs)
for _, s := range rawSpecs {
var imageUrls []string
for _, imagePath := range s.ImagePaths {
filename := filepath.Base(imagePath)
url := host + "/products/viewer/" + filename
imageUrls = append(imageUrls, url)
}
specifications = append(specifications, res.ProductSpecificationResponse{
Title: s.Title,
ImagePaths: s.ImagePaths,
ImageUrls: imageUrls,
})
}
colors = append(colors, res.ProductColorResponse{
Name: c.Name,
ImagePath: c.ImagePath,
ImageUrl: imageUrl,
})
}
}
response := &res.ProductsResponse{
ID: product.ID,
@ -73,7 +47,6 @@ func ProductsResponseMapper(product *entity.Products, host string) *res.Products
Price: product.Price,
ThumbnailPath: product.ThumbnailPath,
Colors: colors,
Specifications: specifications,
Status: product.Status,
StatusId: product.StatusId,
IsActive: product.IsActive,

14
app/module/products/request/products.request.go
View File

@ -95,13 +95,13 @@ func (req ProductsCreateRequest) ToEntity() *entity.Products {
type ProductsUpdateRequest struct {
Title *string `json:"title"`
Variant *string `json:"variant"`
Price *string `json:"price"`
ThumbnailPath *string `json:"thumbnail_path"`
Colors []ProductColorRequest `json:"colors"`
Status *string `json:"status"`
IsActive *bool `json:"is_active"`
Title *string `json:"title"`
Variant *string `json:"variant"`
Price *string `json:"price"`
ThumbnailPath *string `json:"thumbnail_path"`
Colors []string `json:"colors"`
Status *string `json:"status"`
IsActive *bool `json:"is_active"`
}
func (req ProductsUpdateRequest) ToEntity() *entity.Products {

7
app/module/products/response/products.response.go
View File

@ -10,12 +10,6 @@ type ProductColorResponse struct {
ImageUrl *string `json:"image_url"`
}
type ProductSpecificationResponse struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
ImageUrls []string `json:"image_urls"`
}
type ProductsResponse struct {
ID uint `json:"id"`
Title string `json:"title"`
@ -24,7 +18,6 @@ type ProductsResponse struct {
ThumbnailPath *string `json:"thumbnail_path"`
ThumbnailUrl *string `json:"thumbnail_url"`
Colors []ProductColorResponse `json:"colors"`
Specifications []ProductSpecificationResponse `json:"specifications"`
Status *string `json:"status"`
StatusId *int `json:"status_id"`
IsActive *bool `json:"is_active"`

480
app/module/products/service/products.service.go
View File

@ -30,12 +30,13 @@ import (
"github.com/rs/zerolog"
)
type productsService struct {
Repo repository.ProductsRepository
Log zerolog.Logger
Cfg *config.Config
MinioStorage *minioStorage.MinioStorage
UsersRepo usersRepository.UsersRepository
Repo repository.ProductsRepository
Log zerolog.Logger
Cfg *config.Config
MinioStorage *minioStorage.MinioStorage
UsersRepo usersRepository.UsersRepository
ApprovalHistoriesService approvalHistoriesService.ApprovalHistoriesService
}
@ -144,79 +145,20 @@ func (_i *productsService) uploadColorFile(
return &objectName, nil
}
func (_i *productsService) uploadSpecFile(
fileHeader *multipart.FileHeader,
) (*string, error) {
minioClient, err := _i.MinioStorage.ConnectMinio()
if err != nil {
return nil, err
}
src, err := fileHeader.Open()
if err != nil {
return nil, err
}
defer src.Close()
now := time.Now()
ext := filepath.Ext(fileHeader.Filename)
name := strings.TrimSuffix(fileHeader.Filename, ext)
name = strings.ReplaceAll(name, " ", "")
filename := fmt.Sprintf(
"%s_%d%s",
name,
rand.Intn(999999),
ext,
)
objectName := fmt.Sprintf(
"products/specifications/%d/%d/%s",
now.Year(),
now.Month(),
filename,
)
_, err = minioClient.PutObject(
context.Background(),
_i.MinioStorage.Cfg.ObjectStorage.MinioStorage.BucketName,
objectName,
src,
fileHeader.Size,
minio.PutObjectOptions{},
)
if err != nil {
return nil, err
}
return &objectName, nil
}
func (_i *productsService) Create(c *fiber.Ctx, req request.ProductsCreateRequest) (product *response.ProductsResponse, err error) {
_i.Log.Info().
Str("title", req.Title).
Interface("colors", req.Colors).
Msg("🚀 Starting Create Product")
// Handle file upload if exists
if filePath, uploadErr := _i.UploadFileToMinio(c, "file"); uploadErr == nil && filePath != nil {
req.ThumbnailPath = filePath
_i.Log.Info().Str("thumbnailPath", *filePath).Msg("✅ Uploaded thumbnail")
}
// 🔥 CONVERT REQUEST KE ENTITY
productEntity := req.ToEntity()
// ===============================
// 3️⃣ 🔥 HANDLE COLORS + IMAGE
// ===============================
form, _ := c.MultipartForm()
colorFiles := form.File["color_images"]
colorsStr := c.FormValue("colors")
_i.Log.Info().
Str("colorsStr", colorsStr).
Int("colorFilesCount", len(colorFiles)).
Msg("🎨 Processing colors")
var colorEntities []struct {
Name string `json:"name"`
@ -253,119 +195,19 @@ func (_i *productsService) Create(c *fiber.Ctx, req request.ProductsCreateReques
bytes, _ := json.Marshal(colorEntities)
str := string(bytes)
productEntity.Colors = &str
_i.Log.Info().
Int("colorsCount", len(colorEntities)).
Str("json", str).
Msg("💾 Saved colors to entity")
}
// 6️⃣ HANDLE SPECIFICATIONS (as JSON array like colors)
form, _ = c.MultipartForm()
specFiles := form.File["specification_images"]
specificationsStr := c.FormValue("specifications")
_i.Log.Info().
Str("specificationsStr", specificationsStr).
Int("specFilesCount", len(specFiles)).
Msg("📦 Processing specifications in Create")
var specEntities []struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}
if specificationsStr != "" {
var specifications []struct {
Title string `json:"title"`
ImageCount int `json:"imageCount"`
}
if err := json.Unmarshal([]byte(specificationsStr), &specifications); err != nil {
_i.Log.Error().Err(err).Str("specificationsStr", specificationsStr).Msg("❌ Failed to unmarshal specifications")
} else {
_i.Log.Info().Int("specsCount", len(specifications)).Msg("✅ Parsed specifications JSON")
fileIndex := 0
for specIdx, spec := range specifications {
if spec.Title == "" {
_i.Log.Warn().Int("specIndex", specIdx).Msg("⚠️ Skipping spec with empty title")
continue
}
specEntity := struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}{
Title: spec.Title,
ImagePaths: []string{},
}
_i.Log.Info().
Int("specIndex", specIdx).
Str("title", spec.Title).
Int("imageCount", spec.ImageCount).
Int("fileIndex", fileIndex).
Msg("📝 Processing spec")
// Upload files for this specification
imageCount := spec.ImageCount
if imageCount > 0 && fileIndex < len(specFiles) {
for i := 0; i < imageCount && fileIndex < len(specFiles); i++ {
fileHeader := specFiles[fileIndex]
_i.Log.Info().
Int("fileIndex", fileIndex).
Str("filename", fileHeader.Filename).
Msg("📤 Uploading spec image")
path, uploadErr := _i.uploadSpecFile(fileHeader)
if uploadErr != nil {
_i.Log.Error().Err(uploadErr).Int("fileIndex", fileIndex).Msg("❌ Failed to upload spec file")
} else if path != nil {
specEntity.ImagePaths = append(specEntity.ImagePaths, *path)
_i.Log.Info().Str("path", *path).Msg("✅ Uploaded spec image")
}
fileIndex++
}
}
specEntities = append(specEntities, specEntity)
_i.Log.Info().
Str("title", specEntity.Title).
Int("imagesCount", len(specEntity.ImagePaths)).
Msg("✅ Added spec entity")
}
}
} else {
_i.Log.Warn().Msg("⚠️ No specifications string in form")
}
// Save specifications as JSON string
if len(specEntities) > 0 {
bytes, _ := json.Marshal(specEntities)
str := string(bytes)
productEntity.Specifications = &str
_i.Log.Info().
Int("specsCount", len(specEntities)).
Str("json", str).
Msg("💾 Saved specifications to entity")
} else {
_i.Log.Warn().Msg("⚠️ No spec entities to save")
}
// 7️⃣ DEFAULT ACTIVE & SAVE TO DB
// 4️⃣ DEFAULT ACTIVE
isActive := true
productEntity.IsActive = &isActive
// 5️⃣ SIMPAN KE DB
productEntity, err = _i.Repo.Create(productEntity)
if err != nil {
_i.Log.Error().Err(err).Msg("❌ Failed to create product in DB")
return
}
_i.Log.Info().
Uint("productId", productEntity.ID).
Interface("colors", productEntity.Colors).
Interface("specifications", productEntity.Specifications).
Msg("✅ Product created in DB with all data")
// 8️⃣ RESPONSE
// 6️⃣ RESPONSE
host := _i.Cfg.App.Domain
product = mapper.ProductsResponseMapper(productEntity, host)
return
@ -442,187 +284,8 @@ func (_i *productsService) Update(c *fiber.Ctx, id uint, req request.ProductsUpd
req.ThumbnailPath = filePath
}
// Get existing product to preserve existing colors if no new color images uploaded
existingProduct, err := _i.Repo.FindOne(id)
if err != nil {
return
}
productEntity := req.ToEntity()
// Handle color images if uploaded (similar to Create)
form, _ := c.MultipartForm()
colorFiles := form.File["color_images"]
// If color images are uploaded, process them
if len(colorFiles) > 0 {
var colorEntities []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
// Use colors from request if available, otherwise preserve existing
var existingColors []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
if existingProduct.Colors != nil && *existingProduct.Colors != "" {
_ = json.Unmarshal([]byte(*existingProduct.Colors), &existingColors)
}
// Process color files and merge with request colors
for i, cReq := range req.Colors {
if cReq.Name == "" {
continue
}
color := struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}{
Name: cReq.Name,
}
// If there's a new file uploaded for this color index, use it
if len(colorFiles) > i {
fileHeader := colorFiles[i]
path, err := _i.uploadColorFile(fileHeader)
if err == nil && path != nil {
color.ImagePath = path
} else if i < len(existingColors) {
// Keep existing image path if upload failed
color.ImagePath = existingColors[i].ImagePath
}
} else if i < len(existingColors) {
// No new file, preserve existing image path
color.ImagePath = existingColors[i].ImagePath
}
colorEntities = append(colorEntities, color)
}
// Update colors JSON if we have colors
if len(colorEntities) > 0 {
bytes, _ := json.Marshal(colorEntities)
str := string(bytes)
productEntity.Colors = &str
}
} else if len(req.Colors) > 0 {
// No new color images uploaded, but colors data is provided
// Preserve existing image paths and update names
var existingColors []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
if existingProduct.Colors != nil && *existingProduct.Colors != "" {
_ = json.Unmarshal([]byte(*existingProduct.Colors), &existingColors)
}
var colorEntities []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
for i, cReq := range req.Colors {
if cReq.Name == "" {
continue
}
color := struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}{
Name: cReq.Name,
}
// Preserve existing image path if available
if i < len(existingColors) {
color.ImagePath = existingColors[i].ImagePath
}
colorEntities = append(colorEntities, color)
}
if len(colorEntities) > 0 {
bytes, _ := json.Marshal(colorEntities)
str := string(bytes)
productEntity.Colors = &str
}
} else if existingProduct.Colors != nil {
// No colors in request, preserve existing colors
productEntity.Colors = existingProduct.Colors
}
// Handle specifications update (as JSON array like colors)
specFiles := form.File["specification_images"]
specificationsStr := c.FormValue("specifications")
var specEntities []struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}
if specificationsStr != "" {
var specifications []struct {
Title string `json:"title"`
ImageCount int `json:"imageCount"`
}
if err := json.Unmarshal([]byte(specificationsStr), &specifications); err == nil {
// Get existing specifications to preserve existing images if no new files uploaded
var existingSpecs []struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}
if existingProduct.Specifications != nil && *existingProduct.Specifications != "" {
_ = json.Unmarshal([]byte(*existingProduct.Specifications), &existingSpecs)
}
fileIndex := 0
for i, spec := range specifications {
if spec.Title == "" {
continue
}
specEntity := struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}{
Title: spec.Title,
ImagePaths: []string{},
}
// If there are new files uploaded for this spec index, use them
imageCount := spec.ImageCount
if imageCount > 0 && fileIndex < len(specFiles) {
// Upload new files
for j := 0; j < imageCount && fileIndex < len(specFiles); j++ {
fileHeader := specFiles[fileIndex]
path, uploadErr := _i.uploadSpecFile(fileHeader)
if uploadErr == nil && path != nil {
specEntity.ImagePaths = append(specEntity.ImagePaths, *path)
}
fileIndex++
}
} else if i < len(existingSpecs) {
// No new files, preserve existing image paths
specEntity.ImagePaths = existingSpecs[i].ImagePaths
}
specEntities = append(specEntities, specEntity)
}
}
} else if existingProduct.Specifications != nil {
// No specifications in request, preserve existing
productEntity.Specifications = existingProduct.Specifications
}
// Save specifications as JSON string
if len(specEntities) > 0 {
bytes, _ := json.Marshal(specEntities)
str := string(bytes)
productEntity.Specifications = &str
}
err = _i.Repo.Update(id, productEntity)
if err != nil {
return
@ -647,90 +310,25 @@ func (_i *productsService) Delete(id uint) (err error) {
func (_i *productsService) Viewer(c *fiber.Ctx) (err error) {
filename := c.Params("filename")
var objectName string
var found bool
// First, try to find by ThumbnailPath (for main product images)
// Find product by filename (repository will search using LIKE pattern)
result, err := _i.Repo.FindByThumbnailPath(filename)
if err == nil && result != nil && result.ThumbnailPath != nil && *result.ThumbnailPath != "" {
// Check if the filename matches the thumbnail
if strings.Contains(*result.ThumbnailPath, filename) {
objectName = *result.ThumbnailPath
found = true
}
}
// If not found in ThumbnailPath, search in Colors JSON field
if !found {
// Create a query request with large limit to search all products
queryReq := request.ProductsQueryRequest{
Pagination: &paginator.Pagination{
Page: 1,
Limit: 1000, // Large limit to search all products
},
}
allProducts, _, err := _i.Repo.GetAll(queryReq)
if err == nil {
for _, product := range allProducts {
// Search in Colors
if product.Colors != nil && *product.Colors != "" {
var rawColors []struct {
Name string `json:"name"`
ImagePath *string `json:"image_path"`
}
if err := json.Unmarshal([]byte(*product.Colors), &rawColors); err == nil {
for _, color := range rawColors {
if color.ImagePath != nil && strings.Contains(*color.ImagePath, filename) {
objectName = *color.ImagePath
found = true
break
}
}
}
if found {
break
}
}
// Search in Specifications
if !found && product.Specifications != nil && *product.Specifications != "" {
var rawSpecs []struct {
Title string `json:"title"`
ImagePaths []string `json:"image_paths"`
}
if err := json.Unmarshal([]byte(*product.Specifications), &rawSpecs); err == nil {
for _, spec := range rawSpecs {
for _, imagePath := range spec.ImagePaths {
if strings.Contains(imagePath, filename) {
objectName = imagePath
found = true
break
}
}
if found {
break
}
}
}
if found {
break
}
}
}
}
}
if !found || objectName == "" {
if err != nil {
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").
@ -809,14 +407,14 @@ func (_i *productsService) Approve(id uint, authToken string) (product *response
userID := user.ID
statusApprove := 2
err = _i.ApprovalHistoriesService.CreateHistory(
"products",
id,
&statusApprove, // ✅ pointer
"approve",
&userID,
nil,
)
err = _i.ApprovalHistoriesService.CreateHistory(
"products",
id,
&statusApprove, // ✅ pointer
"approve",
&userID,
nil,
)
if err != nil {
_i.Log.Error().Err(err).Msg("Failed to save approval history")
}
@ -861,14 +459,14 @@ func (_i *productsService) Reject(id uint, authToken string, message *string) (p
userID := user.ID
statusReject := 3
err = _i.ApprovalHistoriesService.CreateHistory(
"productss",
id,
&statusReject, // ✅ pointer
"reject",
&userID,
message,
)
err = _i.ApprovalHistoriesService.CreateHistory(
"productss",
id,
&statusReject, // ✅ pointer
"reject",
&userID,
message,
)
if err != nil {
_i.Log.Error().Err(err).Msg("Failed to save rejection history")
}
@ -911,7 +509,7 @@ func (_i *productsService) Comment(
err = _i.ApprovalHistoriesService.CreateHistory(
"banners",
id,
nil, // status_id NULL
nil, // status_id NULL
"comment",
&userID,
message,

11
app/module/sales_agents/controller/sales_agents.controller.go
View File

@ -2,21 +2,18 @@ package controller
import (
"encoding/json"
"jaecoo-be/app/middleware"
"jaecoo-be/app/module/sales_agents/request"
"jaecoo-be/app/module/sales_agents/service"
"jaecoo-be/utils/paginator"
"strconv"
"github.com/gofiber/fiber/v2"
"github.com/rs/zerolog"
utilRes "jaecoo-be/utils/response"
)
type salesAgentsController struct {
salesAgentsService service.SalesAgentsService
Log zerolog.Logger
}
type SalesAgentsController interface {
@ -64,13 +61,7 @@ func (_i *salesAgentsController) All(c *fiber.Ctx) error {
req := reqContext.ToParamRequest()
req.Pagination = paginate
clientId := middleware.GetClientID(c)
// ✅ ambil Authorization token (kalau dibutuhkan)
_i.Log.Info().Interface("clientId", clientId).Msg("")
agentsData, paging, err := _i.salesAgentsService.GetAll(clientId,req)
agentsData, paging, err := _i.salesAgentsService.GetAll(req)
if err != nil {
return err
}

9
app/module/sales_agents/repository/sales_agents.repository.go
View File

@ -7,7 +7,6 @@ import (
"jaecoo-be/utils/paginator"
"strings"
"github.com/google/uuid"
"github.com/rs/zerolog"
)
@ -17,7 +16,7 @@ type salesAgentsRepository struct {
}
type SalesAgentsRepository interface {
GetAll(clientId *uuid.UUID, req request.SalesAgentsQueryRequest) (agents []*entity.SalesAgents, paging paginator.Pagination, err error)
GetAll(req request.SalesAgentsQueryRequest) (agents []*entity.SalesAgents, paging paginator.Pagination, err error)
FindOne(id uint) (agent *entity.SalesAgents, err error)
Create(agent *entity.SalesAgents) (agentReturn *entity.SalesAgents, err error)
Update(id uint, agent *entity.SalesAgents) (err error)
@ -34,7 +33,7 @@ func NewSalesAgentsRepository(db *database.Database, log zerolog.Logger) SalesAg
}
}
func (_i *salesAgentsRepository) GetAll(clientId *uuid.UUID, req request.SalesAgentsQueryRequest) (agents []*entity.SalesAgents, paging paginator.Pagination, err error) {
func (_i *salesAgentsRepository) GetAll(req request.SalesAgentsQueryRequest) (agents []*entity.SalesAgents, paging paginator.Pagination, err error) {
var count int64
query := _i.DB.DB.Model(&entity.SalesAgents{})
@ -48,10 +47,6 @@ func (_i *salesAgentsRepository) GetAll(clientId *uuid.UUID, req request.SalesAg
query = query.Where("job_title = ?", *req.JobTitle)
}
if clientId != nil {
query = query.Where("client_id = ?", clientId)
}
if req.AgentType != nil && *req.AgentType != "" {
query = query.Where("agent_type LIKE ?", "%"+*req.AgentType+"%")
}

7
app/module/sales_agents/service/sales_agents.service.go
View File

@ -23,7 +23,6 @@ import (
"time"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
"github.com/minio/minio-go/v7"
"github.com/rs/zerolog"
)
@ -38,7 +37,7 @@ type salesAgentsService struct {
}
type SalesAgentsService interface {
GetAll(clientId *uuid.UUID, req request.SalesAgentsQueryRequest) (agents []*response.SalesAgentsResponse, paging paginator.Pagination, err error)
GetAll(req request.SalesAgentsQueryRequest) (agents []*response.SalesAgentsResponse, paging paginator.Pagination, err error)
GetOne(id uint) (agent *response.SalesAgentsResponse, err error)
Create(c *fiber.Ctx, req request.SalesAgentsCreateRequest) (agent *response.SalesAgentsResponse, err error)
Update(c *fiber.Ctx, id uint, req request.SalesAgentsUpdateRequest) (agent *response.SalesAgentsResponse, err error)
@ -61,8 +60,8 @@ func NewSalesAgentsService(repo repository.SalesAgentsRepository, log zerolog.Lo
}
}
func (_i *salesAgentsService) GetAll(clientId *uuid.UUID, req request.SalesAgentsQueryRequest) (agents []*response.SalesAgentsResponse, paging paginator.Pagination, err error) {
agentsEntity, paging, err := _i.Repo.GetAll(clientId,req)
func (_i *salesAgentsService) GetAll(req request.SalesAgentsQueryRequest) (agents []*response.SalesAgentsResponse, paging paginator.Pagination, err error) {
agentsEntity, paging, err := _i.Repo.GetAll(req)
if err != nil {
return
}

2
go.mod
View File

@ -13,7 +13,6 @@ require (
github.com/go-playground/validator/v10 v10.17.0
github.com/gofiber/fiber/v2 v2.52.4
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0
github.com/minio/minio-go/v7 v7.0.68
github.com/pelletier/go-toml/v2 v2.1.1
github.com/rs/zerolog v1.31.0
@ -35,6 +34,7 @@ require (
github.com/go-openapi/spec v0.20.15 // indirect
github.com/go-openapi/swag v0.22.10 // indirect
github.com/go-resty/resty/v2 v2.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect

BIN
jaecoo-be.exe
View File

Binary file not shown.