[FEAT] Member&Auth 구현 완료

build.gradle

@@ -33,7 +33,15 @@ dependencies {
     testImplementation 'com.h2database:h2'
 
     //security
-    //implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // oauth
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
     //swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.1'

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java

@@ -10,7 +10,8 @@
 import com.eatsfine.eatsfine.domain.store.entity.Store;
 import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable;
 import com.eatsfine.eatsfine.domain.user.entity.User;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/eatsfine/eatsfine/domain/businesshours/entity/BusinessHours.java

@@ -1,7 +1,7 @@
 package com.eatsfine.eatsfine.domain.businesshours.entity;
 
 import com.eatsfine.eatsfine.domain.store.entity.Store;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/eatsfine/eatsfine/domain/image/status/ImageErrorStatus.java

@@ -15,6 +15,7 @@ public enum ImageErrorStatus implements BaseErrorCode {
     _IMAGE_NOT_FOUND(HttpStatus.NOT_FOUND, "IMAGE404", "해당하는 이미지가 존재하지 않습니다."),
     _INVALID_IMAGE_KEY(HttpStatus.BAD_REQUEST, "IMAGE4003", "유효하지 않은 이미지 키입니다."),
     _INVALID_S3_DIRECTORY(HttpStatus.BAD_REQUEST, "IMAGE4004", "유효하지 않은 S3 디렉토리입니다."),
+    FILE_TOO_LARGE(HttpStatus.BAD_REQUEST, "IMAGE4005", "첨부하는 이미지의 크기가 너무 큽니다.")
     ;
 
 

src/main/java/com/eatsfine/eatsfine/domain/menu/entity/Menu.java

@@ -2,7 +2,8 @@
 
 import com.eatsfine.eatsfine.domain.menu.enums.MenuCategory;
 import com.eatsfine.eatsfine.domain.store.entity.Store;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;

src/main/java/com/eatsfine/eatsfine/domain/payment/entity/Payment.java

@@ -5,7 +5,7 @@
 import com.eatsfine.eatsfine.domain.payment.enums.PaymentProvider;
 import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus;
 import com.eatsfine.eatsfine.domain.payment.enums.PaymentType;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/eatsfine/eatsfine/domain/store/entity/Store.java

@@ -13,7 +13,8 @@
 import com.eatsfine.eatsfine.domain.user.entity.User;
 import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus;
 import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.BatchSize;
@@ -191,4 +192,4 @@ public void updateBasicInfo(StoreReqDto.StoreUpdateDto dto) {
         }
     }
 
-}
+}

src/main/java/com/eatsfine/eatsfine/domain/storetable/entity/StoreTable.java

@@ -2,7 +2,8 @@
 
 import com.eatsfine.eatsfine.domain.storetable.enums.SeatsType;
 import com.eatsfine.eatsfine.domain.table_layout.entity.TableLayout;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;

src/main/java/com/eatsfine/eatsfine/domain/table_layout/entity/TableLayout.java

@@ -2,7 +2,7 @@
 
 import com.eatsfine.eatsfine.domain.store.entity.Store;
 import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;

src/main/java/com/eatsfine/eatsfine/domain/tableblock/entity/TableBlock.java

@@ -1,7 +1,7 @@
 package com.eatsfine.eatsfine.domain.tableblock.entity;
 
 import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/eatsfine/eatsfine/domain/tableimage/entity/TableImage.java

@@ -1,7 +1,7 @@
 package com.eatsfine.eatsfine.domain.tableimage.entity;
 
 import com.eatsfine.eatsfine.domain.store.entity.Store;
-import com.eatsfine.eatsfine.global.entity.BaseEntity;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 

src/main/java/com/eatsfine/eatsfine/domain/term/entity/Term.java

@@ -0,0 +1,35 @@
+package com.eatsfine.eatsfine.domain.term.entity;
+
+import com.eatsfine.eatsfine.domain.user.entity.User;
+import com.eatsfine.eatsfine.global.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "term")
+public class Term extends BaseEntity {
+        @Id
+        @GeneratedValue(strategy = GenerationType.IDENTITY)
+        private Long id;
+
+        @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, orphanRemoval = true)
+        @JoinColumn(name = "user_id", nullable = false, unique = true)
+        private User user;
+
+        @Column(name = "tos_consent", nullable = false)
+        private Boolean tosConsent;
+
+        @Column(name = "privacy_consent", nullable = false)
+        private Boolean privacyConsent;
+
+        @Column(name = "marketing_consent", nullable = false)
+        private Boolean marketingConsent;
+
+}

src/main/java/com/eatsfine/eatsfine/domain/term/repository/TermRepository.java

@@ -0,0 +1,10 @@
+package com.eatsfine.eatsfine.domain.term.repository;
+
+import com.eatsfine.eatsfine.domain.term.entity.Term;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TermRepository extends JpaRepository<Term, Long> {
+
+}

src/main/java/com/eatsfine/eatsfine/domain/user/controller/UserController.java

@@ -1,4 +1,134 @@
 package com.eatsfine.eatsfine.domain.user.controller;
 
+
+import com.eatsfine.eatsfine.domain.user.dto.request.UserRequestDto;
+import com.eatsfine.eatsfine.domain.user.dto.response.UserResponseDto;
+import com.eatsfine.eatsfine.domain.user.exception.UserException;
+import com.eatsfine.eatsfine.domain.user.service.UserService;
+import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus;
+import com.eatsfine.eatsfine.global.apiPayload.ApiResponse;
+import com.eatsfine.eatsfine.global.auth.AuthCookieProvider;
+import com.eatsfine.eatsfine.global.config.jwt.JwtTokenProvider;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseCookie;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+
+@Tag(name = "User", description = "회원 관리 API")
+@Slf4j
+@RestController
+@RequiredArgsConstructor
 public class UserController {
+    private final UserService userService;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final AuthCookieProvider authCookieProvider;
+
+    @PostMapping("/api/auth/signup")
+    @Operation(summary = "회원가입 API", description = "회원가입을 처리하는 API입니다.")
+    public ResponseEntity<UserResponseDto.JoinResultDto> signup(@RequestBody @Valid UserRequestDto.JoinDto joinDto) {
+        UserResponseDto.JoinResultDto result = userService.signup(joinDto);
+        return ResponseEntity.ok(result);
+    }
+
+    @PostMapping("/api/auth/login")
+    @Operation(summary = "로그인 API", description = "사용자 로그인을 처리하는 API입니다.")
+    public ResponseEntity<ApiResponse<UserResponseDto.LoginResponseDto>> login(@RequestBody UserRequestDto.LoginDto loginDto) {
+        UserResponseDto.LoginResponseDto loginResult = userService.login(loginDto);
+
+        if (loginResult.getRefreshToken() == null || loginResult.getRefreshToken().isBlank()) {
+            throw new UserException(UserErrorStatus.REFRESH_TOKEN_NOT_ISSUED);
+        }
+
+        ResponseCookie refreshCookie = authCookieProvider.refreshTokenCookie(loginResult.getRefreshToken());
+
+        UserResponseDto.LoginResponseDto body = UserResponseDto.LoginResponseDto.builder()
+                .id(loginResult.getId())
+                .accessToken(loginResult.getAccessToken())
+                .refreshToken(null)
+                .build();
+
+        return ResponseEntity.ok()
+                .header(HttpHeaders.SET_COOKIE, refreshCookie.toString())
+                .body(ApiResponse.onSuccess(body));
+    }
+
+    @GetMapping("/api/v1/member/info")
+    @Operation(
+            summary = "유저 내 정보 조회 API - 인증 필요",
+            description = "유저가 내 정보를 조회하는 API입니다.",
+            security = {@SecurityRequirement(name = "JWT")}
+    )
+    public ApiResponse<UserResponseDto.UserInfoDto> getMyInfo(HttpServletRequest request) {
+        return ApiResponse.onSuccess(userService.getMemberInfo(request));
+    }
+
+
+    @PatchMapping(value = "/api/v1/member/info")
+    @Operation(
+            summary = "닉네임/전화번호 수정 API - 인증 필요",
+            description = "닉네임/전화번호만 수정합니다. (JSON)",
+            security = {@SecurityRequirement(name = "JWT")}
+    )
+    public ResponseEntity<ApiResponse<String>> updateMyInfoText(
+            @RequestBody @Valid UserRequestDto.UpdateDto updateDto, HttpServletRequest request
+    ) {
+        String result = userService.updateMemberInfo(updateDto, null, request);
+        return ResponseEntity.ok(ApiResponse.onSuccess(result));
+    }
+
+
+    @PutMapping(
+            value = "/api/v1/member/profile-image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(
+            summary = "프로필 이미지 수정 API - 인증 필요",
+            description = "프로필 이미지만 수정합니다. (multipart/form-data)",
+            security = {@SecurityRequirement(name = "JWT")}
+    )
+    public ResponseEntity<ApiResponse<String>> updateProfileImage(
+            @RequestPart(value = "profileImage") MultipartFile profileImage,
+            HttpServletRequest request
+    ) {
+        String result = userService.updateMemberInfo(null, profileImage, request);
+        return ResponseEntity.ok(ApiResponse.onSuccess(result));
+    }
+
+
+    @DeleteMapping("/api/auth/withdraw")
+    @Operation(
+            summary = "회원 탈퇴 API - 인증 필요",
+            description = "회원 탈퇴 기능 API입니다.",
+            security = {@SecurityRequirement(name = "JWT")}
+    )
+    public ResponseEntity<?> withdraw(HttpServletRequest request) {
+        userService.withdraw(request);
+        return ResponseEntity.ok(ApiResponse.onSuccess("회원 탈퇴가 완료되었습니다."));
+    }
+
+
+    @DeleteMapping("/api/auth/logout")
+    @Operation(
+            summary = "회원 로그아웃 API - 인증 필요",
+            description = "회원 로그아웃 기능 API입니다.",
+            security = {@SecurityRequirement(name = "JWT")}
+    )
+    public ResponseEntity<ApiResponse<String>> logout(HttpServletRequest request) {
+        userService.logout(request);
+        ResponseCookie clearCookie = authCookieProvider.clearRefreshTokenCookie();
+        return ResponseEntity.ok()
+                .header(HttpHeaders.SET_COOKIE, clearCookie.toString())
+                .body(ApiResponse.onSuccess("로그아웃이 되었습니다."));
+    }
+
 }