refactor: findByVelogUUID & getDecryptedTokens 메서드 병합

Author: Jihyun3478

src/controllers/user.controller.ts

@@ -146,15 +146,9 @@ export class UserController {
       if (!found) {
         throw new TokenExpiredError();
       }
-
-      const user = await this.userService.findByVelogUUID(found.user.toString());
-      if (!user) throw new NotFoundError('유저를 찾을 수 없습니다.');
-
-      const { decryptedAccessToken, decryptedRefreshToken } = this.userService.getDecryptedTokens(  
-        user.group_id,  
-        user.access_token,  
-        user.refresh_token  
-      );
+      
+      const { user, decryptedAccessToken, decryptedRefreshToken } = 
+        await this.userService.findUserAndTokensByVelogUUID(found.user.toString());
 
       res.clearCookie('access_token', this.cookieOption());
       res.clearCookie('refresh_token', this.cookieOption());

src/services/user.service.ts

@@ -53,7 +53,7 @@ export class UserService {
   async handleUserTokensByVelogUUID(userData: UserWithTokenDto) {
     const { id, email, accessToken, refreshToken } = userData;
     try {
-      let user = await this.findByVelogUUID(id);
+      let user = await this.userRepo.findByUserVelogUUID(id);
 
       if (!user) {
         user = await this.createUser({
@@ -82,10 +82,6 @@ export class UserService {
     }
   }
 
-  async findByVelogUUID(uuid: string): Promise<User | null> {
-    return await this.userRepo.findByUserVelogUUID(uuid);
-  }
-
   async findSampleUser(): Promise<SampleUser> {
     const user = await this.userRepo.findSampleUser();
     if (!user) {
@@ -125,8 +121,19 @@ export class UserService {
     return await this.userRepo.updateTokens(userData.id, userData.accessToken, userData.refreshToken);
   }
 
-  public getDecryptedTokens(groupId: number, accessToken: string, refreshToken: string) {  
-    return this.decryptTokens(groupId, accessToken, refreshToken);  
+  async findUserAndTokensByVelogUUID(uuid: string): Promise<{ user: User; decryptedAccessToken: string; decryptedRefreshToken: string }> {
+    const user = await this.userRepo.findByUserVelogUUID(uuid);
+    if (!user) {
+      throw new NotFoundError('유저를 찾을 수 없습니다.');
+    }
+  
+    const { decryptedAccessToken, decryptedRefreshToken } = this.decryptTokens(
+      user.group_id,
+      user.access_token,
+      user.refresh_token,
+    );
+  
+    return { user, decryptedAccessToken, decryptedRefreshToken };
   }
 
   async create(userId: number, ip: string, userAgent: string): Promise<string> {