feat: Webpush for webcam

VOM-Project · Jun 25, 2024 · 27f13c3 · 27f13c3
1 parent 26477a8
commit 27f13c3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/src/main/java/vom/spring/domain/webcam/domain/Webcam.java b/src/main/java/vom/spring/domain/webcam/domain/Webcam.java
@@ -2,9 +2,13 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import vom.spring.domain.homepy.Homepy;
+import vom.spring.domain.webpush.domain.Webpush;
 
 import java.time.LocalDateTime;
 
+import static jakarta.persistence.FetchType.LAZY;
+
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
@@ -18,4 +22,7 @@ public class Webcam {
     private LocalDateTime createdAt;
     @Enumerated(EnumType.STRING)
     private Status status;
+
+    @OneToOne(mappedBy = "webcam", fetch = LAZY)
+    private Webpush webpush;
 }
diff --git a/src/main/java/vom/spring/domain/webcam/service/WebcamServiceImpl.java b/src/main/java/vom/spring/domain/webcam/service/WebcamServiceImpl.java
@@ -13,6 +13,8 @@
 import vom.spring.domain.webcam.dto.WebcamResponseDto;
 import vom.spring.domain.webcam.repository.MemberWebcamRepository;
 import vom.spring.domain.webcam.repository.WebcamRepository;
+import vom.spring.domain.webpush.domain.Webpush;
+import vom.spring.domain.webpush.repository.WebpushRepository;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -24,6 +26,7 @@ public class WebcamServiceImpl implements WebcamServcie{
     private final WebcamRepository webcamRepository;
     private final MemberRepository memberRepository;
     private final MemberWebcamRepository memberWebcamRepository;
+    private final WebpushRepository webpushRepository;
 
     /**
      * 화상채팅 방 생성
@@ -42,6 +45,13 @@ public WebcamResponseDto.CreateWebcamDto createWebcamRoom(WebcamRequestDto.Creat
         MemberWebcam toMemberWebcam = MemberWebcam.builder().member(toMember).webcam(newWebcam).build();
         memberWebcamRepository.save(fromMemberWebcam);
         memberWebcamRepository.save(toMemberWebcam);
+        webpushRepository.save(
+                Webpush.builder()
+                        .createdAt(LocalDateTime.now())
+                        .fromMember(fromMember)
+                        .toMember(toMember)
+                        .webcam(newWebcam)
+                        .build());
         return WebcamResponseDto.CreateWebcamDto.builder().webcamId(newWebcam.getId()).build();
     }
 

diff --git a/src/main/java/vom/spring/domain/webpush/domain/Webpush.java b/src/main/java/vom/spring/domain/webpush/domain/Webpush.java
@@ -32,7 +32,7 @@ public class Webpush {
     @JoinColumn(referencedColumnName = "id", name = "to_member_id", nullable = false)
     private Member toMember;
 
-//    @OneToOne
-//    @JoinColumn(referencedColumnName = "id", name = "webcam_id", nullable = false)
-//    private Webcam webcam;
+    @OneToOne
+    @JoinColumn(referencedColumnName = "id", name = "webcam_id", nullable = false)
+    private Webcam webcam;
 }
diff --git a/src/main/java/vom/spring/domain/webpush/dto/WebpushDto.java b/src/main/java/vom/spring/domain/webpush/dto/WebpushDto.java
@@ -8,11 +8,11 @@
 public class WebpushDto {
     private Long fromMemberId;
     private LocalDateTime createdAt;
-//    private Long webcamId;
+    private Long webcamId;
 
-    public WebpushDto(Long fromMemberId, LocalDateTime createdAt) {
+    public WebpushDto(Long fromMemberId, LocalDateTime createdAt, Long webcamId) {
         this.fromMemberId = fromMemberId;
         this.createdAt = createdAt;
-//        this.webcamId = webcamId;
+        this.webcamId = webcamId;
     }
 }
diff --git a/src/main/java/vom/spring/domain/webpush/repository/WebpushRepository.java b/src/main/java/vom/spring/domain/webpush/repository/WebpushRepository.java
@@ -17,9 +17,9 @@ public void save(Webpush webpush) {
         em.persist(webpush);
     }
 
-    public List<WebpushDto> findFromMemberIdsByToMemberId(Long toMemberId) {
+    public List<WebpushDto> findByToMemberId(Long toMemberId) {
         return em.createQuery(
-                        "select new WebpushDto(w.fromMember.id, w.createdAt) " +
+                        "select new WebpushDto(w.fromMember.id, w.createdAt, w.webcam.id) " +
                                 "from Webpush w where w.toMember.id = :toMemberId",
                         WebpushDto.class)
                 .setParameter("toMemberId", toMemberId)

diff --git a/src/main/java/vom/spring/domain/webpush/service/WebpushService.java b/src/main/java/vom/spring/domain/webpush/service/WebpushService.java
@@ -25,9 +25,8 @@ public WebpushService(WebpushRepository webpushRepository, MemberRepository memb
     /**
      * 웹푸쉬 조회
      */
-    @Transactional
-    public List<WebpushDto> getWebpushes(Long member_id) {
-        return webpushRepository.findFromMemberIdsByToMemberId(member_id);
+    public List<WebpushDto> getWebpushes(Long toMemberId) {
+        return webpushRepository.findByToMemberId(toMemberId);
     }
 
     /**