Merge pull request #34 from kusitms-28th-Meetup-E/hotfix

Hotfix
kusitms-28th-Meetup-E · Nov 23, 2023 · 8c731f6 · 8c731f6
2 parents 692e645 + d781a33
commit 8c731f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/gwangjang/server/domain/member/domain/entity/Member.java b/src/main/java/gwangjang/server/domain/member/domain/entity/Member.java
@@ -57,8 +57,8 @@ public class Member {
     private String birth;
     private String gender;
 
-    @OneToMany(fetch = FetchType.LAZY)
-    private List<Subscribe> subscribeList = new ArrayList<>();
+//    @OneToMany(fetch = FetchType.LAZY)
+//    private List<Subscribe> subscribeList = new ArrayList<>();
 
     public void signUp(SignUpRequest signUpRequest) {
         this.nickname = signUpRequest.getNickname();

diff --git a/src/main/java/gwangjang/server/domain/subscribe/application/service/SubscribeUseCase.java b/src/main/java/gwangjang/server/domain/subscribe/application/service/SubscribeUseCase.java
@@ -54,6 +54,13 @@ public SubscribeRes subscribe(String socialId,Long topicId, Long issueId) {
 
     }
 
+    public Boolean isSubscriber(String socialId, Long topicId, Long issueId) {
+        Member member = memberQueryService.getMemberBySocialId(socialId);
+
+        return subscribeQueryService.isAbleToSubscribe(member);
+
+    }
+
     // 마이페이지에 보여줄 내 구독 목록 & contentService와 feign 통신 .
     public SubscribeMemberDto getAllSubscribeByMember(String socialId) {
         Member member = memberQueryService.getMemberBySocialId(socialId);

diff --git a/src/main/java/gwangjang/server/domain/subscribe/presentation/SubscribeController.java b/src/main/java/gwangjang/server/domain/subscribe/presentation/SubscribeController.java
@@ -32,6 +32,11 @@ public ResponseEntity<SuccessResponse<SubscribeRes>> subscribe(@RequestHeader(va
                                                                    @PathVariable("topicId") Long topicId, @PathVariable("issueId") Long issueId) {
         return ResponseEntity.ok(SuccessResponse.create(SUBSCRIBE_SUCCESS.getMessage(), this.subscribeUseCase.subscribe(socialId, topicId, issueId)));
     }
+    @GetMapping("/topic/{topicId}/issue/{issueId}/subscribe")
+    public ResponseEntity<SuccessResponse<Boolean>> issubscribe(@RequestHeader(value = "user-id") String socialId,
+                                                                   @PathVariable("topicId") Long topicId, @PathVariable("issueId") Long issueId) {
+        return ResponseEntity.ok(SuccessResponse.create(SUBSCRIBE_SUCCESS.getMessage(), this.subscribeUseCase.isSubscriber(socialId, topicId, issueId)));
+    }
 
     @DeleteMapping("/topic/{topicId}/issue/{issueId}/subscribe")
     public ResponseEntity<SuccessResponse<SubscribeRes>> unSubscribe(@RequestHeader(value = "user-id") String socialId,

diff --git a/src/main/java/gwangjang/server/global/rabbitMQ/RabbitMQConfig.java b/src/main/java/gwangjang/server/global/rabbitMQ/RabbitMQConfig.java
@@ -19,7 +19,6 @@ public TopicExchange topic() {
     public Jackson2JsonMessageConverter producerJackson2MessageConverter() {
         return new Jackson2JsonMessageConverter();
     }
-
     @Bean
     public RabbitTemplate rabbitTemplate(final ConnectionFactory connectionFactory) {
         final RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);