Merge branch 'develop' of https://i10d111.p.ssafy.io:8989/S10P12D111 …

…into fix/#217-search-engine-be

Change-Id: Ifa46ba0091dc399f82d80ba8f65fb15d479846b6

README.md

@@ -1,2 +1,81 @@
-# ggumtle
-아자아자! 잘하자!
+# <img src="README.assets/ggumtle.png" height = 25px> 꿈 : 틀 소개
+![Alt text](/README.assets/title.gif)
+
+    꿈, 이제는 정말 이뤄나갈 시간.
+    마음에만 담아두지 말고 꿈틀에 담아보세요.
+
+    다른 사람들은 가슴 한켠에 어떤 꿈을 품은 채 살아갈까요?
+    나와 같은 꿈을 먼저 이룩한 선배 꿈꾼이는 어떤 여정을 겪었을까요?
+
+    꿈틀에서 다채롭고 감동적인 꿈들을 만나보세요.
+    꿈나라로 초대합니다. 꿈틀에서 만나요.
+<br>
+
+# <img src="README.assets/ggumtle1.png" height = 25px> 서비스 주요 기능
+
+#### 1. 친밀도에 따른 레이다 조회 및 꿈 카테고리 별 레이다 조회
+#### 2. 설정주기에 따른 꿈 리마인드
+#### 3. 유저간 상호작용(팔로우, 댓글, 리액션)
+#### 4. 검색 기능으로 사용자, 꿈틀, 후기 목록 조회
+#### 5. 필터 기능을 적용한 유저 타임라인 조회
+#### 6. SSE를 활용한 상호작용 알람
+#### 7. 꿈 달성시 타임 캡슐 확인 및 소셜 공유 기능
+
+<br>
+
+# <img src="README.assets/ggumtle2.png" height = 25px> 서비스 시연 동영상
+
+<br>
+
+# <img src="README.assets/ggumtle4.png" height = 25px> 개발환경
+
+### Backend
+<img src="https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white"><img src="https://img.shields.io/badge/20.04 LTS-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=openjdk&logoColor=white"><img src="https://img.shields.io/badge/17-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/spring boot-%236DB33F.svg?style=for-the-badge&logo=spring&logoColor=white"><img src="https://img.shields.io/badge/3.2.1-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/spring secutiry-%236DB33F.svg?style=for-the-badge&logo=spring&logoColor=white">
+<img src="https://img.shields.io/badge/Spring Data JPA-%236DB33F.svg?style=for-the-badge&logo=spring&logoColor=white">
+<img src="https://img.shields.io/badge/Gradle-02303A.svg?style=for-the-badge&logo=Gradle&logoColor=white"><img src="https://img.shields.io/badge/8.5-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/mysql-%2300f.svg?style=for-the-badge&logo=mysql&logoColor=white"><img src="https://img.shields.io/badge/8.0.36-515151?style=for-the-badge"> <img src="https://img.shields.io/badge/redis-%23DD0031.svg?style=for-the-badge&logo=redis&logoColor=white"><img src="https://img.shields.io/badge/5.0.7-515151?style=for-the-badge">
+
+### Frontend
+<img src="https://img.shields.io/badge/react-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB"><img src="https://img.shields.io/badge/18.2.0-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/node.js-6DA55F?style=for-the-badge&logo=node.js&logoColor=white"><img src="https://img.shields.io/badge/20.11.0-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/NPM-%23CB3837.svg?style=for-the-badge&logo=npm&logoColor=white"><img src="https://img.shields.io/badge/10.2.4-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/vite-%23646CFF.svg?style=for-the-badge&logo=vite&logoColor=white"><img src="https://img.shields.io/badge/5.0.8-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white"><img src="https://img.shields.io/badge/5.2.2-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/-React%20Query-FF4154?style=for-the-badge&logo=react%20query&logoColor=white"><img src="https://img.shields.io/badge/5.17.15-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/react%20zustand-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB"><img src="https://img.shields.io/badge/4.5.0-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/React_Router_dom-CA4245?style=for-the-badge&logo=react-router&logoColor=white"><img src="https://img.shields.io/badge/6.21.3-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/axios-5a29e4?style=for-the-badge&logoColor=white"><img src="https://img.shields.io/badge/1.6.7-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white"><img src="https://img.shields.io/badge/3.4.1-515151?style=for-the-badge">
+
+### CI/CD
+<img src="https://img.shields.io/badge/AWS ec2 ubuntu-%23FF9900.svg?style=for-the-badge&logo=amazon-aws&logoColor=white"><img src="https://img.shields.io/badge/20.11.0-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/nginx-%23009639.svg?style=for-the-badge&logo=nginx&logoColor=white"><img src="https://img.shields.io/badge/1.18.0-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/jenkins-%232C5263.svg?style=for-the-badge&logo=jenkins&logoColor=white"><img src="https://img.shields.io/badge/2.426.2-515151?style=for-the-badge">
+
+### 협업 툴
+<img src="https://img.shields.io/badge/gitlab-%23181717.svg?style=for-the-badge&logo=gitlab&logoColor=white">
+<img src="https://img.shields.io/badge/jira-%230A0FFF.svg?style=for-the-badge&logo=jira&logoColor=white">
+<img src="https://img.shields.io/badge/gerrit-347dbe?style=for-the-badge&logoColor=white"><img src="https://img.shields.io/badge/3.8.1-515151?style=for-the-badge">
+<img src="https://img.shields.io/badge/mattermost-1e325c?style=for-the-badge&logoColor=white">
+
+<br>
+
+# <img src="README.assets/ggumtle5.png" height = 25px> 서비스 아키텍쳐
+![Alt text](/README.assets/architecture.png)
+<br>
+
+# <img src="README.assets/ggumtle6.png" height = 25px> ER Diagram
+![Alt text](/README.assets/erd.png)
+
+<br>
+
+# <img src="README.assets/ggumtle7.png" height = 25px> 팀 소개
+|이우성|이원주|전지환|서준호|신창엽|조인화|
+|:---:|:---:|:---:|:---:|:---:|:---:|
+|<img src="https://avatars.githubusercontent.com/u/42796944?v=4" height = 100px>|<img src="https://avatars.githubusercontent.com/u/101818687?v=4" height = 100px>|<img src="https://avatars.githubusercontent.com/u/81613019?v=4" height = 100px>|<img src="https://avatars.githubusercontent.com/u/140311409?v=4" height = 100px>|<img src="https://avatars.githubusercontent.com/u/69495305?v=4" height = 100px>|<img src="https://avatars.githubusercontent.com/u/75416721?v=4" height = 100px>|
+|`FE` `QA`<br>[@leewooseong](https://github.com/leewooseong)|`FE 리더`<br>[@3o14](https://github.com/3o14)|`BE` `PM`<br>[@DarkBlackRice](https://github.com/DarkBlackRice)|`BE` `INFRA`<br>[@ho97s](https://github.com/ho97s)|`BE 리더`<br>[@404](https://github.com/404-not-foundl)|`BE` `QA`<br>[@jjjoina](https://github.com/jjjoina)|
+<hr>
+

backend/src/main/java/com/ggums/ggumtle/common/handler/AlarmHandler.java

@@ -2,10 +2,12 @@
 
 import com.ggums.ggumtle.common.exception.CustomException;
 import com.ggums.ggumtle.common.exception.ExceptionType;
+import com.ggums.ggumtle.dto.response.model.AlarmDto;
 import com.ggums.ggumtle.entity.*;
 import com.ggums.ggumtle.repository.AlarmRepository;
 import com.ggums.ggumtle.repository.BucketRepository;
 import com.ggums.ggumtle.repository.UserRepository;
+import com.ggums.ggumtle.service.AlarmService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -32,7 +34,7 @@ public class AlarmHandler {
     public final Map<Long, SseEmitter> userEmitters = new ConcurrentHashMap<>();
     private final AlarmRepository alarmRepository;
     private final BucketRepository bucketRepository;
-    private final UserRepository userRepository;
+    private final AlarmService alarmService;
 
     // Giving connection signals to client
     @Async
@@ -61,14 +63,14 @@ public void createUserAlarm(User receiver, User sender, AlarmType type){
         if (!receiver.getAlarm()) {
             return;
         }
-        Alarm alarm =  Alarm.builder()
+        Alarm alarm = Alarm.builder()
                 .receiver(receiver)
                 .sender(sender)
                 .type(type)
                 .dataId(sender != null ? sender.getId() : null)
                 .build();
         alarmRepository.save(alarm);
-        sendEventToUser(receiver.getId());
+        sendEventToUser(receiver.getId(), alarm);
     }
 
     /**
@@ -91,7 +93,7 @@ public void createBucketAlarm(User receiver, User sender, AlarmType type, Bucket
                 .dataId(bucket.getId())
                 .build();
         alarmRepository.save(alarm);
-        sendEventToUser(receiver.getId());
+        sendEventToUser(receiver.getId(), alarm);
     }
 
     /**
@@ -114,7 +116,7 @@ public void createReviewAlarm(User receiver, User sender, AlarmType type, Review
                 .dataId(review.getId())
                 .build();
         alarmRepository.save(alarm);
-        sendEventToUser(receiver.getId());
+        sendEventToUser(receiver.getId(), alarm);
     }
 
     /**
@@ -147,7 +149,7 @@ public void createCommentAlarm(User receiver, User sender, AlarmType type, Strin
         }
 
         alarmRepository.save(alarm);
-        sendEventToUser(receiver.getId());
+        sendEventToUser(receiver.getId(), alarm);
     }
 
     /**
@@ -164,7 +166,7 @@ public void createReminderAlarm(User receiver, Bucket bucket){
                 .dataId(bucket.getId())
                 .build();
         alarmRepository.save(alarm);
-        sendEventToUser(receiver.getId());
+        sendEventToUser(receiver.getId(), alarm);
     }
 
     @Scheduled(cron = "0 0 12 * * ?")
@@ -198,11 +200,11 @@ private boolean shouldSendReminder(Bucket bucket, LocalDate today) {
     }
 
     @Async
-    protected void sendEventToUser(Long userId) {
+    protected void sendEventToUser(Long userId, Alarm alarm) {
         SseEmitter emitter = userEmitters.get(userId);
         if (emitter != null) {
             try {
-                emitter.send(SseEmitter.event().name("serverEvent").data("readAlarm"));
+                emitter.send(SseEmitter.event().name("serverEvent").data(alarmService.convertToAlarmResponseDto(alarm)));
             } catch (IOException e) {
                 emitter.completeWithError(e);
                 userEmitters.remove(userId);

backend/src/main/java/com/ggums/ggumtle/controller/AlarmController.java

@@ -127,4 +127,14 @@ public Response readAllAlarm(@AuthenticationPrincipal User user){
         return new Response("message", alarmService.readAllAlarm(user));
     }
 
+    @PostMapping("/send-reminder")
+    @Operation(summary = "리마인더 알람 발송", description = "리마인더 알람 전송")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "sent")
+    })
+    public Response sendReminder(){
+        alarmHandler.remindBucketAlarm();
+        return new Response("message", "sent");
+    }
+
 }

backend/src/main/java/com/ggums/ggumtle/dto/response/AlarmResponseDto.java

@@ -1,7 +1,6 @@
 package com.ggums.ggumtle.dto.response;
 
-import com.ggums.ggumtle.dto.response.model.AlarmListDto;
-import com.ggums.ggumtle.entity.AlarmType;
+import com.ggums.ggumtle.dto.response.model.AlarmDto;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,5 +9,5 @@
 @Getter @Setter @Builder
 public class AlarmResponseDto {
 
-    private Page<AlarmListDto> alarmList;
+    private Page<AlarmDto> alarmList;
 }

backend/src/main/java/com/ggums/ggumtle/dto/response/model/AlarmListDto.java → backend/src/main/java/com/ggums/ggumtle/dto/response/model/AlarmDto.java

@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class AlarmListDto {
+public class AlarmDto {
 
     @Schema(description = "알람 id", example = "1")
     private Long alarmId;

backend/src/main/java/com/ggums/ggumtle/service/AlarmService.java

@@ -3,16 +3,16 @@
 import com.ggums.ggumtle.common.exception.CustomException;
 import com.ggums.ggumtle.common.exception.ExceptionType;
 import com.ggums.ggumtle.dto.response.AlarmResponseDto;
-import com.ggums.ggumtle.dto.response.BucketSearchResponseDto;
-import com.ggums.ggumtle.dto.response.model.AlarmListDto;
-import com.ggums.ggumtle.dto.response.model.BucketSearchListDto;
+import com.ggums.ggumtle.dto.response.model.AlarmDto;
 import com.ggums.ggumtle.entity.Alarm;
 import com.ggums.ggumtle.entity.User;
 import com.ggums.ggumtle.repository.AlarmRepository;
 import com.ggums.ggumtle.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,12 +50,14 @@ public String alarmRead(User user, Long alarmId){
 
     // getting list of alarm
     public AlarmResponseDto alarmList(User user, Pageable pageable){
-        Page<Alarm> alarms = alarmRepository.findByReceiver(user, pageable);
-        Page<AlarmListDto> alarmList = alarms.map(this::convertToAlarmResponseDto);
+        Pageable sortedPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("createdDate").descending());
+
+        Page<Alarm> alarms = alarmRepository.findByReceiver(user, sortedPageable);
+        Page<AlarmDto> alarmList = alarms.map(this::convertToAlarmResponseDto);
         return AlarmResponseDto.builder().alarmList(alarmList).build();
     }
 
-    private AlarmListDto convertToAlarmResponseDto(Alarm alarm){
+    public AlarmDto convertToAlarmResponseDto(Alarm alarm){
 
         String timeUnit;
         long time;
@@ -79,7 +81,7 @@ private AlarmListDto convertToAlarmResponseDto(Alarm alarm){
             time = ChronoUnit.MINUTES.between(alarm.getCreatedDate(), LocalDateTime.now());
         }
 
-        return AlarmListDto.builder()
+        return AlarmDto.builder()
                 .alarmId(alarm.getId())
                 .sender(alarm.getSender() != null ? alarm.getSender().getUserNickname() : null)
                 .senderProfileImage(alarm.getSender() != null ? alarm.getSender().getUserProfileImage() : null)