[MERGE] develop을 main에 반영

src/main/java/io/oeid/mogakgo/domain/cert/application/CertService.java

@@ -11,14 +11,17 @@
 import io.oeid.mogakgo.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class CertService {
 
     private final UserGeoService userGeoService;
     private final UserCommonService userCommonService;
 
+    @Transactional
     public Long certificate(Long tokenUserId, Long userId, int areaCode) {
         User tokenUser = validateToken(tokenUserId);
         validateCertificator(tokenUser, userId);

src/main/java/io/oeid/mogakgo/domain/geo/application/GeoService.java

@@ -5,15 +5,17 @@
 import io.oeid.mogakgo.core.properties.KakaoProperties;
 import io.oeid.mogakgo.domain.geo.domain.enums.Region;
 import io.oeid.mogakgo.domain.geo.exception.GeoException;
-import io.oeid.mogakgo.domain.geo.feign.KakaoFeignClient;
-import io.oeid.mogakgo.domain.geo.feign.dto.AddressDocument;
-import io.oeid.mogakgo.domain.geo.feign.dto.AddressInfoDto;
+import io.oeid.mogakgo.domain.geo.application.feign.KakaoFeignClient;
+import io.oeid.mogakgo.domain.geo.application.feign.dto.AddressDocument;
+import io.oeid.mogakgo.domain.geo.application.feign.dto.AddressInfoDto;
 import io.oeid.mogakgo.domain.user.application.UserCommonService;
 import io.oeid.mogakgo.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class GeoService {
 
@@ -39,6 +41,14 @@ public AddressDocument getAddressInfoAboutAreaCode(Double x, Double y) {
         return response.getDocuments()[0];
     }
 
+    private String generateKey(KakaoProperties kakaoProperties) {
+        return kakaoProperties.getPrefix() + SEPERATOR + kakaoProperties.getRestApiKey();
+    }
+
+    private int extractAreaCode(AddressDocument document) {
+        return Integer.parseInt(document.getCode().substring(0, 5));
+    }
+
     private int validateCoordinatesCoverage(Double x, Double y) {
         int areaCode = getAreaCodeAboutCoordinates(x, y);
         validateCodeCoverage(areaCode);
@@ -51,14 +61,6 @@ private void validateCodeCoverage(int areaCode) {
         }
     }
 
-    private String generateKey(KakaoProperties kakaoProperties) {
-        return kakaoProperties.getPrefix() + SEPERATOR + kakaoProperties.getRestApiKey();
-    }
-
-    private int extractAreaCode(AddressDocument document) {
-        return Integer.parseInt(document.getCode().substring(0, 5));
-    }
-
     private User validateToken(Long userId) {
         return userCommonService.getUserById(userId);
     }

src/main/java/io/oeid/mogakgo/domain/geo/feign/KakaoFeignClient.java → src/main/java/io/oeid/mogakgo/domain/geo/application/feign/KakaoFeignClient.java

@@ -1,6 +1,6 @@
-package io.oeid.mogakgo.domain.geo.feign;
+package io.oeid.mogakgo.domain.geo.application.feign;
 
-import io.oeid.mogakgo.domain.geo.feign.dto.AddressInfoDto;
+import io.oeid.mogakgo.domain.geo.application.feign.dto.AddressInfoDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

src/main/java/io/oeid/mogakgo/domain/geo/feign/dto/AddressDocument.java → src/main/java/io/oeid/mogakgo/domain/geo/application/feign/dto/AddressDocument.java

@@ -1,4 +1,4 @@
-package io.oeid.mogakgo.domain.geo.feign.dto;
+package io.oeid.mogakgo.domain.geo.application.feign.dto;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;

src/main/java/io/oeid/mogakgo/domain/geo/feign/dto/AddressInfoDto.java → src/main/java/io/oeid/mogakgo/domain/geo/application/feign/dto/AddressInfoDto.java

@@ -1,4 +1,4 @@
-package io.oeid.mogakgo.domain.geo.feign.dto;
+package io.oeid.mogakgo.domain.geo.application.feign.dto;
 
 import lombok.Getter;
 

src/main/java/io/oeid/mogakgo/domain/profile/application/ProfileCardService.java

@@ -41,6 +41,7 @@ public CursorPaginationResult<UserPublicApiResponse> getRandomOrderedProfileCard
         return profiles;
     }
 
+    @Transactional
     public void increaseTotalLikeAmount(Long userId) {
         var profileCard = getProfileCard(userId);
         profileCard.addLike();

src/main/java/io/oeid/mogakgo/domain/profile/infrastructure/ProfileCardRepositoryCustomImpl.java

@@ -32,7 +32,8 @@ public CursorPaginationResult<UserPublicApiResponse> findByConditionWithPaginati
             .where(
                 cursorIdCondition(pageable.getCursorId()),
                 userIdEq(userId),
-                regionEq(region)
+                regionEq(region),
+                deletedProfileCardEq()
             )
             .limit(pageable.getPageSize() + 1)
             .fetch();
@@ -70,4 +71,8 @@ private BooleanExpression userIdEq(Long userId) {
     private BooleanExpression cursorIdCondition(Long cursorId) {
         return cursorId != null ? profileCard.id.gt(cursorId) : null;
     }
+
+    private BooleanExpression deletedProfileCardEq() {
+        return profileCard.user.deletedAt.isNull();
+    }
 }

src/main/java/io/oeid/mogakgo/exception/code/ErrorCode401.java

@@ -7,6 +7,7 @@
 public enum ErrorCode401 implements ErrorCode{
 
     AUTH_MISSING_CREDENTIALS("E010201", "사용자의 인증 정보를 찾을 수 없습니다."),
+    USER_ACCOUNT_DISABLED("E020201", "탈퇴한 사용자입니다."),
     AUTH_TOKEN_EXPIRED("E010202", "토큰이 만료되었습니다."),
     ;