Skip to content

[fix] dto에 학번, 학과 필드 추가 #6

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.

Sign up for GitHub

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

Open
MinJuTur wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[fix] dto에 학번, 학과 필드 추가 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/team/grade_checklist/domain/user/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest
try {
User user = authService.register(request);
String token = jwtUtil.generateToken(user.getStudentId());
return ResponseEntity.ok(AuthResponse.success(token));
return ResponseEntity.ok(AuthResponse.success(token, user.getStudentId(), user.getDepartment().toString()));
} catch (IllegalArgumentException e) {
return ResponseEntity.badRequest().body(AuthResponse.failure(e.getMessage()));
} catch (Exception e) {
Expand All @@ -50,7 +50,7 @@ public ResponseEntity<AuthResponse> login(@Valid @RequestBody LoginRequest reque

if (user != null) {
String token = jwtUtil.generateToken(user.getStudentId());
return ResponseEntity.ok(AuthResponse.success(token));
return ResponseEntity.ok(AuthResponse.success(token, user.getStudentId(), user.getDepartment().toString()));
} else {
return ResponseEntity.badRequest().body(AuthResponse.failure("학번 또는 비밀번호가 올바르지 않습니다."));
}
Expand Down Expand Up @@ -90,4 +90,4 @@ public ResponseEntity<AuthResponse> logout(@RequestHeader("Authorization") Strin
return ResponseEntity.internalServerError().body(AuthResponse.failure("로그아웃 중 오류가 발생했습니다."));
}
}
}
}
10 changes: 8 additions & 2 deletions src/main/java/com/team/grade_checklist/domain/user/dto/response/AuthResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ public class AuthResponse {
private String token;
private String message;
private boolean success;
private String studentId; // 학번
private String department; // 학과

public static AuthResponse success(String token, String studentId, String department) {
return new AuthResponse(token, "인증 성공", true, studentId, department);
}

public static AuthResponse success(String token) {
return new AuthResponse(token, "인증 성공", true);
return new AuthResponse(token, "인증 성공", true, null, null);
}

public static AuthResponse failure(String message) {
return new AuthResponse(null, message, false);
return new AuthResponse(null, message, false, null, null);
}
}