refactor : Jwt에 Name->Id로 변경 및 Archive 카테고리 버그 수정

Kusitms-28th-Meet-Up-B · Nov 18, 2023 · 65b0ec5 · 65b0ec5
1 parent 18bd059
commit 65b0ec5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/main/java/kusitms/gallae/controller/ArchiveController.java b/src/main/java/kusitms/gallae/controller/ArchiveController.java
@@ -71,7 +71,7 @@ public ResponseEntity<BaseResponse> saveArchive(
         }
         ArchivePostReq archivePostReq = new ArchivePostReq();
         archivePostReq.setTitle(archiveModel.getTitle());
-        archivePostReq.setCategory(archivePostReq.getCategory());
+        archivePostReq.setCategory(archiveModel.getCategory());
         archivePostReq.setFileUrl(fileUrl);
         archivePostReq.setFileName(fileName);
         archivePostReq.setWriter(archiveModel.getWriter());

diff --git a/src/main/java/kusitms/gallae/global/jwt/JwtProvider.java b/src/main/java/kusitms/gallae/global/jwt/JwtProvider.java
@@ -24,7 +24,7 @@ public class JwtProvider{
     private static final String AUTHORITIES_KEY = "authorities";
 
     private final String secret="wewef23fewfwfwfeefkalefalekfalekfaef2iweifejslqeqwew";
-    private final long durationSeconds= 12*60*60*60*1000;
+    private final long durationSeconds= 12*60*60*60*60*1000;
 
 
     public String createToken(String username, List<Role> roles) {

diff --git a/src/main/java/kusitms/gallae/service/admin/ManagerServiceImpl.java b/src/main/java/kusitms/gallae/service/admin/ManagerServiceImpl.java
@@ -64,7 +64,7 @@ public ProgramDetailRes getProgramDetail(Long id){
 
     @Override
     public ProgramPostReq getTempProgram(String username) {
-        User user = userRepository.findByName(username).get();
+        User user = userRepository.findById(Long.valueOf(username)).get();
         Program tempProgram = programRespository.findByUserIdAndStatus(user.getId(), Program.ProgramStatus.TEMP);
         if(tempProgram == null) {
             return new ProgramPostReq();
@@ -89,7 +89,7 @@ public ProgramPostReq getTempProgram(String username) {
     }
     @Override
     public void postProgram(ProgramPostReq programPostReq ,String username) {
-        User user = userRepository.findByName(username).get();
+        User user = userRepository.findById(Long.valueOf(username)).get();
         Program tempProgram = programRespository.findByUserIdAndStatus(user.getId(),  //나중에 유저 생기면 수정 필요
                 Program.ProgramStatus.TEMP);
 
@@ -107,7 +107,7 @@ public void postProgram(ProgramPostReq programPostReq ,String username) {
 
     @Override
     public void postTempProgram(ProgramPostReq programPostReq , String username) {
-        User user = userRepository.findByName(username).get();
+        User user = userRepository.findById(Long.valueOf(username)).get();
         Program tempProgram = programRespository.findByUserIdAndStatus(user.getId(),  //나중에 유저 생기면 수정 필요
                 Program.ProgramStatus.TEMP);
         System.out.println(tempProgram);
@@ -130,7 +130,7 @@ public void deleteTempProgram(Long programId) {
 
     @Override
     public ProgramPageMangagerRes getManagerPrograms(ProgramManagerReq programManagerReq , String username) {
-        Optional<User> user = userRepository.findByName(username);
+        Optional<User> user = userRepository.findById(Long.valueOf(username));
         programManagerReq.setUser(user.get());
         Page<Program> programs = programRepositoryCustom.getDynamicMananger(programManagerReq);
         List<Program> pageToListManagerPrograms = programs.getContent();

diff --git a/src/main/java/kusitms/gallae/service/archive/ArchiveService.java b/src/main/java/kusitms/gallae/service/archive/ArchiveService.java
@@ -52,14 +52,13 @@ public ArchivePageRes getArchivesByCategory(String category, Pageable pageable)
 
     public void postArchive(ArchivePostReq archivePostReq, String username) {
         Archive archive = new Archive();
-        User user = userRepository.findByName(username).get();
+        User user = userRepository.findById(Long.valueOf(username)).get();
         archive.setTitle(archivePostReq.getTitle());
         archive.setUser(user);
         archive.setBody(archivePostReq.getBody());
         archive.setFileName(archivePostReq.getFileName());
         archive.setWriter(archivePostReq.getWriter());
         archive.setCategory(archivePostReq.getCategory());
-        System.out.println(archivePostReq.getCategory());
         archive.setFileUrl(archivePostReq.getFileUrl());
         archive.setHashtag(archivePostReq.getHashTags());
         archiveRepository.save(archive);

diff --git a/src/main/java/kusitms/gallae/service/review/ReviewService.java b/src/main/java/kusitms/gallae/service/review/ReviewService.java
@@ -52,7 +52,7 @@ public ReviewPageRes getReviewsByCategory(String category, Pageable pageable) {
 
     public void postReivew(ReviewPostReq reviewPostReq,String username) {
         Review review = new Review();
-        User user = userRepository.findByName(username).get();
+        User user = userRepository.findById(Long.valueOf(username)).get();
         review.setTitle(reviewPostReq.getTitle());
         review.setUser(user);
         review.setBody(reviewPostReq.getBody());

diff --git a/src/main/java/kusitms/gallae/service/user/AuthenticationService.java b/src/main/java/kusitms/gallae/service/user/AuthenticationService.java
@@ -35,7 +35,7 @@ public LoginResponse login(LoginRequestDto loginRequestDto, HttpServletResponse
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         // JWT 액세스 토큰 생성
-        String accessToken = jwtProvider.createToken(user.getName(), List.of(user.getRole()));
+        String accessToken = jwtProvider.createToken(String.valueOf(user.getId()), List.of(user.getRole()));
 
         // 리프레시 토큰 생성 및 갱신
         user.renewRefreshToken();