Gear/joh 35 image endpoints

src/app/constant/error.constant.go

@@ -13,3 +13,4 @@ const InvalidArgumentMessage = "Invalid Argument"
 
 const PetNotFoundMessage = "Pet not found"
 const UserNotFoundMessage = "User not found"
+const ImageNotFoundMessage = "Image not found"

src/app/dto/image.dto.go

@@ -1,7 +1,11 @@
 package dto
 
-type ImageDto struct {
+type UploadImageRequest struct {
 	Filename string `json:"filename" validate:"required"`
 	Data     []byte `json:"data" validate:"required"`
 	PetId    string `json:"pet_id" validate:"required"`
 }
+
+type DeleteImageResponse struct {
+	Success bool `json:"success"`
+}

src/app/dto/pet.dto.go

@@ -5,8 +5,9 @@ import (
 )
 
 type ImageResponse struct {
-	Id  string `json:"id"`
-	Url string `json:"url"`
+	Id        string `json:"id"`
+	Url       string `json:"url"`
+	ObjectKey string `json:"object_key"`
 }
 
 type PetResponse struct {
@@ -21,15 +22,16 @@ type PetResponse struct {
 	Habit        string          `json:"habit"`
 	Caption      string          `json:"caption"`
 	Status       pet.Status      `json:"status"`
-	IsSterile    *bool           `json:"is_sterile"`
-	IsVaccinated *bool           `json:"is_vaccinated"`
-	IsVisible    *bool           `json:"is_visible"`
-	IsClubPet    *bool           `json:"is_club_pet"`
-	Origin       string          `json:"origin"`
+	IsSterile    bool            `json:"is_sterile"`
+	IsVaccinated bool            `json:"is_vaccinated"`
+	IsVisible    bool            `json:"is_visible"`
+	IsClubPet    bool            `json:"is_club_pet"`
+	Background   string          `json:"background"`
 	Address      string          `json:"address"`
 	Contact      string          `json:"contact"`
 	AdoptBy      string          `json:"adopt_by"`
 	Images       []ImageResponse `json:"images"`
+	IsLike       bool            `json:"is_like"`
 }
 
 type CreatePetRequest struct {
@@ -43,11 +45,12 @@ type CreatePetRequest struct {
 	Habit        string     `json:"habit" validate:"required"`
 	Caption      string     `json:"caption"`
 	Status       pet.Status `json:"status" validate:"required" example:"findhome"`
-	IsSterile    *bool      `json:"is_sterile" validate:"required"`
-	IsVaccinated *bool      `json:"is_vaccinated" validate:"required"`
-	IsVisible    *bool      `json:"is_visible" validate:"required"`
-	IsClubPet    *bool      `json:"is_club_pet" validate:"required"`
-	Origin       string     `json:"origin" validate:"required"`
+	IsSterile    bool       `json:"is_sterile" validate:"required"`
+	IsVaccinated bool       `json:"is_vaccinated" validate:"required"`
+	IsVisible    bool       `json:"is_visible" validate:"required"`
+	IsClubPet    bool       `json:"is_club_pet" validate:"required"`
+	Background   string     `json:"background"`
+
 	Address      string     `json:"address"`
 	Contact      string     `json:"contact"`
 	AdoptBy      string     `json:"adopt_by"`
@@ -82,11 +85,11 @@ type UpdatePetRequest struct {
 	Habit        string     `json:"habit"`
 	Caption      string     `json:"caption"`
 	Status       pet.Status `json:"status"`
-	IsSterile    *bool      `json:"is_sterile"`
-	IsVaccinated *bool      `json:"is_vaccinated"`
-	IsVisible    *bool      `json:"is_visible"`
-	IsClubPet    *bool      `json:"is_club_pet"`
-	Origin       string     `json:"origin"`
+	IsSterile    bool       `json:"is_sterile"`
+	IsVaccinated bool       `json:"is_vaccinated"`
+	IsVisible    bool       `json:"is_visible"`
+	IsClubPet    bool       `json:"is_club_pet"`
+	Background   string     `json:"background"`
 	Address      string     `json:"address"`
 	Contact      string     `json:"contact"`
 	AdoptBy      string     `json:"adopt_by"`

src/app/handler/image/image.handler.go

@@ -1,28 +1,113 @@
 package auth
 
 import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/isd-sgcu/johnjud-gateway/src/app/constant"
+	"github.com/isd-sgcu/johnjud-gateway/src/app/dto"
 	"github.com/isd-sgcu/johnjud-gateway/src/app/router"
 	"github.com/isd-sgcu/johnjud-gateway/src/app/validator"
+	imageConst "github.com/isd-sgcu/johnjud-gateway/src/constant/image"
 	imageSvc "github.com/isd-sgcu/johnjud-gateway/src/pkg/service/image"
 )
 
 type Handler struct {
 	service  imageSvc.Service
-	validate *validator.DtoValidator
+	validate validator.IDtoValidator
 }
 
-func NewHandler(service imageSvc.Service, validate *validator.DtoValidator) *Handler {
+func NewHandler(service imageSvc.Service, validate validator.IDtoValidator) *Handler {
 	return &Handler{service, validate}
 }
 
 func (h *Handler) FindByPetId(c *router.FiberCtx) {
+	id, err := c.ID()
+	if err != nil {
+		c.JSON(http.StatusBadRequest, dto.ResponseErr{
+			StatusCode: http.StatusInternalServerError,
+			Message:    constant.InvalidIDMessage,
+			Data:       nil,
+		})
+		return
+	}
+
+	response, respErr := h.service.FindByPetId(id)
+	if respErr != nil {
+		c.JSON(respErr.StatusCode, respErr)
+		return
+	}
 
+	c.JSON(http.StatusOK, dto.ResponseSuccess{
+		StatusCode: http.StatusOK,
+		Message:    imageConst.FindImageSuccessMessage,
+		Data:       response,
+	})
+	return
 }
 
 func (h *Handler) Upload(c *router.FiberCtx) {
+	request := &dto.UploadImageRequest{}
+	err := c.Bind(request)
+	fmt.Println("request: ", request)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, dto.ResponseErr{
+			StatusCode: http.StatusBadRequest,
+			Message:    constant.BindingRequestErrorMessage + err.Error(),
+			Data:       nil,
+		})
+		return
+	}
+
+	if err := h.validate.Validate(request); err != nil {
+		var errorMessage []string
+		for _, reqErr := range err {
+			errorMessage = append(errorMessage, reqErr.Message)
+		}
+		c.JSON(http.StatusBadRequest, dto.ResponseErr{
+			StatusCode: http.StatusBadRequest,
+			Message:    constant.InvalidRequestBodyMessage + strings.Join(errorMessage, ", "),
+			Data:       nil,
+		})
+		return
+	}
 
+	response, respErr := h.service.Upload(request)
+	if respErr != nil {
+		c.JSON(respErr.StatusCode, respErr)
+		return
+	}
+
+	c.JSON(http.StatusCreated, dto.ResponseSuccess{
+		StatusCode: http.StatusCreated,
+		Message:    imageConst.UploadImageSuccessMessage,
+		Data:       response,
+	})
+	return
 }
 
 func (h *Handler) Delete(c *router.FiberCtx) {
+	id, err := c.ID()
+	if err != nil {
+		c.JSON(http.StatusBadRequest, dto.ResponseErr{
+			StatusCode: http.StatusBadRequest,
+			Message:    err.Error(),
+			Data:       nil,
+		})
+		return
+	}
+
+	res, errRes := h.service.Delete(id)
+	if errRes != nil {
+		c.JSON(errRes.StatusCode, errRes)
+		return
+	}
 
+	c.JSON(http.StatusOK, dto.ResponseSuccess{
+		StatusCode: http.StatusOK,
+		Message:    imageConst.DelteImageSuccessMessage,
+		Data:       res,
+	})
+	return
 }

src/app/handler/like/like.handler.go

@@ -21,7 +21,7 @@ func NewHandler(service likeSvc.Service, validate validator.IDtoValidator) *Hand
 }
 
 func (h *Handler) FindByUserId(c router.IContext) {
-	id, err := c.Param("id")
+	id, err := c.ID()
 	if err != nil {
 		c.JSON(http.StatusBadRequest, dto.ResponseErr{
 			StatusCode: http.StatusInternalServerError,
@@ -77,7 +77,7 @@ func (h *Handler) Create(c router.IContext) {
 }
 
 func (h *Handler) Delete(c router.IContext) {
-	id, err := c.Param("id")
+	id, err := c.ID()
 	if err != nil {
 		c.JSON(http.StatusBadRequest, dto.ResponseErr{
 			StatusCode: http.StatusBadRequest,

src/app/handler/pet/pet.handler.go

@@ -9,17 +9,21 @@ import (
 	"github.com/isd-sgcu/johnjud-gateway/src/app/router"
 	"github.com/isd-sgcu/johnjud-gateway/src/app/validator"
 	imageSvc "github.com/isd-sgcu/johnjud-gateway/src/pkg/service/image"
+	likeSvc "github.com/isd-sgcu/johnjud-gateway/src/pkg/service/like"
 	petSvc "github.com/isd-sgcu/johnjud-gateway/src/pkg/service/pet"
+
+	petUtils "github.com/isd-sgcu/johnjud-gateway/src/app/utils/pet"
 )
 
 type Handler struct {
 	service      petSvc.Service
 	imageService imageSvc.Service
+	likeService  likeSvc.Service
 	validate     validator.IDtoValidator
 }
 
-func NewHandler(service petSvc.Service, imageService imageSvc.Service, validate validator.IDtoValidator) *Handler {
-	return &Handler{service, imageService, validate}
+func NewHandler(service petSvc.Service, imageService imageSvc.Service, likeService likeSvc.Service, validate validator.IDtoValidator) *Handler {
+	return &Handler{service, imageService, likeService, validate}
 }
 
 // FindAll is a function that returns all pets in database
@@ -33,13 +37,36 @@ func NewHandler(service petSvc.Service, imageService imageSvc.Service, validate
 // @Failure 503 {object} dto.ResponseServiceDownErr "Service is down"
 // @Router /v1/pets/ [get]
 func (h *Handler) FindAll(c router.IContext) {
+	isAuth := c.IsAuth()
 	response, respErr := h.service.FindAll()
 	if respErr != nil {
 		c.JSON(respErr.StatusCode, respErr)
 		return
 	}
 
-	c.JSON(http.StatusOK, response)
+	if !isAuth {
+		c.JSON(http.StatusOK, dto.ResponseSuccess{
+			StatusCode: http.StatusOK,
+			Message:    petconst.FindAllPetSuccessMessage,
+			Data:       response,
+		})
+		return
+	}
+
+	userID := c.UserID()
+	likeResponse, likeErr := h.likeService.FindByUserId(userID)
+	if likeErr != nil {
+		c.JSON(likeErr.StatusCode, likeErr)
+		return
+
+	}
+	petWithLikeResponse := petUtils.MapIsLikeToPets(likeResponse, response)
+
+	c.JSON(http.StatusOK, dto.ResponseSuccess{
+		StatusCode: http.StatusOK,
+		Message:    petconst.FindAllPetSuccessMessage,
+		Data:       petWithLikeResponse,
+	})
 	return
 }
 
@@ -56,7 +83,8 @@ func (h *Handler) FindAll(c router.IContext) {
 // @Failure 503 {object} dto.ResponseServiceDownErr "Service is down"
 // @Router /v1/pets/{id} [get]
 func (h *Handler) FindOne(c router.IContext) {
-	id, err := c.Param("id")
+	id, err := c.ID()
+	isAuth := c.IsAuth()
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, dto.ResponseErr{
 			StatusCode: http.StatusInternalServerError,
@@ -72,7 +100,28 @@ func (h *Handler) FindOne(c router.IContext) {
 		return
 	}
 
-	c.JSON(http.StatusOK, response)
+	if !isAuth {
+		c.JSON(http.StatusOK, dto.ResponseSuccess{
+			StatusCode: http.StatusOK,
+			Message:    petconst.FindOnePetSuccessMessage,
+			Data:       response,
+		})
+		return
+	}
+
+	userId := c.UserID()
+	likeResponse, likeErr := h.likeService.FindByUserId(userId)
+	if likeErr != nil {
+		c.JSON(likeErr.StatusCode, likeErr)
+	}
+
+	response.IsLike = petUtils.IsLike(response.Id, likeResponse)
+
+	c.JSON(http.StatusOK, dto.ResponseSuccess{
+		StatusCode: http.StatusOK,
+		Message:    petconst.FindOnePetSuccessMessage,
+		Data:       response,
+	})
 	return
 }