Merge pull request #190 from Kusitms-28th-MeetUp-C/feature/159-global

[refactor]:Main 코드 정렬 및 불필요 메서드 제거
Kusitms-28th-MeetUp-C · Nov 23, 2023 · 2d2fa6e · 2d2fa6e
2 parents 089664e + f5815dd
commit 2d2fa6e
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 42 deletions.
diff --git a/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/domain/ChatUser.java b/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/domain/ChatUser.java
@@ -11,7 +11,7 @@ public class ChatUser {
     private String profile;
     private UserType type;
 
-    public static ChatUser createChatUser(User user){
+    public static ChatUser createChatUser(User user) {
         return ChatUser.builder()
                 .sessionId(user.getSessionId())
                 .name(user.getName())

diff --git a/.../main/java/com/kusitms/socketservice/domain/chat/dto/response/ChatMessageResponseDto.java b/.../main/java/com/kusitms/socketservice/domain/chat/dto/response/ChatMessageResponseDto.java
@@ -1,6 +1,5 @@
 package com.kusitms.socketservice.domain.chat.dto.response;
 
-import com.kusitms.socketservice.domain.chat.domain.Chat;
 import lombok.Builder;
 import lombok.Getter;
 

diff --git a/...src/main/java/com/kusitms/socketservice/domain/chat/dto/response/ChatUserResponseDto.java b/...src/main/java/com/kusitms/socketservice/domain/chat/dto/response/ChatUserResponseDto.java
@@ -12,7 +12,7 @@ public class ChatUserResponseDto {
     private String type;
     private String profile;
 
-    public static ChatUserResponseDto of(ChatUser chatUser){
+    public static ChatUserResponseDto of(ChatUser chatUser) {
         return ChatUserResponseDto.builder()
                 .sessionId(chatUser.getSessionId())
                 .name(chatUser.getName())

diff --git a/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/service/ChatService.java b/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/service/ChatService.java
@@ -18,7 +18,10 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.kusitms.socketservice.domain.chat.domain.ChatContent.createChatContent;
@@ -56,7 +59,7 @@ public ChatListResponseDto sendUserChatListMessage(String sessionId, ChatListReq
         return ChatListResponseDto.of(userChatResponseDtoList);
     }
 
-    private List<String> getSessionIdList(String firstSessionId, String secondSessionId){
+    private List<String> getSessionIdList(String firstSessionId, String secondSessionId) {
         List<String> sessionList = new ArrayList<>();
         sessionList.add(firstSessionId);
         sessionList.add(secondSessionId);
@@ -79,7 +82,7 @@ private List<UserChatResponseDto> createUserChatResponseDto(List<Chat> chatList,
                 .collect(Collectors.toList());
     }
 
-    private List<Chat> getChatEmptyContentFilter(List<Chat> chatList){
+    private List<Chat> getChatEmptyContentFilter(List<Chat> chatList) {
         return chatList.stream()
                 .filter(chat -> (chat.getChatContentList().size() != 0))
                 .collect(Collectors.toList());

diff --git a/...ce/src/main/java/com/kusitms/socketservice/domain/search/controller/SearchController.java b/...ce/src/main/java/com/kusitms/socketservice/domain/search/controller/SearchController.java
@@ -10,9 +10,6 @@
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RequiredArgsConstructor

diff --git a/.../com/kusitms/socketservice/domain/search/dto/response/SearchResultElementResponseDto.java b/.../com/kusitms/socketservice/domain/search/dto/response/SearchResultElementResponseDto.java
@@ -15,7 +15,7 @@ public class SearchResultElementResponseDto {
     private String teamTitle;
     private String category;
 
-    public static List<SearchResultElementResponseDto> listOf(List<SearchUserTemplate> searchUserTemplateList){
+    public static List<SearchResultElementResponseDto> listOf(List<SearchUserTemplate> searchUserTemplateList) {
         return searchUserTemplateList.stream()
                 .map(searchUserTemplate ->
                         SearchResultElementResponseDto.of(
@@ -27,7 +27,7 @@ public static List<SearchResultElementResponseDto> listOf(List<SearchUserTemplat
     }
 
     public static SearchResultElementResponseDto of(Long templateId, String title,
-                                                    String teamTitle, String category){
+                                                    String teamTitle, String category) {
         return SearchResultElementResponseDto.builder()
                 .templateId(templateId)
                 .title(title)

diff --git a/...in/java/com/kusitms/socketservice/domain/search/dto/response/SearchResultResponseDto.java b/...in/java/com/kusitms/socketservice/domain/search/dto/response/SearchResultResponseDto.java
@@ -10,7 +10,7 @@
 public class SearchResultResponseDto {
     private List<SearchResultElementResponseDto> searchResult;
 
-    public static SearchResultResponseDto of(List<SearchResultElementResponseDto> searchResult){
+    public static SearchResultResponseDto of(List<SearchResultElementResponseDto> searchResult) {
         return SearchResultResponseDto.builder()
                 .searchResult(searchResult)
                 .build();

diff --git a/...rc/main/java/com/kusitms/socketservice/domain/search/repository/SearchRepositoryImpl.java b/...rc/main/java/com/kusitms/socketservice/domain/search/repository/SearchRepositoryImpl.java
@@ -32,14 +32,14 @@ public List<SearchUserTemplate> findAllBySearchText(String searchText, String us
     }
 
     @Override
-    public List<SearchUserTemplate> findAllByUserId(String userId){
+    public List<SearchUserTemplate> findAllByUserId(String userId) {
         AggregateIterable<Document> result = getResultFromUserId(userId);
         List<SearchUserTemplate> searchUserTemplates = new ArrayList<>();
         result.forEach(doc -> searchUserTemplates.add(mongoConverter.read(SearchUserTemplate.class, doc)));
         return searchUserTemplates;
     }
 
-    private AggregateIterable<Document> getResultFromUserId(String userId){
+    private AggregateIterable<Document> getResultFromUserId(String userId) {
         MongoDatabase database = mongoClient.getDatabase(DATABASE_NAME);
         MongoCollection<Document> collection = database.getCollection(COLLECTION_NAME);
         return collection.aggregate(Arrays.asList(
@@ -49,7 +49,7 @@ private AggregateIterable<Document> getResultFromUserId(String userId){
                                         new Document(new Document("text",
                                                 new Document("query", userId)
                                                         .append("path", "userId"))))))
-                        .append("sort",  new Document("unused", new Document("$meta", "searchScore"))))));
+                        .append("sort", new Document("unused", new Document("$meta", "searchScore"))))));
     }
 
     private AggregateIterable<Document> getResultFromSearchText(String searchText, String userId) {
@@ -60,11 +60,11 @@ private AggregateIterable<Document> getResultFromSearchText(String searchText, S
                         .append("compound", new Document("must",
                                 Arrays.asList(
                                         new Document(new Document("text",
-                                            new Document("query", searchText)
-                                                    .append("path", new Document("wildcard", "*")))),
+                                                new Document("query", searchText)
+                                                        .append("path", new Document("wildcard", "*")))),
                                         new Document(new Document("text",
-                                            new Document("query", userId)
-                                                    .append("path", "userId"))))))
-                        .append("sort",  new Document("unused", new Document("$meta", "searchScore"))))));
+                                                new Document("query", userId)
+                                                        .append("path", "userId"))))))
+                        .append("sort", new Document("unused", new Document("$meta", "searchScore"))))));
     }
 }
diff --git a/...tService/src/main/java/com/kusitms/socketservice/domain/search/service/SearchService.java b/...tService/src/main/java/com/kusitms/socketservice/domain/search/service/SearchService.java
@@ -25,8 +25,8 @@ public SearchResultResponseDto getSearchResult(Long userId, SearchRequestDto sea
         return SearchResultResponseDto.of(searchResultElementResponseDtoList);
     }
 
-    private List<SearchUserTemplate> getSearchResult(String searchText, String userId){
-        if(!Objects.equals(searchText, EMPTY_STRING))
+    private List<SearchUserTemplate> getSearchResult(String searchText, String userId) {
+        if (!Objects.equals(searchText, EMPTY_STRING))
             return searchRepository.findAllBySearchText(searchText, userId);
         else
             return searchRepository.findAllByUserId(userId);

diff --git a/SocketService/src/main/java/com/kusitms/socketservice/global/common/JwtProvider.java b/SocketService/src/main/java/com/kusitms/socketservice/global/common/JwtProvider.java
@@ -1,17 +1,16 @@
 package com.kusitms.socketservice.global.common;
 
 import com.kusitms.socketservice.global.error.httpException.UnauthorizedException;
-import io.jsonwebtoken.*;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.JwtParser;
+import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Component;
 
 import java.security.Key;
 import java.util.Base64;
-import java.util.Collection;
-import java.util.Date;
 
 import static com.kusitms.socketservice.global.error.ErrorCode.EXPIRED_ACCESS_TOKEN;
 import static com.kusitms.socketservice.global.error.ErrorCode.INVALID_ACCESS_TOKEN_VALUE;
@@ -53,17 +52,5 @@ private Key getSigningKey() {
         String encoded = Base64.getEncoder().encodeToString(secretKey.getBytes());
         return Keys.hmacShaKeyFor(encoded.getBytes());
     }
-
-    public String generateToken(Long userId, boolean isAccessToken) {
-        final Date now = new Date();
-        final Date expiration = new Date(now.getTime() + (isAccessToken ? ACCESS_TOKEN_EXPIRE_TIME : REFRESH_TOKEN_EXPIRE_TIME));
-        return Jwts.builder()
-                .setHeaderParam(Header.TYPE, Header.JWT_TYPE)
-                .setSubject(String.valueOf(userId))
-                .setIssuedAt(now)
-                .setExpiration(expiration)
-                .signWith(getSigningKey(), SignatureAlgorithm.HS256)
-                .compact();
-    }
 }
 
diff --git a/SocketService/src/main/java/com/kusitms/socketservice/global/config/MongoDbConfig.java b/SocketService/src/main/java/com/kusitms/socketservice/global/config/MongoDbConfig.java
@@ -7,9 +7,9 @@
 import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 @RequiredArgsConstructor

diff --git a/SocketService/src/main/java/com/kusitms/socketservice/global/error/ErrorCode.java b/SocketService/src/main/java/com/kusitms/socketservice/global/error/ErrorCode.java
@@ -8,7 +8,6 @@
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum ErrorCode {
-
     /**
      * 401 Unauthorized
      */

diff --git a/...main/java/com/kusitms/socketservice/global/error/httpException/InvalidValueException.java b/...main/java/com/kusitms/socketservice/global/error/httpException/InvalidValueException.java
@@ -3,7 +3,6 @@
 import com.kusitms.socketservice.global.error.ErrorCode;
 
 public class InvalidValueException extends BusinessException {
-
     public InvalidValueException(ErrorCode errorCode) {
         super(errorCode);
     }

diff --git a/...main/java/com/kusitms/socketservice/global/error/httpException/UnauthorizedException.java b/...main/java/com/kusitms/socketservice/global/error/httpException/UnauthorizedException.java
@@ -3,7 +3,6 @@
 import com.kusitms.socketservice.global.error.ErrorCode;
 
 public class UnauthorizedException extends BusinessException {
-
     public UnauthorizedException(ErrorCode errorCode) {
         super(errorCode);
     }