Skip to content

Commit eee170c

Browse files
docs: 📝 auth api 문서 추가 (#62)
* feat: 몇가지 소소한 수정 * refactor: ♻️ user 디렉토리 구조 수정 (#53) * hotfix: conflict solve (#55) * refactor: ♻️ user 디렉토리 구조 수정 * hotfix: conflict solve * hotfix: 🚑 build error 해결 (#57) * refactor: ♻️ user 디렉토리 구조 수정 * hotfix: conflict solve * hotfix: 🚑 sever restart * fix: 루틴 삭제 기능 수정 * fix: 루틴 삭제 기능 수정 * docs: 📝 auth api 문서 추가 (#61) * hotfix: server restart * docs: 📝 auth api 문서 추가 --------- Co-authored-by: gzhan0226 <[email protected]>
1 parent 29e084a commit eee170c

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

src/main/java/com/goormdari/domain/routine/application/RoutineService.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.goormdari.domain.routine.application;
22

3-
import com.amazonaws.services.kms.model.AlreadyExistsException;
43
import com.amazonaws.services.kms.model.NotFoundException;
54
import com.goormdari.domain.routine.domain.Routine;
65
import com.goormdari.domain.routine.dto.request.CompleteRoutineRequest;
@@ -23,16 +22,10 @@ public class RoutineService {
2322
private final RoutineRepository routineRepository;
2423
private final UserRepository userRepository;
2524

26-
private final S3Service s3Service;
2725
@Transactional
2826
public Message completeRoutine (Long userId, CompleteRoutineRequest completeRoutineRequest, String imgURL) {
2927
User user = userRepository.findById(userId)
3028
.orElseThrow(()->new NotFoundException("User Not Found"));
31-
32-
if(routineRepository.findByRoutineIndexAndUserId(userId, completeRoutineRequest.routineIndex())!= null) {
33-
throw new IllegalStateException("Routine already completed for given index");
34-
}
35-
3629
Routine routine = Routine.builder()
3730
.user(user)
3831
.routineImg(imgURL)
@@ -54,7 +47,6 @@ public Message deleteRoutineByUserIdAndRoutineIndex (Long userId, Long routineIn
5447
.orElseThrow(()->new NotFoundException("User Not Found"));
5548
Routine routine = routineRepository.findByRoutineIndexAndUserId(userId,routineIndex);
5649
routineRepository.deleteById(routine.getId());
57-
s3Service.deleteImageOnS3(routine.getRoutineImg());
5850
user.updateCurrentStep(user.getCurrentStep()-1);
5951
return Message.builder()
6052
.message("루틴 삭제 성공")

src/main/java/com/goormdari/domain/user/presentation/AuthController.java

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
package com.goormdari.domain.user.presentation;
22

33
import com.goormdari.domain.user.dto.request.AddUserRequest;
4+
import com.goormdari.domain.user.dto.response.FindCurrentStepResponse;
45
import com.goormdari.domain.user.dto.response.JwtResponse;
56
import com.goormdari.domain.user.dto.request.LoginRequest;
67
import com.goormdari.domain.user.service.UserService;
78

9+
import com.goormdari.global.payload.ErrorResponse;
10+
import io.swagger.v3.oas.annotations.Operation;
11+
import io.swagger.v3.oas.annotations.media.Content;
12+
import io.swagger.v3.oas.annotations.media.Schema;
13+
import io.swagger.v3.oas.annotations.responses.ApiResponse;
14+
import io.swagger.v3.oas.annotations.responses.ApiResponses;
15+
import io.swagger.v3.oas.annotations.tags.Tag;
816
import jakarta.validation.Valid;
917
import lombok.RequiredArgsConstructor;
1018
import org.springframework.http.HttpStatus;
@@ -14,31 +22,30 @@
1422
import org.springframework.web.bind.annotation.RequestMapping;
1523
import org.springframework.web.bind.annotation.RestController;
1624

25+
@Tag(name = "Authorization", description = "Authorization API")
1726
@RestController
1827
@RequestMapping("/auth")
1928
@RequiredArgsConstructor
2029
public class AuthController {
2130

2231
private final UserService userService;
2332

24-
/**
25-
* 회원가입 후 JWT 토큰 발급
26-
*
27-
* @param addUserRequest 회원가입 요청 데이터
28-
* @return JWT 응답
29-
*/
33+
@Operation(summary = "회원가입 후 로그인", description = "회원가입과 로그인을 수행합니다.")
34+
@ApiResponses(value = {
35+
@ApiResponse(responseCode = "200", description = "회원가입 성공 ", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = JwtResponse.class))}),
36+
@ApiResponse(responseCode = "400", description = "회원가입 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}),
37+
})
3038
@PostMapping("/signup")
3139
public ResponseEntity<JwtResponse> registerUser(@Valid @RequestBody AddUserRequest addUserRequest) {
3240
JwtResponse jwtResponse = userService.signupAndLogin(addUserRequest);
3341
return ResponseEntity.status(HttpStatus.CREATED).body(jwtResponse);
3442
}
3543

36-
/**
37-
* 로그인 후 JWT 토큰 발급
38-
*
39-
* @param loginRequest 로그인 요청 데이터
40-
* @return JWT 응답
41-
*/
44+
@Operation(summary = "로그인", description = "로그인을 수행합니다.")
45+
@ApiResponses(value = {
46+
@ApiResponse(responseCode = "200", description = "로그인 성공 ", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = JwtResponse.class))}),
47+
@ApiResponse(responseCode = "400", description = "로그인 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}),
48+
})
4249
@PostMapping("/login")
4350
public ResponseEntity<JwtResponse> authenticateUser(@Valid @RequestBody LoginRequest loginRequest) {
4451
JwtResponse jwtResponse = userService.loginAndGetToken(loginRequest);

0 commit comments

Comments
 (0)