[FEAT] 포인트 사용 [유저 데이트 코스 열람] API - #65 #70

rlarlgnszx · 2024-07-11T17:05:08Z

🔥Pull requests

⛳️ 작업한 브랜치

feature/[FEAT] 포인트 사용 [유저 데이트 코스 열람] API #65

👷 작업한 내용

포인트 사용 [유저 데이트 코스 열람] API - [FEAT] 포인트 사용 [유저 데이트 코스 열람] API #65
RedisStream Config 구현

DATEROAD-SERVER/dateroad-api/src/main/java/org/dateroad/config/RedisStreamConfig.java

Lines 29 to 125 in e3e7691

    
           @Configuration 
        
           @RequiredArgsConstructor 
        
           public class RedisStreamConfig { 
        
               private final pointEventListener pointEventListener; 
        
               private final FreeEventListener freeEventListener; 
        
               @Value("${spring.data.redis.host}") 
        
               private String host; 
        
               @Value("${spring.data.redis.port}") 
        
               private int port; 
        
               @Bean 
        
               public RedisTemplate<String, Object> redisTemplate() { 
        
                   RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>(); 
        
                   redisTemplate.setConnectionFactory(redisConnectionFactory()); 
        
                   redisTemplate.setKeySerializer(new StringRedisSerializer()); 
        
                   redisTemplate.setValueSerializer(new StringRedisSerializer()); 
        
                   return redisTemplate; 
        
               } 
        
               @Bean 
        
               public RedisConnectionFactory redisConnectionFactory() { 
        
                   return new LettuceConnectionFactory(host, port); 
        
               } 
        
               public void createStreamConsumerGroup(final String streamKey, final String consumerGroupName) { 
        
                   // Stream이 존재 하지 않으면, MKSTREAM 옵션을 통해 만들고, ConsumerGroup또한 생성한다 
        
                   System.out.println(streamKey + consumerGroupName); 
        
                   // Stream이 존재하지 않으면, MKSTREAM 옵션을 통해 스트림과 소비자 그룹을 생성 
        
                   if (Boolean.FALSE.equals(redisTemplate().hasKey(streamKey))) { 
        
                       RedisAsyncCommands<String, String> commands = (RedisAsyncCommands<String, String>) Objects.requireNonNull( 
        
                                       redisTemplate() 
        
                                               .getConnectionFactory()) 
        
                               .getConnection() 
        
                               .getNativeConnection(); 
        
                       CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8) 
        
                               .add(CommandKeyword.CREATE) 
        
                               .add(streamKey) 
        
                               .add(consumerGroupName) 
        
                               .add("0") 
        
                               .add("MKSTREAM"); 
        
                       // MKSTREAM 옵션을 사용하여 스트림과 그룹을 생성 
        
                       commands.dispatch(CommandType.XGROUP, new StatusOutput<>(StringCodec.UTF8), args).toCompletableFuture() 
        
                               .join(); 
        
                   } 
        
                   // Stream 존재 시, ConsumerGroup 존재 여부 확인 후 ConsumerGroup을 생성 
        
                   else { 
        
                       if (!isStreamConsumerGroupExist(streamKey, consumerGroupName)) { 
        
                           redisTemplate().opsForStream().createGroup(streamKey, ReadOffset.from("0"), consumerGroupName); 
        
                       } 
        
                   } 
        
               } 
        
               // ConsumerGroup 존재 여부 확인 
        
               public boolean isStreamConsumerGroupExist(final String streamKey, final String consumerGroupName) { 
        
                   Iterator<StreamInfo.XInfoGroup> iterator = redisTemplate() 
        
                           .opsForStream().groups(streamKey).stream().iterator(); 
        
                   while (iterator.hasNext()) { 
        
                       StreamInfo.XInfoGroup xInfoGroup = iterator.next(); 
        
                       if (xInfoGroup.groupName().equals(consumerGroupName)) { 
        
                           return true; 
        
                       } 
        
                   } 
        
                   return false; 
        
               } 
        
               @Bean 
        
               public Subscription PointSubscription() { 
        
                   createStreamConsumerGroup("coursePoint", "courseGroup"); 
        
                   StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> containerOptions = StreamMessageListenerContainer.StreamMessageListenerContainerOptions 
        
                           .builder().pollTimeout(Duration.ofMillis(100)).build(); 
        
                   StreamMessageListenerContainer<String, MapRecord<String, String, String>> container = StreamMessageListenerContainer.create( 
        
                           redisConnectionFactory(), 
        
                           containerOptions); 
        
                   Subscription subscription = container.receiveAutoAck(Consumer.from("courseGroup", "instance-1"), 
        
                           StreamOffset.create("coursePoint", ReadOffset.lastConsumed()), pointEventListener); 
        
                   container.start(); 
        
                   return subscription; 
        
               } 
        
               @Bean 
        
               public Subscription FreeSubscription() { 
        
                   createStreamConsumerGroup("courseFree", "courseGroup"); 
        
                   StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> containerOptions = StreamMessageListenerContainer.StreamMessageListenerContainerOptions 
        
                           .builder().pollTimeout(Duration.ofMillis(100)).build(); 
        
                   StreamMessageListenerContainer<String, MapRecord<String, String, String>> container = StreamMessageListenerContainer.create( 
        
                           redisConnectionFactory(), 
        
                           containerOptions); 
        
                   Subscription subscription = container.receiveAutoAck(Consumer.from("courseGroup", "instance-2"), 
        
                           StreamOffset.create("courseFree", ReadOffset.lastConsumed()), freeEventListener); 
        
                   container.start(); 
        
                   return subscription; 
        
               } 
        
           }

User 검증후 Point 사용 및 Free 검증

DATEROAD-SERVER/dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

Lines 123 to 141 in e3e7691

    
           private CoursePaymentType validateUserFreeOrPoint(final User user, final int requiredPoints) { 
        
               if (user.getFree() > 0) { 
        
                   return CoursePaymentType.FREE; // User가 free를 갖고 있으면 true를 반환 
        
               } else if (user.getTotalPoint() < requiredPoints) { 
        
                   throw new DateRoadException(FailureCode.INSUFFICIENT_USER_POINTS); 
        
               } 
        
               return CoursePaymentType.POINT; 
        
           } 
        
           public void processCoursePayment(final CoursePaymentType coursePaymentType, User user, final Point point, 
        
                                            final PointUseReq pointUseReq) { 
        
               switch (coursePaymentType) { 
        
                   case FREE -> { 
        
                       asyncService.publishEventUserFree(user); 
        
                   } 
        
                   case POINT -> { 
        
                       pointRepository.save(point); 
        
                       asyncService.publishEvenUserPoint(user, pointUseReq); 
        
                   }

Point 사용시 PointEventListner로 User의 point를 변경하는 이벤트 발송
Free 사용시 FreeEventListner로 User의 Free를 변경하는 이벤트 발송

DATEROAD-SERVER/dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

Lines 135 to 140 in e3e7691

    
           case FREE -> { 
        
               asyncService.publishEventUserFree(user); 
        
           } 
        
           case POINT -> { 
        
               pointRepository.save(point); 
        
               asyncService.publishEvenUserPoint(user, pointUseReq);

🚨 참고 사항

아마 레디스 서버에 아직 없어서 빌드 에러날거에용
얼른 설치하겠습니다

📟 관련 이슈

Resolved: [FEAT] 포인트 사용 [유저 데이트 코스 열람] API #65

gardening-y

진짜 기훈 멋지다.. 저좀 알려주세요 선생님!! 기훈 최고..🙌

gardening-y · 2024-07-11T19:32:20Z

dateroad-api/src/main/java/org/dateroad/point/event/pointEventListener.java

+        User user = userRepository.findById(userId).orElseThrow(
+                () -> new DateRoadException(FailureCode.USER_NOT_FOUND)
+        );


메서드 빼서 관리하면 좋을 것 같아요!

저도 빠질거같아요 당신한테

gardening-y · 2024-07-11T19:38:30Z

dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

+    @Transactional
+    public void openCourse(final Long userId, final Long courseId, final PointUseReq pointUseReq) {
+        User user = userRepository.findById(userId).orElseThrow(
+                () -> new DateRoadException(FailureCode.USER_NOT_FOUND)


EntityNotFoundException으로 예외처리하면 좋을 것 같아요.

저도 특별함 처리 해주세요

gardening-y · 2024-07-11T19:38:50Z

dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

+    public void openCourse(final Long userId, final Long courseId, final PointUseReq pointUseReq) {
+        User user = userRepository.findById(userId).orElseThrow(
+                () -> new DateRoadException(FailureCode.USER_NOT_FOUND)
+        );
+        Course course = courseRepository.findById(courseId).orElseThrow(
+                () -> new DateRoadException(FailureCode.COURSE_NOT_FOUND)
+        );


자주 쓰이는 로직들은 메서드로 분리해서 관리해도 좋을 것 같습니다!

넵 알겠습니다!

gardening-y · 2024-07-11T19:41:49Z

dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

+        return CoursePaymentType.POINT;
+    }
+
+    public void processCoursePayment(final CoursePaymentType coursePaymentType, User user, final Point point,


통일하려면 final 선언해주면 좋을 것 같아요!

감사합니다!

gardening-y · 2024-07-11T19:42:32Z

dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

+        switch (coursePaymentType) {
+            case FREE -> {
+                asyncService.publishEventUserFree(user);
+            }
+            case POINT -> {
+                pointRepository.save(point);
+                asyncService.publishEvenUserPoint(user, pointUseReq);
+            }


성능측면으로 비교군이 적을 경우 switch보다 if가 낫다고 합니다!ㅎㅎ

https://thinkpro.tistory.com/132

엇 예전에는 if-else 가 성능적으로 좋았지만 현재는 그렇게 차이가 나지 않고 switch를 쓰는게 더 효과적이라고 합니다!
저도 보고 찾아보다가 알게되어서 공유합니다!!
https://backendcode.tistory.com/212

gardening-y · 2024-07-11T19:43:06Z

dateroad-api/src/main/java/org/dateroad/point/event/FreeEventListener.java

+        User user = userRepository.findById(userId).orElseThrow(
+                () -> new DateRoadException(FailureCode.USER_NOT_FOUND)
+        );


예외처리 클래스 변경이랑 메서드 분리하면 좋을 것 같아요!

알겠씁니다!

gardening-y · 2024-07-11T19:44:42Z

dateroad-api/src/main/java/org/dateroad/course/api/CourseController.java

+            @PathVariable final Long courseId,
+            @RequestBody final PointUseReq pointUseReq
+    ) {
+        courseService.openCourse(userId,courseId,pointUseReq);


띄어쓰기요..

# Conflicts: # dateroad-api/src/main/java/org/dateroad/course/api/CourseController.java # dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

rlarlgnszx added 8 commits July 12, 2024 01:45

[chore] Redis 의존성 추가 - #65

c820238

[feat] RedisStream Config 구현 - #65

6dac86c

[feat] Point 사용 및 검증 로직 구현 - #65

24b575f

[del] dateAccess id 필드 NotNull 제거 - #65

0415ab4

[feat] Point, Free에 대한 EventListener 구현 - #65

9c1ada0

[feat] 에러 처리 메세지 구현 - #65

3e7ce1f

[chore] 띄어쓰기 제거 - #65

5c82f2a

[feat] User free, totalPoint 에 Setter 추가 - #65

e3e7691

rlarlgnszx added the feat label Jul 11, 2024

rlarlgnszx requested review from sjk4618 and gardening-y July 11, 2024 17:05

rlarlgnszx self-assigned this Jul 11, 2024

gardening-y added the 기훈 label Jul 11, 2024

gardening-y approved these changes Jul 11, 2024

View reviewed changes

rlarlgnszx and others added 3 commits July 12, 2024 05:14

[refactor] 메소드 분리 - #65

36c23ba

Merge branch 'develop' into feature#65

cb37a4b

[fix] Conflict 해결 - #65

aec51a7

# Conflicts: # dateroad-api/src/main/java/org/dateroad/course/api/CourseController.java # dateroad-api/src/main/java/org/dateroad/course/service/CourseService.java

rlarlgnszx merged commit d7c8410 into develop Jul 11, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEAT] 포인트 사용 [유저 데이트 코스 열람] API - #65 #70

[FEAT] 포인트 사용 [유저 데이트 코스 열람] API - #65 #70

rlarlgnszx commented Jul 11, 2024

gardening-y left a comment •

edited

Loading

gardening-y Jul 11, 2024

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024 •

edited

Loading

rlarlgnszx Jul 11, 2024

gardening-y Jul 11, 2024

	@Configuration
	@RequiredArgsConstructor
	public class RedisStreamConfig {
	private final pointEventListener pointEventListener;
	private final FreeEventListener freeEventListener;
	@Value("${spring.data.redis.host}")
	private String host;
	@Value("${spring.data.redis.port}")
	private int port;

	@Bean
	public RedisTemplate<String, Object> redisTemplate() {
	RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
	redisTemplate.setConnectionFactory(redisConnectionFactory());
	redisTemplate.setKeySerializer(new StringRedisSerializer());
	redisTemplate.setValueSerializer(new StringRedisSerializer());
	return redisTemplate;
	}

	@Bean
	public RedisConnectionFactory redisConnectionFactory() {
	return new LettuceConnectionFactory(host, port);
	}

	public void createStreamConsumerGroup(final String streamKey, final String consumerGroupName) {
	// Stream이 존재 하지 않으면, MKSTREAM 옵션을 통해 만들고, ConsumerGroup또한 생성한다
	System.out.println(streamKey + consumerGroupName);
	// Stream이 존재하지 않으면, MKSTREAM 옵션을 통해 스트림과 소비자 그룹을 생성
	if (Boolean.FALSE.equals(redisTemplate().hasKey(streamKey))) {
	RedisAsyncCommands<String, String> commands = (RedisAsyncCommands<String, String>) Objects.requireNonNull(
	redisTemplate()
	.getConnectionFactory())
	.getConnection()
	.getNativeConnection();

	CommandArgs<String, String> args = new CommandArgs<>(StringCodec.UTF8)
	.add(CommandKeyword.CREATE)
	.add(streamKey)
	.add(consumerGroupName)
	.add("0")
	.add("MKSTREAM");
	// MKSTREAM 옵션을 사용하여 스트림과 그룹을 생성
	commands.dispatch(CommandType.XGROUP, new StatusOutput<>(StringCodec.UTF8), args).toCompletableFuture()
	.join();
	}
	// Stream 존재 시, ConsumerGroup 존재 여부 확인 후 ConsumerGroup을 생성
	else {
	if (!isStreamConsumerGroupExist(streamKey, consumerGroupName)) {
	redisTemplate().opsForStream().createGroup(streamKey, ReadOffset.from("0"), consumerGroupName);
	}
	}
	}

	// ConsumerGroup 존재 여부 확인
	public boolean isStreamConsumerGroupExist(final String streamKey, final String consumerGroupName) {
	Iterator<StreamInfo.XInfoGroup> iterator = redisTemplate()
	.opsForStream().groups(streamKey).stream().iterator();

	while (iterator.hasNext()) {
	StreamInfo.XInfoGroup xInfoGroup = iterator.next();
	if (xInfoGroup.groupName().equals(consumerGroupName)) {
	return true;
	}
	}
	return false;
	}

	@Bean
	public Subscription PointSubscription() {
	createStreamConsumerGroup("coursePoint", "courseGroup");
	StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> containerOptions = StreamMessageListenerContainer.StreamMessageListenerContainerOptions
	.builder().pollTimeout(Duration.ofMillis(100)).build();

	StreamMessageListenerContainer<String, MapRecord<String, String, String>> container = StreamMessageListenerContainer.create(
	redisConnectionFactory(),
	containerOptions);

	Subscription subscription = container.receiveAutoAck(Consumer.from("courseGroup", "instance-1"),
	StreamOffset.create("coursePoint", ReadOffset.lastConsumed()), pointEventListener);
	container.start();
	return subscription;
	}

	@Bean
	public Subscription FreeSubscription() {
	createStreamConsumerGroup("courseFree", "courseGroup");
	StreamMessageListenerContainer.StreamMessageListenerContainerOptions<String, MapRecord<String, String, String>> containerOptions = StreamMessageListenerContainer.StreamMessageListenerContainerOptions
	.builder().pollTimeout(Duration.ofMillis(100)).build();
	StreamMessageListenerContainer<String, MapRecord<String, String, String>> container = StreamMessageListenerContainer.create(
	redisConnectionFactory(),
	containerOptions);
	Subscription subscription = container.receiveAutoAck(Consumer.from("courseGroup", "instance-2"),
	StreamOffset.create("courseFree", ReadOffset.lastConsumed()), freeEventListener);
	container.start();
	return subscription;
	}
	}

	private CoursePaymentType validateUserFreeOrPoint(final User user, final int requiredPoints) {
	if (user.getFree() > 0) {
	return CoursePaymentType.FREE; // User가 free를 갖고 있으면 true를 반환
	} else if (user.getTotalPoint() < requiredPoints) {
	throw new DateRoadException(FailureCode.INSUFFICIENT_USER_POINTS);
	}
	return CoursePaymentType.POINT;
	}

	public void processCoursePayment(final CoursePaymentType coursePaymentType, User user, final Point point,
	final PointUseReq pointUseReq) {
	switch (coursePaymentType) {
	case FREE -> {
	asyncService.publishEventUserFree(user);
	}
	case POINT -> {
	pointRepository.save(point);
	asyncService.publishEvenUserPoint(user, pointUseReq);
	}

[FEAT] 포인트 사용 [유저 데이트 코스 열람] API - #65 #70

[FEAT] 포인트 사용 [유저 데이트 코스 열람] API - #65 #70

Conversation

rlarlgnszx commented Jul 11, 2024

🔥Pull requests

🚨 참고 사항

📟 관련 이슈

gardening-y left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gardening-y Jul 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gardening-y left a comment •

edited

Loading

gardening-y Jul 11, 2024 •

edited

Loading