Merge pull request #30 from hammercode-dev/feat/update-image

feat(image): update image endpoint for admin, fix typo, and session_type

Author: AfandyW

app/events/usecase/create_event.go

@@ -46,6 +46,7 @@ func (uc usecase) CreateEvent(ctx context.Context, payload domain.CreateEventPay
 			Price:                payload.Price,
 			Status:               payload.Status,
 			AdditionalLink:       payload.AdditionalLink,
+			SessionType: 					payload.SessionType,
 		}
 
 		eventID, err := uc.repository.CreateEvent(txCtx, data)

app/images/delivery/http/update_image.go

@@ -2,7 +2,6 @@ package http
 
 import (
 	"net/http"
-	"strconv"
 	"strings"
 
 	"github.com/gorilla/mux"
@@ -11,26 +10,18 @@ import (
 )
 
 func (h Handler) UpdateImage(w http.ResponseWriter, r *http.Request) {
-	// Parse image ID from query or URL (misal: /images/{id})
-	idStr := mux.Vars(r)["id"]
-	if idStr == "" {
+	// Parse image fileName from URL (misal: /images/{fileName})
+	fileName := mux.Vars(r)["fileName"]
+	if fileName == "" {
 		utils.Response(domain.HttpResponse{
 			Code:    http.StatusBadRequest,
-			Message: "missing image id",
-		}, w)
-		return
-	}
-	id, err := strconv.ParseUint(idStr, 10, 64)
-	if err != nil {
-		utils.Response(domain.HttpResponse{
-			Code:    http.StatusBadRequest,
-			Message: "invalid image id",
+			Message: "missing image file name",
 		}, w)
 		return
 	}
 
 	// Parse multipart form
-	err = r.ParseMultipartForm(10 << 20) // 10MB
+	err := r.ParseMultipartForm(10 << 20) // 10MB
 	if err != nil {
 		utils.Response(domain.HttpResponse{
 			Code:    http.StatusBadRequest,
@@ -66,7 +57,7 @@ func (h Handler) UpdateImage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	ctx := r.Context()
-	err = h.usecase.UpdateImage(ctx, upload, uint(id))
+	response, err := h.usecase.UpdateImage(ctx, upload, fileName)
 	if err != nil {
 		utils.Response(domain.HttpResponse{
 			Code:    http.StatusInternalServerError,
@@ -78,6 +69,7 @@ func (h Handler) UpdateImage(w http.ResponseWriter, r *http.Request) {
 	utils.Response(domain.HttpResponse{
 		Code:    200,
 		Message: "Image updated successfully",
+		Data:    response,
 	}, w)
 }
 

app/images/usecase/update_image.go

@@ -12,7 +12,14 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func (us *usecase) UpdateImage(ctx context.Context, payload domain.UploadImage, id uint) error {
+func (us *usecase) UpdateImage(ctx context.Context, payload domain.UploadImage, fileName string) (domain.UploadImageResponse, error) {
+	// Get existing image data by fileName
+	existingImage, err := us.imageRepo.GetImage(ctx, fileName)
+	if err != nil {
+		logrus.Error("failed to get existing image:", err)
+		return domain.UploadImageResponse{}, err
+	}
+
 	var filePath string
 	hName := hash.GenerateHash(time.Now().Format("2006-01-02 15:04:05") + "Hammercode")
 	uploadDir := "./uploads"
@@ -22,37 +29,44 @@ func (us *usecase) UpdateImage(ctx context.Context, payload domain.UploadImage,
 
 	// file path/category/type image
 	uploadDir = fmt.Sprintf("%s/%s/%s", uploadDir, payload.Category, payload.Type)
-	fileName := fmt.Sprintf("%s.%s", hName[0:15], payload.Format)
-	filePath = fmt.Sprintf("%s/%s", uploadDir, fileName)
+	newFileName := fmt.Sprintf("%s.%s", hName[0:15], payload.Format)
+	filePath = fmt.Sprintf("%s/%s", uploadDir, newFileName)
 
 	// Ensure the directory exists, create it if it doesn't
 	if err := os.MkdirAll(uploadDir, os.ModePerm); err != nil {
 		logrus.Error("Failed to create directory:", err)
-		return err
+		return domain.UploadImageResponse{}, err
 	}
 
 	// Save the file to the uploads directory
 	dst, err := os.Create(filePath)
 	if err != nil {
 		logrus.Error("failed to create file path")
-		return err
+		return domain.UploadImageResponse{}, err
 	}
 	defer dst.Close()
 
 	_, err = io.Copy(dst, payload.File)
 	if err != nil {
 		logrus.Error("failed to read all file")
-		return err
+		return domain.UploadImageResponse{}, err
 	}
 
-	// Update data di database
+	// Update data di database with existing ID
 	img := domain.Image{
-		ID:          id,
-		FileName:    fileName,
+		ID:          existingImage.ID,
+		FileName:    newFileName,
 		FilePath:    filePath,
 		Format:      payload.Format,
 		ContentType: payload.ContentType,
 	}
 
-	return us.imageRepo.UpdateImage(ctx, img)
+	err = us.imageRepo.UpdateImage(ctx, img)
+	if err != nil {
+		return domain.UploadImageResponse{}, err
+	}
+
+	return domain.UploadImageResponse{
+		FileName: newFileName,
+	}, nil
 }

cmd/serve_http.go

@@ -198,7 +198,7 @@ func registerHandler(app app.App) *mux.Router {
 	protectedV1AdminRoute.HandleFunc("/users", app.UserHandler.GetUsers).Methods(http.MethodGet)
 
 	protectedV1AdminRoute.HandleFunc("/images", app.ImageHandler.UploadImage).Methods(http.MethodPost)
-	protectedV1AdminRoute.HandleFunc("/images/{id}", app.ImageHandler.UpdateImage).Methods(http.MethodPut)
+	protectedV1AdminRoute.HandleFunc("/images/{fileName}", app.ImageHandler.UpdateImage).Methods(http.MethodPut)
 
 	return router
 }

domain/event.go

@@ -155,7 +155,7 @@ type UpdateEventPayload struct {
 	Tags                 []string            `json:"tags"`
 	Speakers             []string            `json:"speakers"`
 	ReservationStartDate null.Time           `json:"reservation_start_date"`
-	ReservationEndDate   null.Time           `json:"reseveration_end_date"`
+	ReservationEndDate   null.Time           `json:"reservation_end_date"`
 	AdditionalLink       string              `json:"additional_link"`
 	SessionType          string              `json:"session_type" validate:"required"`
 }

domain/image.go

@@ -18,7 +18,7 @@ type ImageRepository interface {
 
 type ImageUsecase interface {
 	UploadImage(context.Context, UploadImage) (UploadImageResponse, error)
-	UpdateImage(ctx context.Context, file UploadImage, id uint) error
+	UpdateImage(ctx context.Context, file UploadImage, fileName string) (UploadImageResponse, error)
 	UpdateUseImage(context.Context, uint) error
 	GetStorage(ctx context.Context, fileName string) (filePath string, err error)
 }