app/module/cms_content_submissions/service/cms_content_submissions.service.go

@@ -386,16 +386,6 @@ func (_i *cmsContentSubmissionsService) mergeProduct(raw []byte) error {
 		if err != nil {
 			return err
 		}
-		// Remove images first (FK from our_product_content_images → our_product_contents).
-		imgs, err := _i.OurProductImg.FindByContentID(id)
-		if err != nil {
-			return err
-		}
-		for i := range imgs {
-			if err := _i.OurProductImg.Delete(imgs[i].ID); err != nil {
-				return err
-			}
-		}
 		return _i.OurProduct.Delete(id)
 	}
 	ent := &entity.OurProductContent{
@@ -463,18 +453,7 @@ func (_i *cmsContentSubmissionsService) mergeService(raw []byte) error {
 		if p.ServiceID == nil || *p.ServiceID == 0 {
 			return errors.New("service_id required for delete")
 		}
-		sid := uint(*p.ServiceID)
+		return _i.OurService.Delete(uint(*p.ServiceID))
-		// Remove images first (FK from our_service_content_images → our_service_contents).
-		simgs, err := _i.OurServiceImg.FindByContentID(sid)
-		if err != nil {
-			return err
-		}
-		for i := range simgs {
-			if err := _i.OurServiceImg.Delete(simgs[i].ID); err != nil {
-				return err
-			}
-		}
-		return _i.OurService.Delete(sid)
 	}
 	ent := &entity.OurServiceContent{
 		PrimaryTitle:   p.PrimaryTitle,

app/module/media_library/controller/media_library.controller.go

@@ -79,14 +79,12 @@ func (_i *MediaLibraryController) Upload(c *fiber.Ctx) error {
 	if user != nil {
 		uid = int(user.ID)
 	}
-	publicURL, err := _i.svc.Upload(clientID, uid, c)
+	if err := _i.svc.Upload(clientID, uid, c); err != nil {
-	if err != nil {
 		return err
 	}
 	return utilRes.Resp(c, utilRes.Response{
 		Success:  true,
 		Messages: utilRes.Messages{"File uploaded and added to media library"},
-		Data:     map[string]string{"public_url": publicURL},
 	})
 }
 

app/module/media_library/service/media_library.service.go

@@ -40,7 +40,7 @@ type MediaLibraryService interface {
 	RegisterFromRequest(clientID *uuid.UUID, userID int, req *request.MediaLibraryRegisterRequest) error
 	RegisterCMSAsset(publicURL, objectKey, sourceLabel string, file *multipart.FileHeader) error
 	All(clientID *uuid.UUID, q string, sourceType *string, p *paginator.Pagination) ([]*response.MediaLibraryItemResponse, *paginator.Pagination, error)
-	Upload(clientID *uuid.UUID, userID int, c *fiber.Ctx) (publicURL string, err error)
+	Upload(clientID *uuid.UUID, userID int, c *fiber.Ctx) error
 	Delete(clientID *uuid.UUID, id uint) error
 }
 
@@ -213,18 +213,18 @@ func (s *mediaLibraryService) All(clientID *uuid.UUID, q string, sourceType *str
 	return out, paging, nil
 }
 
-func (s *mediaLibraryService) Upload(clientID *uuid.UUID, userID int, c *fiber.Ctx) (string, error) {
+func (s *mediaLibraryService) Upload(clientID *uuid.UUID, userID int, c *fiber.Ctx) error {
 	file, err := c.FormFile("file")
 	if err != nil {
-		return "", err
+		return err
 	}
 	key, previewURL, err := storage.UploadMediaLibraryObject(s.MinioStorage, file)
 	if err != nil {
-		return "", err
+		return err
 	}
 	name := filepath.Base(file.Filename)
 	sz := file.Size
-	err = s.UpsertRegister(RegisterInput{
+	return s.UpsertRegister(RegisterInput{
 		ClientID:         clientID,
 		UserID:           userID,
 		PublicURL:        previewURL,
@@ -235,7 +235,6 @@ func (s *mediaLibraryService) Upload(clientID *uuid.UUID, userID int, c *fiber.C
 		SourceType:       "upload",
 		SourceLabel:      strPtr("media_library_direct"),
 	})
-	return previewURL, err
 }
 
 func strPtr(s string) *string { return &s }

app/module/our_product_contents/repository/our_product_contents.repository.go

@@ -99,17 +99,12 @@ func (r *ourProductContentRepository) Update(id uuid.UUID, data *entity.OurProdu
 	return nil
 }
 
-// Delete removes child images first so FK constraints do not block the parent delete.
 func (r *ourProductContentRepository) Delete(id uuid.UUID) error {
-	return r.DB.DB.Transaction(func(tx *gorm.DB) error {
+	err := r.DB.DB.Delete(&entity.OurProductContent{}, id).Error
-		if err := tx.Exec(`DELETE FROM our_product_content_images WHERE our_product_content_id = ?`, id).Error; err != nil {
+	if err != nil {
-			r.Log.Error().Err(err).Msg("failed delete our product content images")
+		r.Log.Error().Err(err).Msg("failed delete our product content")
-			return err
+		return err
-		}
+	}
-		if err := tx.Exec(`DELETE FROM our_product_contents WHERE id = ?`, id).Error; err != nil {
+
-			r.Log.Error().Err(err).Msg("failed delete our product content")
+	return nil
-			return err
-		}
-		return nil
-	})
 }

app/module/our_service_contents/repository/our_service_contents.repository.go

@@ -96,17 +96,12 @@ func (r *ourServiceContentRepository) Update(id uint, data *entity.OurServiceCon
 	return nil
 }
 
-// Delete removes child images first so FK constraints do not block the parent delete.
 func (r *ourServiceContentRepository) Delete(id uint) error {
-	return r.DB.DB.Transaction(func(tx *gorm.DB) error {
+	err := r.DB.DB.Delete(&entity.OurServiceContent{}, id).Error
-		if err := tx.Exec(`DELETE FROM our_service_content_images WHERE our_service_content_id = ?`, id).Error; err != nil {
+	if err != nil {
-			r.Log.Error().Err(err).Msg("failed delete our service content images")
+		r.Log.Error().Err(err).Msg("failed delete our service content")
-			return err
+		return err
-		}
+	}
-		if err := tx.Exec(`DELETE FROM our_service_contents WHERE id = ?`, id).Error; err != nil {
+
-			r.Log.Error().Err(err).Msg("failed delete our service content")
+	return nil
-			return err
-		}
-		return nil
-	})
 }