From 06643b1e80b82d88f7aeb475a412c67dd5a59b36 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 15:00:55 +0900
Subject: [PATCH] - api 입력시 등록자 정보가 안바뀌는 오류 수정 - 전체 검색시 페이지 벗어날 경우에만 기본 프로젝트/이슈타입 설정하도록 수정

---
 src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
index aa0e2d9..4a831e9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
@@ -10,6 +10,7 @@
 import kr.wisestone.owl.exception.OwlRuntimeException;
 import kr.wisestone.owl.repository.ApiTokenRepository;
 import kr.wisestone.owl.service.ApiTokenService;
+import kr.wisestone.owl.service.UserService;
 import kr.wisestone.owl.util.ConvertUtil;
 import kr.wisestone.owl.util.DateUtil;
 import kr.wisestone.owl.util.WebAppUtil;
@@ -37,7 +38,6 @@
 
     @Autowired
     private ApiTokenRepository apiTokenRepository;
-
 
     @Autowired
     protected WebAppUtil webAppUtil;
@@ -124,18 +124,25 @@
     @Override
     public ApiTokenVo find() {
         User user = this.webAppUtil.getLoginUserObject();
-        List<ApiToken> apiTokens = this.apiTokenRepository.findByUserId(user.getId());
-        if (apiTokens != null && apiTokens.size() >0 ) {
-            return ConvertUtil.copyProperties(apiTokens.get(0), ApiTokenVo.class);
+        return this.find(user.getId());
+    }
+
+    private ApiTokenVo find(Long userId) {
+        if (userId != null) {
+            List<ApiToken> apiTokens = this.apiTokenRepository.findByUserId(userId);
+            if (apiTokens != null && apiTokens.size() > 0) {
+                return ConvertUtil.copyProperties(apiTokens.get(0), ApiTokenVo.class);
+            }
         }
         return null;
     }
 
-    // �넗�겙 �궗�슜�옄 �씤利�
+    // �넗�겙 �궗�슜�옄 �씤利�, �씤利앺썑 �궗�슜�옄 媛��졇�삤湲�
     @Override
     public UserVo certification(String token) {
          UserVo userVo = this.getUserVo(token);
-         if (userVo != null){
+         if (userVo != null && containsToken(userVo, token))
+         {
              return userVo;
          } else  {
              throw new OwlRuntimeException(
@@ -143,6 +150,24 @@
          }
     }
 
+    // �넗�겙�쑝濡� 李얘린
+    private ApiToken find(String token) {
+        List<ApiToken> apiTokens = this.apiTokenRepository.findByToken(token);
+        if (apiTokens != null && apiTokens.size() > 0) {
+            return apiTokens.get(0);
+        }
+        return null;
+    }
+
+    // �넗�겙 媛믪씠 db�뿉 議댁옱�븯�뒗吏� �솗�씤
+    private boolean containsToken(UserVo userVo, String token) {
+        List<ApiToken> apiTokens = this.apiTokenRepository.findByUserId(userVo.getId());
+        if (apiTokens != null && apiTokens.size() > 0) {
+            return apiTokens.get(0).getToken().equals(token);
+        }
+        return false;
+    }
+
     // �넗�겙 �궘�젣
     @Override
     public void remove(ApiTokenForm apiTokenForm) {

--
Gitblit v1.8.0