Skip to content

Commit ac4b736

Browse files
authored
fix/#84 로그인 에러 수정 (#85)
1 parent dc189d3 commit ac4b736

File tree

35 files changed

+109
-57
lines changed

35 files changed

+109
-57
lines changed

soridam-api/src/main/java/sorisoop/soridam/api/review/ReviewApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ResponseEntity<ReviewListResponse> getReviews(
7171
@PathVariable String targetId,
7272
@Parameter(description = "리뷰 종류", example = "NOISE", required = true)
7373
@RequestParam UuidPrefix reviewType) {
74-
ReviewListResponse response = reviewFacade.getReviews(targetId, reviewType);
74+
ReviewListResponse response = reviewFacade.getReviews(reviewType.getPrefix() + targetId);
7575
return ResponseEntity.ok(response);
7676
}
7777
}

soridam-api/src/main/java/sorisoop/soridam/api/review/application/ReviewFacade.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import sorisoop.soridam.domain.review.domain.Review;
1717
import sorisoop.soridam.domain.user.application.UserQueryService;
1818
import sorisoop.soridam.domain.user.domain.User;
19-
import sorisoop.soridam.globalutil.uuid.UuidPrefix;
2019

2120
@Component
2221
@RequiredArgsConstructor
@@ -55,8 +54,8 @@ public void delete(String reviewId) {
5554
}
5655

5756
@Transactional(readOnly = true)
58-
public ReviewListResponse getReviews(String targetId, UuidPrefix reviewType) {
59-
List<Review> reviews = reviewQueryService.getByTargetIdAndReviewType(targetId, reviewType);
57+
public ReviewListResponse getReviews(String targetId) {
58+
List<Review> reviews = reviewQueryService.getByTargetIdAndReviewType(targetId);
6059
List<ReviewResponse> responses = reviews.stream()
6160
.map(ReviewResponse::from)
6261
.toList();

soridam-auth/src/main/java/sorisoop/soridam/auth/jwt/application/JwtService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import lombok.RequiredArgsConstructor;
77
import sorisoop.soridam.auth.jwt.response.JwtResponse;
8-
import sorisoop.soridam.domain.refresh.RefreshToken;
8+
import sorisoop.soridam.domain.refresh.domain.RefreshToken;
99
import sorisoop.soridam.domain.refresh.application.RefreshTokenService;
1010
import sorisoop.soridam.domain.user.application.UserCommandService;
1111
import sorisoop.soridam.domain.user.application.UserQueryService;
@@ -23,7 +23,7 @@ public class JwtService {
2323
public JwtResponse jwtLogin(String email, String password) {
2424
User user = userCommandService.login(email, password);
2525
JwtResponse response = getToken(user);
26-
refreshTokenService.save(user.getId(), response.refreshToken());
26+
refreshTokenService.save(user.extractUuid(), response.refreshToken());
2727
return response;
2828
}
2929

soridam-auth/src/main/java/sorisoop/soridam/auth/oauth/OidcService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import sorisoop.soridam.auth.oauth.exception.OidcExpiredException;
1414
import sorisoop.soridam.auth.oauth.exception.OidcInvalidAudienceException;
1515
import sorisoop.soridam.auth.oauth.exception.OidcInvalidIssuerException;
16-
import sorisoop.soridam.common.domain.Provider;
16+
import sorisoop.soridam.domain.common.Provider;
1717
import sorisoop.soridam.domain.user.domain.User;
1818
import sorisoop.soridam.domain.user.domain.UserRepository;
1919

soridam-auth/src/main/java/sorisoop/soridam/auth/oauth/google/GoogleOidcService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package sorisoop.soridam.auth.oauth.google;
22

3-
import static sorisoop.soridam.common.domain.Provider.GOOGLE;
3+
import static sorisoop.soridam.domain.common.Provider.GOOGLE;
44

55
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
66
import org.springframework.stereotype.Service;
77

88
import sorisoop.soridam.auth.oauth.OidcService;
9-
import sorisoop.soridam.common.domain.Provider;
9+
import sorisoop.soridam.domain.common.Provider;
1010
import sorisoop.soridam.domain.user.domain.User;
1111
import sorisoop.soridam.domain.user.domain.UserRepository;
1212

soridam-auth/src/main/java/sorisoop/soridam/auth/oauth/kakao/KakaoOidcService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package sorisoop.soridam.auth.oauth.kakao;
22

3-
import static sorisoop.soridam.common.domain.Provider.KAKAO;
3+
import static sorisoop.soridam.domain.common.Provider.KAKAO;
44

55
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
66
import org.springframework.stereotype.Service;
77

88
import sorisoop.soridam.auth.oauth.OidcService;
9-
import sorisoop.soridam.common.domain.Provider;
9+
import sorisoop.soridam.domain.common.Provider;
1010
import sorisoop.soridam.domain.user.domain.User;
1111
import sorisoop.soridam.domain.user.domain.UserRepository;
1212

soridam-common/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jar {
77
}
88

99
dependencies {
10-
implementation project(':soridam-infra')
1110
implementation project(':soridam-global-util')
1211

1312
// Querydsl 관련 의존성 (타입 안전한 쿼리 작성)

soridam-domain/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jar {
99
dependencies {
1010
implementation project(':soridam-global-util')
1111
implementation project(':soridam-common')
12-
implementation project(':soridam-infra')
1312

1413
// 지리 데이터 관리 도구
1514
implementation 'org.locationtech.jts:jts-core:1.20.0'

soridam-common/src/main/java/sorisoop/soridam/common/domain/BaseTimeEntity.java renamed to soridam-domain/src/main/java/sorisoop/soridam/domain/common/BaseTimeEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.common.domain;
1+
package sorisoop.soridam.domain.common;
22

33
import java.time.LocalDateTime;
44

soridam-common/src/main/java/sorisoop/soridam/common/domain/Provider.java renamed to soridam-domain/src/main/java/sorisoop/soridam/domain/common/Provider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.common.domain;
1+
package sorisoop.soridam.domain.common;
22

33
import java.util.Arrays;
44

soridam-common/src/main/java/sorisoop/soridam/common/domain/UuidExtractable.java renamed to soridam-domain/src/main/java/sorisoop/soridam/domain/common/UuidExtractable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.common.domain;
1+
package sorisoop.soridam.domain.common;
22

33
public interface UuidExtractable {
44
String getId();

soridam-domain/src/main/java/sorisoop/soridam/domain/noise/application/NoiseQueryService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.locationtech.jts.geom.Point;
88
import org.springframework.stereotype.Service;
9-
import org.springframework.transaction.annotation.Transactional;
109

1110
import lombok.RequiredArgsConstructor;
1211
import sorisoop.soridam.domain.noise.domain.Noise;

soridam-domain/src/main/java/sorisoop/soridam/domain/noise/domain/Noise.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import lombok.Builder;
1414
import lombok.Getter;
1515
import lombok.NoArgsConstructor;
16-
import sorisoop.soridam.common.domain.BaseTimeEntity;
17-
import sorisoop.soridam.common.domain.UuidExtractable;
16+
import sorisoop.soridam.domain.common.BaseTimeEntity;
17+
import sorisoop.soridam.domain.common.UuidExtractable;
1818
import sorisoop.soridam.domain.address.domain.Address;
1919
import sorisoop.soridam.domain.user.domain.User;
2020
import sorisoop.soridam.globalutil.uuid.PrefixedUuid;

soridam-domain/src/main/java/sorisoop/soridam/domain/refresh/application/RefreshTokenService.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.springframework.stereotype.Service;
44

55
import lombok.RequiredArgsConstructor;
6-
import sorisoop.soridam.domain.refresh.RefreshToken;
7-
import sorisoop.soridam.domain.refresh.RefreshTokenRepository;
6+
import sorisoop.soridam.domain.refresh.domain.RefreshToken;
7+
import sorisoop.soridam.domain.refresh.domain.RefreshTokenRepository;
88
import sorisoop.soridam.domain.refresh.exception.RefreshTokenNotFoundException;
99

1010
@Service
@@ -18,7 +18,6 @@ public RefreshToken getToken(String token) {
1818
}
1919

2020
public void save(String userId, String token) {
21-
refreshTokenRepository.findById(userId)
22-
.ifPresent(refreshTokenRepository::delete);
2321
refreshTokenRepository.save(RefreshToken.of(userId, token));
24-
}}
22+
}
23+
}

soridam-domain/src/main/java/sorisoop/soridam/domain/refresh/RefreshToken.java renamed to soridam-domain/src/main/java/sorisoop/soridam/domain/refresh/domain/RefreshToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.refresh;
1+
package sorisoop.soridam.domain.refresh.domain;
22

33
import org.springframework.data.annotation.Id;
44
import org.springframework.data.redis.core.RedisHash;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package sorisoop.soridam.domain.refresh.domain;
2+
3+
import java.util.Optional;
4+
5+
public interface RefreshTokenRepository {
6+
Optional<RefreshToken> findByRefreshToken(String token);
7+
8+
void save(RefreshToken refreshToken);
9+
10+
boolean existById(String userId);
11+
12+
void deleteById(String userId);
13+
}

soridam-domain/src/main/java/sorisoop/soridam/domain/review/application/ReviewQueryService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import sorisoop.soridam.domain.review.domain.Review;
99
import sorisoop.soridam.domain.review.domain.ReviewRepository;
1010
import sorisoop.soridam.domain.review.exception.ReviewNotFoundException;
11-
import sorisoop.soridam.globalutil.uuid.UuidPrefix;
1211

1312
@Service
1413
@RequiredArgsConstructor
@@ -24,7 +23,7 @@ public List<Review> getByTargetIdIn(List<String> targetIds) {
2423
return reviewRepository.findByTargetIdIn(targetIds);
2524
}
2625

27-
public List<Review> getByTargetIdAndReviewType(String targetId, UuidPrefix reviewType) {
28-
return reviewRepository.findByTargetId(reviewType.getPrefix() + targetId);
26+
public List<Review> getByTargetIdAndReviewType(String targetId) {
27+
return reviewRepository.findByTargetId(targetId);
2928
}
3029
}

soridam-domain/src/main/java/sorisoop/soridam/domain/review/domain/Review.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import lombok.Builder;
1818
import lombok.Getter;
1919
import lombok.NoArgsConstructor;
20-
import sorisoop.soridam.common.domain.BaseTimeEntity;
21-
import sorisoop.soridam.common.domain.UuidExtractable;
20+
import sorisoop.soridam.domain.common.BaseTimeEntity;
21+
import sorisoop.soridam.domain.common.UuidExtractable;
2222
import sorisoop.soridam.domain.user.domain.User;
2323
import sorisoop.soridam.globalutil.uuid.PrefixedUuid;
2424
import sorisoop.soridam.globalutil.uuid.UuidPrefix;

soridam-domain/src/main/java/sorisoop/soridam/domain/user/application/UserQueryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public List<Noise> getUserNoises(String id) {
2626
}
2727

2828
public User getById(String id) {
29-
return userRepository.findById(id)
29+
return userRepository.findById(USER.getPrefix() + id)
3030
.orElseThrow(UserNotFoundException::new);
3131
}
3232

soridam-domain/src/main/java/sorisoop/soridam/domain/user/domain/User.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import lombok.Builder;
2424
import lombok.Getter;
2525
import lombok.NoArgsConstructor;
26-
import sorisoop.soridam.common.domain.BaseTimeEntity;
27-
import sorisoop.soridam.common.domain.Provider;
28-
import sorisoop.soridam.common.domain.UuidExtractable;
26+
import sorisoop.soridam.domain.common.BaseTimeEntity;
27+
import sorisoop.soridam.domain.common.Provider;
28+
import sorisoop.soridam.domain.common.UuidExtractable;
2929
import sorisoop.soridam.domain.noise.domain.Noise;
3030
import sorisoop.soridam.domain.user.exception.InvalidPasswordException;
3131
import sorisoop.soridam.globalutil.uuid.PrefixedUuid;

soridam-domain/src/main/java/sorisoop/soridam/domain/user/domain/UserRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Optional;
44

5-
import sorisoop.soridam.common.domain.Provider;
5+
import sorisoop.soridam.domain.common.Provider;
66

77
public interface UserRepository {
88
User save(User user);

soridam-infra/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ jar {
77
}
88

99
dependencies {
10+
implementation project(':soridam-domain')
11+
1012
implementation 'org.apache.commons:commons-collections4:4.4'
1113

14+
// 지리 데이터 관리 도구
15+
implementation 'org.locationtech.jts:jts-core:1.20.0'
16+
implementation 'org.hibernate:hibernate-spatial:6.6.9.Final'
17+
1218
//swagger
1319
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
1420

soridam-infra/src/main/java/sorisoop/soridam/infra/config/data/redis/RedisConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.springframework.data.redis.serializer.StringRedisSerializer;
1515

1616
@Configuration
17-
@EnableRedisRepositories(basePackages = "sorisoop.soridam")
17+
@EnableRedisRepositories(basePackages = "sorisoop.soridam.infra.repository.redis")
1818
public class RedisConfig {
1919
@Value("${spring.data.redis.host}")
2020
String redisHost;
@@ -48,7 +48,7 @@ public RedisTemplate<String, String> redisTemplate(RedisConnectionFactory connec
4848
template.setConnectionFactory(connectionFactory);
4949
template.setKeySerializer(new StringRedisSerializer());
5050
template.setValueSerializer(new StringRedisSerializer());
51-
template.setEnableTransactionSupport(true);
51+
template.setEnableTransactionSupport(false);
5252
template.afterPropertiesSet();
5353

5454
return template;

soridam-infra/src/main/java/sorisoop/soridam/infra/config/data/replication/RoutingDataSourceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.transaction.PlatformTransactionManager;
2323

2424
@EnableJpaRepositories( // # 1
25-
basePackages = {"sorisoop.soridam"},
25+
basePackages = {"sorisoop.soridam.infra.repository.jpa"},
2626
entityManagerFactoryRef = "entityManagerFactory",
2727
transactionManagerRef = "transactionManager"
2828
)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.address.infrastructure;
1+
package sorisoop.soridam.infra.repository.impl;
22

33
import java.util.List;
44
import java.util.Optional;
@@ -8,6 +8,7 @@
88
import lombok.RequiredArgsConstructor;
99
import sorisoop.soridam.domain.address.domain.Address;
1010
import sorisoop.soridam.domain.address.domain.AddressRepository;
11+
import sorisoop.soridam.infra.repository.jpa.JpaAddressRepository;
1112

1213
@Repository
1314
@RequiredArgsConstructor
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.noise.infrastructure;
1+
package sorisoop.soridam.infra.repository.impl;
22

33
import java.util.List;
44
import java.util.Optional;
@@ -11,6 +11,8 @@
1111
import sorisoop.soridam.domain.noise.domain.NoiseLevel;
1212
import sorisoop.soridam.domain.noise.domain.NoiseRepository;
1313
import sorisoop.soridam.domain.noise.domain.Radius;
14+
import sorisoop.soridam.infra.repository.jpa.JpaNoiseRepository;
15+
import sorisoop.soridam.infra.repository.jpa.QueryNoiseRepository;
1416

1517
@Repository
1618
@RequiredArgsConstructor
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package sorisoop.soridam.domain.review.infrastructure;
2-
3-
import static sorisoop.soridam.globalutil.uuid.UuidPrefix.REVIEW;
1+
package sorisoop.soridam.infra.repository.impl;
42

53
import java.util.List;
64
import java.util.Optional;
@@ -10,6 +8,7 @@
108
import lombok.RequiredArgsConstructor;
119
import sorisoop.soridam.domain.review.domain.Review;
1210
import sorisoop.soridam.domain.review.domain.ReviewRepository;
11+
import sorisoop.soridam.infra.repository.jpa.JpaReviewRepository;
1312

1413
@Repository
1514
@RequiredArgsConstructor
@@ -42,6 +41,6 @@ public List<Review> findByTargetId(String targetId) {
4241
}
4342

4443
private String formatId(String id) {
45-
return REVIEW.getPrefix() + id;
44+
return id;
4645
}
4746
}
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package sorisoop.soridam.domain.user.infrastructure;
2-
3-
import static sorisoop.soridam.globalutil.uuid.UuidPrefix.USER;
1+
package sorisoop.soridam.infra.repository.impl;
42

53
import java.util.Optional;
64

75
import org.springframework.stereotype.Repository;
86

97
import lombok.RequiredArgsConstructor;
10-
import sorisoop.soridam.common.domain.Provider;
8+
import sorisoop.soridam.domain.common.Provider;
119
import sorisoop.soridam.domain.user.domain.User;
1210
import sorisoop.soridam.domain.user.domain.UserRepository;
11+
import sorisoop.soridam.infra.repository.jpa.JpaUserRepository;
1312

1413
@Repository
1514
@RequiredArgsConstructor
@@ -33,6 +32,6 @@ public Optional<User> findByOauthIdentityAndProvider(String oauthIdentifier, Pro
3332

3433
@Override
3534
public Optional<User> findById(String id) {
36-
return jpaUserRepository.findById(USER.getPrefix() + id);
35+
return jpaUserRepository.findById(id);
3736
}
3837
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.address.infrastructure;
1+
package sorisoop.soridam.infra.repository.jpa;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.noise.infrastructure;
1+
package sorisoop.soridam.infra.repository.jpa;
22

33
import java.util.List;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.review.infrastructure;
1+
package sorisoop.soridam.infra.repository.jpa;
22

33
import java.util.List;
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package sorisoop.soridam.domain.user.infrastructure;
1+
package sorisoop.soridam.infra.repository.jpa;
22

33
import java.util.Optional;
44

55
import org.springframework.data.jpa.repository.JpaRepository;
66

7-
import sorisoop.soridam.common.domain.Provider;
7+
import sorisoop.soridam.domain.common.Provider;
88
import sorisoop.soridam.domain.user.domain.User;
99

1010
public interface JpaUserRepository extends JpaRepository<User, String> {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sorisoop.soridam.domain.noise.infrastructure;
1+
package sorisoop.soridam.infra.repository.jpa;
22

33
import java.util.List;
44

0 commit comments

Comments
 (0)