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.

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

[3주차] 과제 #4

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
69 changes: 0 additions & 69 deletions src/main/java/org/sopt/seminar2/diary/api/DiaryController.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.sopt.seminar2.diary.api.annotation;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
public @interface CheckUserAuth {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
package org.sopt.seminar2.diary.api.controller;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;

import org.sopt.seminar2.diary.api.annotation.CheckUserAuth;
import org.sopt.seminar2.diary.api.dto.request.DiaryCreateRequest;
import org.sopt.seminar2.diary.api.dto.request.DiaryUpdateRequest;
import org.sopt.seminar2.diary.api.dto.response.DiaryDetailResponse;
import org.sopt.seminar2.diary.api.dto.response.DiaryListResponse;
import org.sopt.seminar2.diary.common.dto.SuccessResponse;
import org.sopt.seminar2.diary.domain.enums.Category;
import org.sopt.seminar2.diary.service.DiaryService;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import static org.sopt.seminar2.diary.common.code.SuccessCode.SUCCESS_CREATE_DIARY;
import static org.sopt.seminar2.diary.common.code.SuccessCode.SUCCESS_GET_DIARY_DETAIL;
import static org.sopt.seminar2.diary.common.code.SuccessCode.SUCCESS_DELETE_DIARY;
import static org.sopt.seminar2.diary.common.code.SuccessCode.SUCCESS_UPDATE_DIARY;


@RestController
@RequiredArgsConstructor
@RequestMapping("/api")
public class DiaryController {

private final String USERNAME_HEADER = "username";
private final String PASSWORD_HEADER = "password";

private final DiaryService diaryService;

@PostMapping("/diary")
public ResponseEntity<SuccessResponse> postDiary(
@Valid @RequestBody DiaryCreateRequest diaryCreateRequest,
@RequestHeader(USERNAME_HEADER) String username,
@RequestHeader(PASSWORD_HEADER) String password
) {
diaryService.postDiary(
diaryCreateRequest.title(),
diaryCreateRequest.content(),
Category.findCategory(diaryCreateRequest.category()),
username,
password
);
return ResponseEntity.ok(SuccessResponse.of(SUCCESS_CREATE_DIARY));
}

// 일기 상세 조회
@GetMapping("/diary/{diaryId}")
public ResponseEntity<SuccessResponse<DiaryDetailResponse>> getDiary(
@PathVariable long diaryId
) {
DiaryDetailResponse diaryDetailResponse = diaryService.getDiary(diaryId);
return ResponseEntity.ok(SuccessResponse.of(SUCCESS_GET_DIARY_DETAIL, diaryDetailResponse));
}

// 메인 홈
@GetMapping("/diary")
public ResponseEntity<DiaryListResponse> getDiaryList(
@RequestParam(required = false) String category
) {
DiaryListResponse diaryListResponse = diaryService.getDiaryList(Category.findCategory(category));
return ResponseEntity.ok().body(diaryListResponse);
}

// 내 일기 모아보기
@GetMapping("/mypage/diary")
public ResponseEntity<DiaryListResponse> getMyDairyList(
@RequestHeader(USERNAME_HEADER) String username,
@RequestHeader(PASSWORD_HEADER) String password,
@RequestParam(required = false) String category
) {
DiaryListResponse diaryListResponse = diaryService.getMyDiaryList(Category.findCategory(category), username, password);
return ResponseEntity.ok().body(diaryListResponse);
}

// 일기 삭제
@DeleteMapping("/diary/{diaryId}")
@CheckUserAuth
public ResponseEntity<SuccessResponse> deleteDiary(
@PathVariable long diaryId,
@RequestHeader(USERNAME_HEADER) String username,
@RequestHeader(PASSWORD_HEADER) String password
) {
diaryService.deleteDiary(diaryId, username, password);
return ResponseEntity.ok(SuccessResponse.of(SUCCESS_DELETE_DIARY));
}

// 일기 수정
@PatchMapping("/diary/{diaryId}")
@CheckUserAuth
public ResponseEntity<SuccessResponse> updateDiary(
@PathVariable long diaryId,
@RequestHeader(USERNAME_HEADER) String username,
@RequestHeader(PASSWORD_HEADER) String password,
@RequestBody DiaryUpdateRequest diaryUpdateRequest
) {
diaryService.updateDiary(diaryId, diaryUpdateRequest.content(), username, password);
return ResponseEntity.ok(SuccessResponse.of(SUCCESS_UPDATE_DIARY));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import jakarta.validation.constraints.Size;

public record DiaryCreateRequest(

@Size(min = 1, max = 10, message = "제목은 10자 이하여야 합니다.")
String title,

@Size(max = 30, message = "글자수는 30자 이하여야 합니다.")
String content
@Size(min = 1, max = 30, message = "본문은 30자 이하여야 합니다.")
String content,

String category
) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package org.sopt.seminar2.diary.api.interceptor;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import lombok.RequiredArgsConstructor;

import org.sopt.seminar2.diary.api.annotation.CheckUserAuth;
import org.sopt.seminar2.diary.common.exception.DiaryException;
import org.sopt.seminar2.diary.common.exception.UserException;
import org.sopt.seminar2.diary.domain.Diary;
import org.sopt.seminar2.diary.domain.User;
import org.sopt.seminar2.diary.domain.repository.DiaryRepository;
import org.sopt.seminar2.diary.domain.repository.UserRepository;


import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.HandlerMapping;

import java.util.Map;

import static org.sopt.seminar2.diary.common.code.FailureCode.*;


@Component
@RequiredArgsConstructor
public class CheckUserAuthInterceptor implements HandlerInterceptor {

private final String USERNAME_HEADER = "username";
private final String PASSWORD_HEADER = "password";

private final DiaryRepository diaryRepository;
private final UserRepository userRepository;

@Override
@Transactional
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {

// Handler가 메소드인 경우에만 진행
if (handler instanceof HandlerMethod) {
HandlerMethod handlerMethod = (HandlerMethod) handler;

// 핸들러 메서드에 @CheckUserAuth 어노테이션이 있는지 확인
if (handlerMethod.getMethod().isAnnotationPresent(CheckUserAuth.class)) {
String username = request.getHeader(USERNAME_HEADER);
String password = request.getHeader(PASSWORD_HEADER);

Map<String, String> pathVariables = (Map<String, String>) request
.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);

Long diaryId = Long.valueOf(pathVariables.get("diaryId"));

User loginUser = getLoginUser(username);
Diary diary = getDiary(diaryId);

boolean isOwner = loginUser.equals(diary.getUser());

if (!isOwner) {
throw new UserException(NO_PERMISSON_FOR_DAIRY);
}
}
}
return true;
}

private User getLoginUser(String username) {
return userRepository.findByUsername(username)
.orElseThrow(() -> new UserException(NOT_EXISTS_USER));
}

private Diary getDiary(long diaryId) {
return diaryRepository.findById(diaryId)
.orElseThrow(() -> new DiaryException(NOT_EXISTS_DIARY_WITH_ID));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package org.sopt.seminar2.diary.common;

import lombok.extern.slf4j.Slf4j;

import org.sopt.seminar2.diary.common.code.FailureCode;
import org.sopt.seminar2.diary.common.dto.ErrorResponse;
import org.sopt.seminar2.diary.common.exception.ApiException;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;

@Slf4j
@RestControllerAdvice
public class GlobalExceptionHandler {

@ExceptionHandler(ApiException.class)
public ResponseEntity<ErrorResponse> handleDiaryException(ApiException e) {
log.error(e.getMessage());

FailureCode failureCode = e.getFailureCode();
return ResponseEntity.status(failureCode.getHttpStatus())
.body(ErrorResponse.of(
failureCode.getHttpStatus().value(),
failureCode.getMessage()
));
}

@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
log.error("[MethodArgumentNotValidException] 발생 : {}", e.getMessage());

FailureCode failureCode = FailureCode.INVALID_VALUE;
return ResponseEntity.status(failureCode.getHttpStatus())
.body(ErrorResponse.of(
failureCode.getHttpStatus().value(),
failureCode.getMessage(),
e.getBindingResult()
));
}

@ExceptionHandler(MissingServletRequestParameterException.class)
public ResponseEntity<ErrorResponse> handleValidationFailure(MissingServletRequestParameterException e) {
log.error("[MissingParameterException] 발생 : {}", e.getMessage());

FailureCode failureCode = FailureCode.MISSING_PARAMETER;
return ResponseEntity.status(failureCode.getHttpStatus())
.body(ErrorResponse.of(
failureCode.getHttpStatus().value(),
failureCode.getMessage()
));
}
}
33 changes: 33 additions & 0 deletions src/main/java/org/sopt/seminar2/diary/common/code/FailureCode.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.sopt.seminar2.diary.common.code;

import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;

@RequiredArgsConstructor
public enum FailureCode {

INVALID_VALUE(HttpStatus.BAD_REQUEST, "잘못된 값입니다."),
MISSING_PARAMETER(HttpStatus.BAD_REQUEST, "필수 파라미터가 없습니다."),
NOT_EXISTS_CATEGORY(HttpStatus.BAD_REQUEST, "잘못된 카테고리 값입니다."),

// User
NOT_EXISTS_USER(HttpStatus.NOT_FOUND, "해당 이름을 가진 유저가 존재하지 않습니다."),
NOT_MATCH_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
NO_PERMISSON_FOR_DAIRY(HttpStatus.FORBIDDEN, "해당 일기에 대한 권한이 없습니다."),

// Diary
NOT_EXISTS_DIARY_WITH_ID(HttpStatus.NOT_FOUND, "id에 해당하는 일기가 없습니다."),
NOT_EXISTS_DIARY_WITH_ID_AND_USER(HttpStatus.NOT_FOUND, "유저와 id에 해당하는 일기가 없습니다.");


private final HttpStatus httpStatus;
private final String message;

public String getMessage() {
return message;
}

public HttpStatus getHttpStatus() {
return httpStatus;
}
}
Loading