Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gear/joh 47 add islike in find pet #19

Closed
wants to merge 17 commits into from
Closed

Gear/joh 47 add islike in find pet #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a2cf32
fix: add `IsLike` to PetResponse
macgeargear Jan 9, 2024
fcbbd59
feat: return `IsLike` when there're `bearer token`
macgeargear Jan 9, 2024
3c1d771
chore
macgeargear Jan 9, 2024
3e665d9
add utils
macgeargear Jan 9, 2024
8449b72
fix: adoptdto in userdto file
bookpanda Jan 7, 2024
1e67dee
fix: pet swagger docs
bookpanda Jan 7, 2024
0d53fb6
chore: gen docs
bookpanda Jan 7, 2024
a5244df
chore: fix dto
macgeargear Jan 9, 2024
c1c44a1
fix: add mock context
macgeargear Jan 9, 2024
c60e730
chore: fix test
macgeargear Jan 9, 2024
331cb01
feat: user `c.IsAuth()` for check if user is authenticated
macgeargear Jan 9, 2024
3e7f795
feat: skip auth middleware for [GET] `/pets/` and `/pets/:id`
macgeargear Jan 9, 2024
85dbb48
feat: isAuth for check if user authenticated
macgeargear Jan 9, 2024
292a82a
chore
macgeargear Jan 9, 2024
9bc862b
feat: CanSkipAuth check
macgeargear Jan 9, 2024
26230c6
fix: remove `GET /pet/` use `CanSkipAuth` instead
macgeargear Jan 9, 2024
c19b68e
Merge branch 'dev' into gear/joh-47-add-islike-in-find-pet
macgeargear Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/app/dto/pet.dto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,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"`
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 {
Expand All @@ -39,10 +40,10 @@ type CreatePetRequest struct {
Habit string `json:"habit" validate:"required"`
Caption string `json:"caption"`
Status pet.Status `json:"status" validate:"required" example:"1"`
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"`
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"`
Expand Down Expand Up @@ -76,10 +77,10 @@ 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"`
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"`
Expand Down
47 changes: 44 additions & 3 deletions src/app/handler/pet/pet.handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ import (
"github.com/isd-sgcu/johnjud-gateway/src/app/validator"
petconst "github.com/isd-sgcu/johnjud-gateway/src/constant/pet"
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
Expand All @@ -34,16 +38,35 @@ 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
}

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: response,
Data: petWithLikeResponse,
})
return
}
Expand All @@ -62,6 +85,7 @@ func (h *Handler) FindAll(c router.IContext) {
// @Router /v1/pets/{id} [get]
func (h *Handler) FindOne(c router.IContext) {
id, err := c.Param("id")
isAuth := c.IsAuth()
if err != nil {
c.JSON(http.StatusInternalServerError, dto.ResponseErr{
StatusCode: http.StatusInternalServerError,
Expand All @@ -77,6 +101,23 @@ func (h *Handler) FindOne(c router.IContext) {
return
}

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,
Expand Down
Loading
Loading