refactor: sonarCloud를 참고한 코드 리팩토링

codecov.yml

@@ -7,3 +7,7 @@ comment:
   branches:
     - develop
     - main
+
+coverage:
+  status:
+    patch: off

src/main/java/com/gsm/blabla/admin/application/FcmService.java

@@ -27,7 +27,6 @@
 @Component
 public class FcmService {
 
-    private final String API_URL = "https://fcm.googleapis.com/v1/projects/blabla-391200/messages:send";
     private final ObjectMapper objectMapper;
 
     public Map<String, String> sendMessageTo(FcmMessageRequestDto fcmMessageRequestDto) throws IOException {
@@ -40,7 +39,7 @@ public Map<String, String> sendMessageTo(FcmMessageRequestDto fcmMessageRequestD
         OkHttpClient client = new OkHttpClient();
         RequestBody requestBody = RequestBody.create(message, MediaType.get("application/json; charset=utf-8"));
         Request request = new Request.Builder()
-            .url(API_URL)
+            .url("https://fcm.googleapis.com/v1/projects/blabla-391200/messages:send")
             .post(requestBody)
             .addHeader("Authorization", "Bearer " + getAccessToken())
             .addHeader(HttpHeaders.CONTENT_TYPE, "application/json; UTF-8")

src/main/java/com/gsm/blabla/agora/RtcTokenBuilder2.java

@@ -1,5 +1,8 @@
 package com.gsm.blabla.agora;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class RtcTokenBuilder2 {
     public enum Role {
         ROLE_PUBLISHER(1),
@@ -32,7 +35,7 @@ public String buildTokenWithUserAccount(String appId, String appCertificate, Str
         try {
             return accessToken.build();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             return "";
         }
     }
@@ -59,7 +62,7 @@ public String buildTokenWithUserAccount(String appId, String appCertificate, Str
         try {
             return accessToken.build();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             return "";
         }
     }

src/main/java/com/gsm/blabla/agora/Utils.java

@@ -12,8 +12,10 @@
 import java.util.zip.Inflater;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 
+@Slf4j
 public class Utils {
     public static final long HMAC_SHA256_LENGTH = 32;
     public static final int VERSION_LENGTH = 3;
@@ -112,7 +114,7 @@ public static byte[] decompress(byte[] data) {
                 bos.write(buf, 0, i);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } finally {
             inflater.end();
         }

src/main/java/com/gsm/blabla/auth/application/AuthService.java

@@ -63,22 +63,20 @@ public JwtDto signUp(String providerAuthorization, MemberRequestDto memberReques
                 if (googleAccountRepository.findById(googleAccountDto.getId()).isPresent()) {
                     throw new GeneralException(Code.ALREADY_REGISTERED, "이미 가입된 구글 계정입니다.");
                 }
-
                 member = memberRepository.save(memberRequestDto.toEntity(nickname, profileImage));
                 googleAccountRepository.save(GoogleAccount.builder()
                     .id(googleAccountDto.getId())
                     .member(member)
                     .build()
                 );
-
             }
+
             case "APPLE" -> {
                 AppleTokenDto appleTokenDto = appleService.getAppleToken(providerAuthorization);
                 AppleAccountDto appleAccountDto = appleService.getAppleAccount(appleTokenDto.getIdToken());
                 if (appleAccountRepository.findById(appleAccountDto.getSub()).isPresent()) {
                     throw new GeneralException(Code.ALREADY_REGISTERED, "이미 가입된 애플 계정입니다.");
                 }
-
                 member = memberRepository.save(memberRequestDto.toEntity(nickname, profileImage));
                 appleAccountRepository.save(AppleAccount.builder()
                     .id(appleAccountDto.getSub())
@@ -87,7 +85,11 @@ public JwtDto signUp(String providerAuthorization, MemberRequestDto memberReques
                     .build()
                 );
             }
-            case "TEST" -> member = memberRepository.save(memberRequestDto.toEntity(nickname, profileImage));
+
+            case "TEST" ->
+                member = memberRepository.save(memberRequestDto.toEntity(nickname, profileImage));
+
+            default -> throw new GeneralException(Code.BAD_REQUEST, "잘못된 요청입니다.");
         }
 
         return jwtService.issueJwt(member);
@@ -97,21 +99,18 @@ public JwtDto signUp(String providerAuthorization, MemberRequestDto memberReques
     public Object login(SocialLoginType socialLoginType, String providerAuthorization) {
         Optional<Member> member = Optional.empty();
 
-        switch (socialLoginType) {
-            case GOOGLE -> {
-                GoogleAccountDto googleAccountDto = googleService.getGoogleAccountInfo(providerAuthorization);
-                member = googleAccountRepository.findById(googleAccountDto.getId()).map(GoogleAccount::getMember);
-                if (member.isEmpty()) {
-                    throw new GeneralException(Code.MEMBER_NOT_FOUND, "가입되지 않은 유저입니다.");
-                }
+        if (socialLoginType == SocialLoginType.GOOGLE) {
+            GoogleAccountDto googleAccountDto = googleService.getGoogleAccountInfo(providerAuthorization);
+            member = googleAccountRepository.findById(googleAccountDto.getId()).map(GoogleAccount::getMember);
+            if (member.isEmpty()) {
+                throw new GeneralException(Code.MEMBER_NOT_FOUND, "가입되지 않은 유저입니다.");
             }
-            case APPLE -> {
-                AppleTokenDto appleTokenDto = appleService.getAppleToken(providerAuthorization);
-                AppleAccountDto appleAccountDto = appleService.getAppleAccount(appleTokenDto.getIdToken());
-                member = appleAccountRepository.findById(appleAccountDto.getSub()).map(AppleAccount::getMember);
-                if (member.isEmpty()) {
-                    throw new GeneralException(Code.MEMBER_NOT_FOUND, "가입되지 않은 유저입니다.");
-                }
+        } else if (socialLoginType == SocialLoginType.APPLE) {
+            AppleTokenDto appleTokenDto = appleService.getAppleToken(providerAuthorization);
+            AppleAccountDto appleAccountDto = appleService.getAppleAccount(appleTokenDto.getIdToken());
+            member = appleAccountRepository.findById(appleAccountDto.getSub()).map(AppleAccount::getMember);
+            if (member.isEmpty()) {
+                throw new GeneralException(Code.MEMBER_NOT_FOUND, "가입되지 않은 유저입니다.");
             }
         }
 

src/main/java/com/gsm/blabla/auth/application/GoogleService.java

@@ -23,8 +23,6 @@ public class GoogleService {
     private final GoogleAccountRepository googleAccountRepository;
 
     public GoogleAccountDto getGoogleAccountInfo(String googleAccessToken) {
-        String GOOGLE_USERINFO_REQUEST_URL="https://www.googleapis.com/oauth2/v1/userinfo";
-
         // 1. header에 Access Token을 담는다
         HttpHeaders headers = new HttpHeaders();
         headers.set("Authorization", "Bearer " + googleAccessToken);
@@ -35,7 +33,7 @@ public GoogleAccountDto getGoogleAccountInfo(String googleAccessToken) {
         ResponseEntity<GoogleAccountDto> response;
         try {
             response = restTemplate.exchange(
-                GOOGLE_USERINFO_REQUEST_URL,
+                "https://www.googleapis.com/oauth2/v1/userinfo",
                 HttpMethod.GET,
                 request,
                 GoogleAccountDto.class

src/main/java/com/gsm/blabla/content/dto/AIPracticeFeedbackResponseDto.java

@@ -1,10 +1,11 @@
 package com.gsm.blabla.content.dto;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gsm.blabla.content.domain.MemberContentDetail;
-import lombok.*;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class AIPracticeFeedbackResponseDto {
 
     private Double contextScore;

src/main/java/com/gsm/blabla/content/dto/MemberContentDetailResponseDto.java

@@ -1,6 +1,5 @@
 package com.gsm.blabla.content.dto;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gsm.blabla.content.domain.MemberContentDetail;
 import lombok.*;
 

src/main/java/com/gsm/blabla/crew/api/CrewController.java

@@ -3,7 +3,6 @@
 import com.gsm.blabla.crew.application.CrewService;
 import com.gsm.blabla.crew.dto.*;
 import com.gsm.blabla.global.response.DataResponseDto;
-import com.gsm.blabla.member.dto.MemberProfileResponseDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 

src/main/java/com/gsm/blabla/crew/application/CrewService.java

@@ -21,8 +21,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
-import com.gsm.blabla.member.domain.Member;
-import com.gsm.blabla.member.dto.MemberProfileResponseDto;
 import com.gsm.blabla.member.dto.MemberResponseDto;
 
 import lombok.RequiredArgsConstructor;
@@ -180,7 +178,7 @@ public Map<String, String> createReport(Long reportId) {
         try {
             aiCrewReportResponseDto = objectMapper.readValue(response, AiCrewReportResponseDto.class);
         } catch (JsonProcessingException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
 
         if (aiCrewReportResponseDto == null) {

src/main/java/com/gsm/blabla/crew/dao/VoiceFileRepository.java

@@ -3,7 +3,6 @@
 import com.gsm.blabla.crew.domain.VoiceFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface VoiceFileRepository extends JpaRepository<VoiceFile, Long> {

src/main/java/com/gsm/blabla/crew/domain/VoiceFile.java

@@ -7,9 +7,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-
 @Entity
 @Getter
 @Builder

src/main/java/com/gsm/blabla/jwt/TokenProvider.java

@@ -31,8 +31,8 @@
 public class TokenProvider {
     private static final String AUTHORITIES_KEY = "auth";
     private static final String BEARER_TYPE = "Bearer";
-    private static final long ACCESS_TOKEN_EXPIRE_TIME = 1000 * 60 * 30;            // 30분
-    private static final long REFRESH_TOKEN_EXPIRE_TIME = 1000 * 60 * 60 * 24 * 7;  // 7일
+    private static final long ACCESS_TOKEN_EXPIRE_TIME = 1000L * 60 * 30;            // 30분
+    private static final long REFRESH_TOKEN_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 7;  // 7일
 
     private final Key key;
 

src/main/java/com/gsm/blabla/member/application/MemberService.java

@@ -9,6 +9,7 @@
 import com.gsm.blabla.jwt.dao.JwtRepository;
 import com.gsm.blabla.member.dao.MemberRepository;
 
+import com.gsm.blabla.member.domain.SocialLoginType;
 import java.util.*;
 
 import com.gsm.blabla.member.domain.Member;
@@ -48,13 +49,10 @@ public Map<String, String> withdrawal() {
         jwtRepository.deleteByMemberId(memberId);
         memberRepository.delete(member);
 
-        switch (member.getSocialLoginType()) {
-            case GOOGLE -> {
-                googleService.unlinkGoogleAccount(memberId);
-            }
-            case APPLE -> {
-                appleService.revokeAppleAccount(memberId);
-            }
+        if (member.getSocialLoginType() == SocialLoginType.GOOGLE) {
+            googleService.unlinkGoogleAccount(memberId);
+        } else if (member.getSocialLoginType() == SocialLoginType.APPLE) {
+            appleService.revokeAppleAccount(memberId);
         }
 
         log.info("{} 님이 회원 탈퇴를 하였습니다.", member.getNickname());

src/test/java/com/gsm/blabla/content/application/ContentServiceTest.java

@@ -1,30 +1,19 @@
 package com.gsm.blabla.content.application;
 
-import com.gsm.blabla.content.dao.ContentDetailRepository;
-import com.gsm.blabla.content.dao.ContentRepository;
-import com.gsm.blabla.content.dao.MemberContentDetailRepository;
 import com.gsm.blabla.content.domain.Content;
 import com.gsm.blabla.content.domain.ContentDetail;
 import com.gsm.blabla.content.domain.MemberContentDetail;
-import com.gsm.blabla.content.dto.ContentDetailDto;
 import com.gsm.blabla.content.dto.ContentDetailResponseDto;
 import com.gsm.blabla.content.dto.ContentDetailsResponseDto;
 import com.gsm.blabla.content.dto.ContentsResponseDto;
 import com.gsm.blabla.global.IntegrationTestSupport;
 import com.gsm.blabla.global.WithCustomMockUser;
-import com.gsm.blabla.global.exception.GeneralException;
-import com.gsm.blabla.global.response.Code;
-import com.gsm.blabla.global.util.SecurityUtil;
-import com.gsm.blabla.member.dao.MemberRepository;
 import com.gsm.blabla.member.domain.Member;
-import lombok.RequiredArgsConstructor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -144,4 +133,4 @@ void getContentDetail() {
                 .containsExactly("소개 인사하기", "인턴을 통해 소개 인사를 배워봅시다.", "https://www.youtu.be/sHpGT4SQwgw", "나는 오스틴 입니다. About the Fit의 창업자 입니다.", "I'm Jules Ostin. I'm the founder of About the Fit.", 43200, 43210, 43220);
     }
 
-}
+}

src/test/java/com/gsm/blabla/content/dao/ContentRepositoryTest.java

@@ -4,7 +4,6 @@
 import com.gsm.blabla.global.RepositoryTestSupport;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 

src/test/java/com/gsm/blabla/content/dao/MemberContentDetailRepositoryTest.java

@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalTime;
@@ -87,4 +86,4 @@ void findAllByMemberId() {
                         LocalTime.of(13, 0, 10),
                         LocalTime.of(13, 0, 20), 100L);
     }
-}
+}

src/test/java/com/gsm/blabla/global/ControllerTestSupport.java

@@ -8,7 +8,6 @@
 import com.gsm.blabla.auth.api.AuthController;
 import com.gsm.blabla.auth.application.AuthService;
 import com.gsm.blabla.content.dto.ContentDetailDto;
-import com.gsm.blabla.content.dto.ContentDetailsResponseDto;
 import com.gsm.blabla.content.dto.ContentsResponseDto;
 import com.gsm.blabla.crew.api.CrewController;
 import com.gsm.blabla.crew.api.ScheduleController;
@@ -23,10 +22,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.web.servlet.MockMvc;
 
-import java.util.List;
-
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath;
-
 @WebMvcTest(
     controllers = {
         CrewController.class,

src/test/java/com/gsm/blabla/global/RepositoryTestSupport.java

@@ -15,7 +15,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,