[#26]Refactor: dto 분리 및 서비스 수정

src/main/java/bssm/db/bssmgit/domain/boj/service/BojInformationService.java

@@ -0,0 +1,25 @@
+package bssm.db.bssmgit.domain.boj.service;
+
+import bssm.db.bssmgit.domain.github.domain.repository.GitHubRepository;
+import bssm.db.bssmgit.domain.github.web.dto.response.GithubResponseDto;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+public class BojInformationService {
+
+    private final GitHubRepository gitHubRepository;
+
+    public List<GithubResponseDto> findAllUserGitDesc() {
+        return gitHubRepository.findAll().stream()
+                .filter(g -> g.getGithubId() != null)
+                .filter(g -> g.getCommits() != null)
+                .map(GithubResponseDto::new)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/bssm/db/bssmgit/domain/boj/service/BojService.java

@@ -3,9 +3,9 @@
 import bssm.db.bssmgit.domain.boj.domain.Boj;
 import bssm.db.bssmgit.domain.boj.domain.repository.BojRepository;
 import bssm.db.bssmgit.domain.user.facade.UserFacade;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojAuthenticationResultResDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojJsonResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.RandomCodeResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojAuthenticationResultResDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojJsonResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.RandomCodeResponseDto;
 import bssm.db.bssmgit.global.exception.CustomException;
 import bssm.db.bssmgit.global.util.Constants;
 import com.google.gson.Gson;

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/BojAuthenticationResultResDto.java → src/main/java/bssm/db/bssmgit/domain/boj/web/dto/response/BojAuthenticationResultResDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.boj.web.dto.response;
 
 import bssm.db.bssmgit.domain.boj.domain.Boj;
 import bssm.db.bssmgit.domain.user.domain.User;

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/BojJsonResponseDto.java → src/main/java/bssm/db/bssmgit/domain/boj/web/dto/response/BojJsonResponseDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.boj.web.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/BojResponseDto.java → src/main/java/bssm/db/bssmgit/domain/boj/web/dto/response/BojResponseDto.java

@@ -1,6 +1,7 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.boj.web.dto.response;
 
 import bssm.db.bssmgit.domain.user.domain.User;
+import bssm.db.bssmgit.domain.user.web.dto.response.UserResponseDto;
 import lombok.Data;
 
 @Data

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/RandomCodeResponseDto.java → src/main/java/bssm/db/bssmgit/domain/boj/web/dto/response/RandomCodeResponseDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.boj.web.dto.response;
 
 import lombok.Data;
 

src/main/java/bssm/db/bssmgit/domain/github/service/AuthService.java

@@ -6,9 +6,9 @@
 import bssm.db.bssmgit.domain.user.facade.UserFacade;
 import bssm.db.bssmgit.domain.user.service.UserService;
 import bssm.db.bssmgit.domain.user.web.dto.UserProfile;
-import bssm.db.bssmgit.domain.user.web.dto.request.OauthAttributes;
+import bssm.db.bssmgit.domain.github.web.dto.request.OauthAttributes;
 import bssm.db.bssmgit.domain.user.web.dto.response.CookieResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.GitLoginResponseDto;
+import bssm.db.bssmgit.domain.github.web.dto.response.GitLoginResponseDto;
 import bssm.db.bssmgit.domain.user.web.dto.response.JwtResponseDto;
 import bssm.db.bssmgit.domain.user.web.dto.response.OauthTokenResponse;
 import bssm.db.bssmgit.global.config.redis.RedisService;

src/main/java/bssm/db/bssmgit/domain/github/service/GithubService.java

@@ -2,9 +2,7 @@
 
 import bssm.db.bssmgit.domain.github.domain.GitHub;
 import bssm.db.bssmgit.domain.github.domain.repository.GitHubRepository;
-import bssm.db.bssmgit.domain.user.domain.User;
-import bssm.db.bssmgit.domain.user.repository.UserRepository;
-import bssm.db.bssmgit.domain.user.util.GithubUtil;
+import bssm.db.bssmgit.domain.github.util.GithubUtil;
 import bssm.db.bssmgit.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/bssm/db/bssmgit/domain/user/util/GithubUtil.java → src/main/java/bssm/db/bssmgit/domain/github/util/GithubUtil.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.util;
+package bssm.db.bssmgit.domain.github.util;
 
 import bssm.db.bssmgit.global.util.Constants;
 

src/main/java/bssm/db/bssmgit/domain/user/web/dto/request/OauthAttributes.java → src/main/java/bssm/db/bssmgit/domain/github/web/dto/request/OauthAttributes.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.request;
+package bssm.db.bssmgit.domain.github.web.dto.request;
 
 import bssm.db.bssmgit.domain.user.web.dto.UserProfile;
 

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/GitIdResponseDto.java → src/main/java/bssm/db/bssmgit/domain/github/web/dto/response/GitIdResponseDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.github.web.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/GitLoginResponseDto.java → src/main/java/bssm/db/bssmgit/domain/github/web/dto/response/GitLoginResponseDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.github.web.dto.response;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/bssm/db/bssmgit/domain/user/web/dto/response/GithubOauthResultResDto.java → src/main/java/bssm/db/bssmgit/domain/github/web/dto/response/GithubOauthResultResDto.java

@@ -1,4 +1,4 @@
-package bssm.db.bssmgit.domain.user.web.dto.response;
+package bssm.db.bssmgit.domain.github.web.dto.response;
 
 import bssm.db.bssmgit.domain.user.domain.User;
 import lombok.Getter;

src/main/java/bssm/db/bssmgit/domain/github/web/dto/response/GithubResponseDto.java

@@ -0,0 +1,33 @@
+package bssm.db.bssmgit.domain.github.web.dto.response;
+
+import bssm.db.bssmgit.domain.github.domain.GitHub;
+import bssm.db.bssmgit.domain.user.domain.User;
+import bssm.db.bssmgit.domain.user.web.dto.response.UserResponseDto;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+public class GithubResponseDto {
+
+    private final int commits;
+
+    @Column
+    private final String githubId;
+
+    @Column
+    private final String githubMsg;
+
+    @Column
+    private final String githubImg;
+
+    private final UserResponseDto user;
+
+    public GithubResponseDto(GitHub gitHub, User user) {
+        this.commits = gitHub.getCommits();
+        this.githubId = gitHub.getGithubId();
+        this.githubMsg = gitHub.getGithubMsg();
+        this.githubImg = gitHub.getGithubImg();
+        this.user = new UserResponseDto(user);
+    }
+}

src/main/java/bssm/db/bssmgit/domain/user/facade/UserFacade.java

@@ -3,8 +3,8 @@
 import bssm.db.bssmgit.domain.user.domain.User;
 import bssm.db.bssmgit.domain.user.domain.type.Role;
 import bssm.db.bssmgit.domain.user.repository.UserRepository;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.GithubResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojResponseDto;
+import bssm.db.bssmgit.domain.github.web.dto.response.GithubResponseDto;
 import bssm.db.bssmgit.global.exception.CustomException;
 import bssm.db.bssmgit.global.exception.ErrorCode;
 import bssm.db.bssmgit.global.util.SecurityUtil;
@@ -110,7 +110,7 @@ public List<GithubResponseDto> findAllUserGitDesc() {
 
     public List<BojResponseDto> findAllUserBojDesc() {
         return userRepository.findBojAll().stream()
-                .filter(u -> u.getBojId() != null)
+                .filter(u -> u.getBoj.getBojId() != null)
                 .map(BojResponseDto::new)
                 .collect(Collectors.toList());
     }

src/main/java/bssm/db/bssmgit/domain/user/service/UserService.java

@@ -2,8 +2,8 @@
 
 import bssm.db.bssmgit.domain.user.domain.User;
 import bssm.db.bssmgit.domain.user.facade.UserFacade;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.GithubResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojResponseDto;
+import bssm.db.bssmgit.domain.github.web.dto.response.GithubResponseDto;
 import bssm.db.bssmgit.domain.user.web.dto.response.UserResponseDto;
 import bssm.db.bssmgit.global.annotation.ServiceWithTransactionalReadOnly;
 import bssm.db.bssmgit.global.exception.CustomException;

src/main/java/bssm/db/bssmgit/domain/user/web/api/AuthApiController.java

@@ -2,10 +2,10 @@
 
 import bssm.db.bssmgit.domain.github.service.AuthService;
 import bssm.db.bssmgit.domain.boj.service.BojService;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojAuthenticationResultResDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojAuthenticationResultResDto;
 import bssm.db.bssmgit.domain.user.web.dto.response.CookieResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.GitLoginResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.RandomCodeResponseDto;
+import bssm.db.bssmgit.domain.github.web.dto.response.GitLoginResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.RandomCodeResponseDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/bssm/db/bssmgit/domain/user/web/api/UserApiController.java

@@ -2,8 +2,8 @@
 
 import bssm.db.bssmgit.domain.github.service.GithubService;
 import bssm.db.bssmgit.domain.user.service.UserService;
-import bssm.db.bssmgit.domain.user.web.dto.response.BojResponseDto;
-import bssm.db.bssmgit.domain.user.web.dto.response.GithubResponseDto;
+import bssm.db.bssmgit.domain.boj.web.dto.response.BojResponseDto;
+import bssm.db.bssmgit.domain.github.web.dto.response.GithubResponseDto;
 import bssm.db.bssmgit.domain.user.web.dto.response.UserResponseDto;
 import bssm.db.bssmgit.global.generic.Result;
 import lombok.RequiredArgsConstructor;