feat : BasicInfo CRUD api 구현

src/main/java/capstone/facefriend/FacefriendApplication.java

@@ -8,11 +8,11 @@
 
 @EnableJpaAuditing
 @SpringBootApplication
-public class FaceFriendApplication {
+public class FacefriendApplication {
 
 	public static void main(String[] args) {
 		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
-		SpringApplication.run(FaceFriendApplication.class, args);
+		SpringApplication.run(FacefriendApplication.class, args);
 	}
 
 }

src/main/java/capstone/facefriend/auth/config/AuthConfig.java

@@ -49,41 +49,39 @@ private HandlerInterceptor loginCheckInterceptor() {
         return new PathMatchInterceptor(loginCheckInterceptor)
                 .addExcludePathPattern("/**", OPTIONS)
 
-                .addIncludePathPattern("/signout", DELETE)
                 .addIncludePathPattern("/test", GET)
+                .addIncludePathPattern("/members/**", ANY)
 
-                .addExcludePathPattern("/reissue", POST); // 토큰 만료 시에는 해당 요청을 가로채지 않아야 합니다.
+                .addExcludePathPattern("/members/reissue", POST); // 토큰 만료 시에는 해당 요청을 가로채지 않아야 합니다.
     }
 
     private HandlerInterceptor loginInterceptor() {
         return new PathMatchInterceptor(loginInterceptor)
                 .addExcludePathPattern("/**", OPTIONS)
 
-                .addIncludePathPattern("/signout", DELETE)
-                .addIncludePathPattern("/test", GET)
-
-                .addExcludePathPattern("/reissue", POST); // 토큰 만료 시에는 해당 요청을 가로채지 않아야 합니다.
+                .addIncludePathPattern("/members/**", ANY)
+                .addExcludePathPattern("/members/reissue", POST); // 토큰 만료 시에는 해당 요청을 가로채지 않아야 합니다.
     }
 
     private HandlerInterceptor tokenReissueInterceptor() {
         return new PathMatchInterceptor(tokenReissueInterceptor)
                 .addExcludePathPattern("/**", OPTIONS)
 
-                .addIncludePathPattern("/reissue", POST); // 토큰 만료 시에는 해당 요청을 가로채야 합니다.
+                .addIncludePathPattern("/members/**", ANY);
     }
 
     private HandlerInterceptor tokenBlackListInterceptor() {
         return new PathMatchInterceptor(tokenBlackListInterceptor)
                 .addExcludePathPattern("/**", OPTIONS)
 
-                .addIncludePathPattern("/test", GET);
+                .addIncludePathPattern("/members/**", ANY);
     }
 
     private HandlerInterceptor verificationInterceptor() {
         return new PathMatchInterceptor(verificationInterceptor)
                 .addExcludePathPattern("/**", OPTIONS)
 
-                .addIncludePathPattern("/test", GET);
+                .addIncludePathPattern("/members/**", ANY);
     }
 
     @Override

src/main/java/capstone/facefriend/auth/exception/AuthExceptionType.java

@@ -12,7 +12,7 @@ public enum AuthExceptionType implements ExceptionType {
     UNSUPPORTED_TOKEN(Status.BAD_REQUEST, 2005, "지원되지 않는 토큰입니다."),
     INVALID_TOKEN(Status.BAD_REQUEST, 2006, "토큰이 유효하지 않습니다."),
     BAD_REQUEST_TO_PROVIDER(Status.BAD_REQUEST, 2007, "토큰이 유효하지 않습니다."),
-    UNAUTHORIZED(Status.UNAUTHORIZED, 2008, "로그인한 정보가 없습니다."),
+    UNAUTHORIZED(Status.UNAUTHORIZED, 2008, "로그인한 정보가 없습니다. 로그인하시기 바랍니다."),
     ;
 
     private final Status status;

src/main/java/capstone/facefriend/auth/service/AuthService.java

@@ -34,7 +34,7 @@ public String loginUri(String redirectUri, String provider) {
     public TokenResponse generateTokens(OAuthMember oAuthMember) {
         Member newMember = Member.builder()
                 .email(oAuthMember.email())
-                .name(oAuthMember.nickname())
+                .nickname(oAuthMember.nickname())
                 .password(TEMPORARY_GOOGLE_PASSWORD)
                 .imageUrl(oAuthMember.imageUrl())
                 .isVerified(true)

src/main/java/capstone/facefriend/member/controller/BasicInfoController.java

@@ -0,0 +1,35 @@
+package capstone.facefriend.member.controller;
+
+
+import capstone.facefriend.auth.controller.support.AuthMember;
+import capstone.facefriend.member.service.BasicInfoService;
+import capstone.facefriend.member.service.dto.BasicInfoRequest;
+import capstone.facefriend.member.service.dto.BasicInfoResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/members")
+public class BasicInfoController {
+
+    private final BasicInfoService basicInfoService;
+
+    @GetMapping("/basic-info")
+    public ResponseEntity<BasicInfoResponse> getBasicInfo(
+            @AuthMember Long memberId
+    ) {
+        return ResponseEntity.ok(basicInfoService.getBasicInfo(memberId));
+    }
+
+    @PutMapping("/basic-info")
+    public ResponseEntity<BasicInfoResponse> putBasicInfo(
+            @AuthMember Long memberId,
+            @RequestBody BasicInfoRequest request
+    ) {
+        return ResponseEntity.ok(basicInfoService.putBasicInfo(memberId, request));
+    }
+}

src/main/java/capstone/facefriend/member/controller/MemberController.java

@@ -24,79 +24,96 @@ public class MemberController {
 
     private final MemberService memberService;
 
-    @PostMapping("/members/send-code")
+    // 일반 유저 로직 ("/auth" 로 시작)
+    @PostMapping("/auth/find-email")
+    public ResponseEntity<FindEmailResponse> findEmail(
+            @RequestParam("email") String email
+    ) {
+        return ResponseEntity.ok(memberService.findEmail(email));
+    }
+
+    @PostMapping("/auth/send-temporary-password")
+    public ResponseEntity<String> sendTemporaryPassword(
+            @RequestParam("email") String email
+    ) {
+        return ResponseEntity.ok(memberService.sendTemporaryPassword(email));
+    }
+
+    @PostMapping("/auth/verify-temporary-password")
+    public ResponseEntity<String> resetNewPassword(
+            @RequestParam("email") String email,
+            @RequestParam("temporaryPassword") String temporaryPassword,
+            @RequestBody ResetPasswordRequest request
+    ) {
+        String newPassword = request.newPassword();
+        String newPassword2 = request.newPassword2();
+
+        if (!newPassword.equals(newPassword2)) {
+            throw new MemberException(PASSWORDS_NOT_EQUAL);
+        }
+        return ResponseEntity.ok(memberService.verifyTemporaryPassword(email, temporaryPassword, newPassword));
+    }
+
+    @PostMapping("/auth/verify-duplication")
+    public ResponseEntity<String> verifyDuplication(
+            @RequestParam("email") String email
+    ) {
+        return ResponseEntity.ok(memberService.verifyDuplication(email));
+    }
+
+    @PostMapping("/auth/send-code")
     public ResponseEntity<String> sendCode(
-            @RequestParam("email") String email) {
+            @RequestParam("email") String email
+    ) {
         return ResponseEntity.ok(memberService.sendCode(email));
     }
 
-    @GetMapping("/members/verify-code")
+    @GetMapping("/auth/verify-code")
     public ResponseEntity<EmailVerificationResponse> verifyCode(
             @RequestParam("email") String email,
-            @RequestParam("code") String code) {
+            @RequestParam("code") String code
+    ) {
         return ResponseEntity.ok(memberService.verifyCode(email, code));
     }
 
-    @PostMapping("/members/signup")
+    @PostMapping("/auth/signup")
     public ResponseEntity<String> signUp(
-            @RequestBody SignUpRequest request,
-            @RequestParam("isVerified") boolean isVerified) {
-        return ResponseEntity.ok(memberService.signUp(request, isVerified));
+            @RequestBody SignUpRequest request
+    ) {
+        return ResponseEntity.ok(memberService.signUp(request));
     }
 
-    @PostMapping("/members/signin")
+    @PostMapping("/auth/signin")
     public ResponseEntity<TokenResponse> signIn(
-            @RequestBody SignInRequest request) {
+            @RequestBody SignInRequest request
+    ) {
         return ResponseEntity.ok(memberService.signIn(request));
     }
 
 
 
-
-
-    @PostMapping("/reissue")
-    public ResponseEntity<TokenResponse> reissueTokens(
-            @RequestBody ReissueRequest request,
-            @AuthMember Long memberId) {
-        String refreshToken = request.refreshToken();
-        return ResponseEntity.ok(memberService.reissueTokens(memberId, refreshToken));
-    }
-
-    @DeleteMapping("/signout")
+    // 구글 유저, 일반 유저 공통 로직 ("/members" 로 시작)
+    @DeleteMapping("/members/signout")
     public ResponseEntity<String> signOut(
             HttpServletRequest request,
-            @AuthMember Long memberId) {
+            @AuthMember Long memberId
+    ) {
         String accessToken = AuthenticationExtractor.extractAccessToken(request)
                 .orElseThrow(() -> new MemberException(UNAUTHORIZED));
         return ResponseEntity.ok(memberService.signOut(memberId, accessToken));
     }
 
-    @PostMapping("/find-email")
-    public ResponseEntity<FindEmailResponse> findEmail(
-            @RequestBody FindEmailRequest request) {
-        return ResponseEntity.ok(memberService.findEmail(request.name(), request.email()));
+    @PostMapping("/members/reissue")
+    public ResponseEntity<TokenResponse> reissueTokens(
+            @RequestBody ReissueRequest request,
+            @AuthMember Long memberId
+    ) {
+        String refreshToken = request.refreshToken();
+        return ResponseEntity.ok(memberService.reissueTokens(memberId, refreshToken));
     }
 
-    @PostMapping("/send-temporary-password")
-    public ResponseEntity<String> sendTemporaryPassword(
-            @RequestParam("email") String email) {
-        return ResponseEntity.ok(memberService.sendTemporaryPassword(email));
-    }
 
-    @PostMapping("/verify-temporary-password")
-    public ResponseEntity<String> resetNewPassword(
-            @RequestParam("email") String email,
-            @RequestParam("temporaryPassword") String temporaryPassword,
-            @RequestBody ResetPasswordRequest request
-    ) {
-        String newPassword = request.newPassword();
-        String newPassword2 = request.newPassword2();
 
-        if (!newPassword.equals(newPassword2)) {
-            throw new MemberException(PASSWORDS_NOT_EQUAL)    ;
-        }
-        return ResponseEntity.ok(memberService.verifyTemporaryPassword(email, temporaryPassword, newPassword));
-    }
 
 
     @GetMapping("/test")

src/main/java/capstone/facefriend/member/domain/BasicInfo.java

@@ -1,20 +1,134 @@
 package capstone.facefriend.member.domain;
 
-import lombok.Getter;
+import jakarta.persistence.*;
+import lombok.*;
 
 @Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EqualsAndHashCode(of = {"id"}, callSuper = false)
+@Entity
 public class BasicInfo {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(nullable = false)
     private String nickname;
 
-    private String gender;
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Gender gender;
 
-    private String age;
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private AgeGroup ageGroup;
 
-    private String height;
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private AgeDegree ageDegree;
 
-    private String region;
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private HeightGroup heightGroup;
 
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Region region;
+
+    public enum Gender {
+        DEFAULT(""),
+        MALE("남자"),
+        FEMALE("여자");
+
+        private final String value;
+
+        Gender(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum AgeGroup {
+        DEFAULT(""),
+        TWENTIES("20 대"),
+        THIRTIES("30 대"),
+        FORTIES("40 대"),
+        FIFTIES("50 대"),
+        SIXTIES("60 대");
+
+        private final String value;
+
+        AgeGroup(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum AgeDegree {
+        DEFAULT(""),
+        EARLY("초반"),
+        MIDDLE("중반"),
+        LATE("후반");
+
+        private final String value;
+
+        AgeDegree(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum HeightGroup {
+        DEFAULT(""),
+        FIFTIES("150cm 대 이하"),
+        SIXTIES("160cm 대"),
+        SEVENTIES("170cm 대"),
+        EIGHTIES("180cm 대"),
+        NINETIES("190cm 대 이상");
+
+        private final String value;
+
+        HeightGroup(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    public enum Region {
+        DEFAULT(""),
+        GANGNAM_SEOCHO_YANGJAE("강남, 서초, 양재"),
+        JAMSIL_SONGPA_GANGDONG("잠실, 송파, 강동"),
+        DONGJAK_GWANAK_SADANG("동작, 관악, 사당"),
+        MAPO_SEODAEMUN_EUNPYANG("마포, 서대문, 은평"),
+        JONGNO_JUNGGU_YONGSAN("종로, 중구, 용산"),
+        NOWON_DOBONG_GANGBUK_SUNGBUK("노원, 도봉, 강북, 성북"),
+        GWANGJIN_SEONGDONG_JUNGRANG_DONGDAEMUN("광진, 성동, 중랑, 동대문"),
+        YEONGDEUNGPO_GURO_SINDORIM("영등포, 구로, 신도림");
+
+        private final String value;
+
+        Region(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
 }