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.

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

[FIX] 사건 상세 조회시 몽타주 리스트도 조회 #50

Merged
merged 2 commits into from
Dec 16, 2023
Merged

[FIX] 사건 상세 조회시 몽타주 리스트도 조회 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe53e8
fix: 확정 몽타주 없을 시에 선택된 몽타주 리스트 조회되도록 수정
xloyeon Dec 16, 2023
b0e3163
refactor: 로그인 시 회원 권한도 조회되도록 수정
xloyeon Dec 16, 2023
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: 5 additions & 1 deletion Api/src/main/java/com/catchyou/api/auth/controller/AuthResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.catchyou.api.auth.controller;

import com.catchyou.domain.user.enums.Role;
import lombok.Builder;
import lombok.Getter;

Expand All @@ -17,14 +18,17 @@ public class AuthResponse {

private Long accessTokenExpireDate;

private Role role;

public static AuthResponse of(
String accessToken, String refreshToken, Long userId, Long accessTokenExpireDate
String accessToken, String refreshToken, Long userId, Long accessTokenExpireDate, Role role
){
return AuthResponse.builder()
.accessToken(accessToken)
.refreshToken(refreshToken)
.userId(userId)
.accessTokenExpireDate(accessTokenExpireDate)
.role(role)
.build();
}
}
3 changes: 2 additions & 1 deletion Api/src/main/java/com/catchyou/api/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ private AuthResponse createAuthResponse(User user){
resolveAccessToken(user.getId(), user.getRole().getAuthority()),
resolveRefreshToken(user.getId()),
user.getId(),
jwtProvider.getAccessTokenTTlSecond()
jwtProvider.getAccessTokenTTlSecond(),
user.getRole()
);
}
}
2 changes: 1 addition & 1 deletion Api/src/main/java/com/catchyou/api/criminal/service/CriminalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public DirectorCriminalDetailResponse getDirectorCriminalDetails(Long criminalId

MyCriminalDetailsDto criminalDetailsDto = getCriminalDetailsDto(criminal);

if(criminal.getSelectStatus().equals(Status.N))
if(criminal.getSelectStatus().equals(Status.Y))
return DirectorCriminalDetailResponse.from(criminalDetailsDto, null);

//확정되지 않을 사건일 경우만 필요
Expand Down
Loading