Skip to content

Commit

Permalink
Merge pull request #51 from Beyond-B/feat/49-mypage
Browse files Browse the repository at this point in the history
✨ [Feat]: 마이페이지 조회
  • Loading branch information
jinuklee777 authored Feb 15, 2024
2 parents e5ea944 + f800feb commit 5ecf39a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 3 deletions.
17 changes: 17 additions & 0 deletions src/main/java/com/beyondB/beyondB/controller/UserController.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
package com.beyondB.beyondB.controller;

import com.beyondB.beyondB.apiPayload.BaseResponse;
import com.beyondB.beyondB.converter.UserConverter;
import com.beyondB.beyondB.dto.UserSignupDTO;
import com.beyondB.beyondB.dto.response.UserResponseDTO.UserDetailDTO;
import com.beyondB.beyondB.entity.User;
import com.beyondB.beyondB.security.handler.annotation.AuthUser;
import com.beyondB.beyondB.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
Expand Down Expand Up @@ -29,4 +38,12 @@ public String jwtTest() {
public String test() {
return "test 요청 성공";
}

@ApiResponses({@ApiResponse(responseCode = "COMMON200", description = "조회 성공")})
@Operation(summary = "마이페이지", description = "마이페이지 조회 API입니다.")
@GetMapping("/mypage")
@Parameter(name = "user", hidden = true)
public BaseResponse<UserDetailDTO> myPage(@AuthUser User user) {
return BaseResponse.onSuccess(UserConverter.toUserDetailDTO(user));
}
}
16 changes: 16 additions & 0 deletions src/main/java/com/beyondB/beyondB/converter/UserConverter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.beyondB.beyondB.converter;

import com.beyondB.beyondB.dto.response.UserResponseDTO.UserDetailDTO;
import com.beyondB.beyondB.entity.User;

public class UserConverter {

public static UserDetailDTO toUserDetailDTO(User user) {
return UserDetailDTO.builder()
.id(user.getId())
.username(user.getUsername())
.picture(user.getPicture())
.age(user.getAge())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.beyondB.beyondB.dto.response;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

public class UserResponseDTO {

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class UserDetailDTO {
private Long id;
private String username;
private String picture;
private String age;
}
}
6 changes: 3 additions & 3 deletions src/main/java/com/beyondB/beyondB/entity/enums/Emotion.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

public enum Emotion {
HAPPY,
SAD,
DEPRESSED,
ANGRY,
SURPRISED,
DISGUSTED,
SCARED,
SADNESS,
WORRIED,
;
}

0 comments on commit 5ecf39a

Please sign in to comment.