release: 0.4.1

src/main/java/net/teumteum/alert/app/AlertHandler.java

@@ -36,7 +36,7 @@ public void handleBeforeMeetingAlerts(BeforeMeetingAlerted alerted) {
             .stream()
             .map(userAlert -> Pair.of(userAlert.getToken(),
                 new Alert(null, userAlert.getUserId(), "5분 뒤에 모임이 시작돼요!",
-                    "모임 장소로 가서 틈틈 모임을 준비해주세요.", AlertType.BEFORE_MEETING)))
+                    "모임 장소로 가서 틈틈 모임을 준비해주세요.", AlertType.BEFORE_MEETING, true)))
             .map(tokenAndAlert -> Pair.of(tokenAndAlert.getFirst(), alertService.save(tokenAndAlert.getSecond())))
             .forEach(
                 tokenAndAlert -> alertPublisher.publish(tokenAndAlert.getFirst(), tokenAndAlert.getSecond(), Map.of())
@@ -50,7 +50,7 @@ public void handleStartMeetingAlerts(EndMeetingAlerted alerted) {
             .stream()
             .map(userAlert -> Pair.of(userAlert.getToken(),
                 new Alert(null, userAlert.getUserId(), alerted.meetingTitle(),
-                    "모임이 종료되었어요", AlertType.END_MEETING)))
+                    "모임이 종료되었어요", AlertType.END_MEETING, true)))
             .map(tokenAndAlert -> Pair.of(tokenAndAlert.getFirst(), alertService.save(tokenAndAlert.getSecond())))
             .forEach(tokenAndAlert ->
                 alertPublisher.publish(tokenAndAlert.getFirst(), tokenAndAlert.getSecond(),
@@ -75,7 +75,7 @@ public void handleUserRecommended(UserRecommended alerted) {
             .stream()
             .map(userAlert -> Pair.of(userAlert.getToken(),
                 new Alert(null, userAlert.getUserId(), "틈 채우기",
-                    alerted.recommenderName() + "님이 당신을 추천했어요!", AlertType.RECOMMEND_USER)))
+                    alerted.recommenderName() + "님이 당신을 추천했어요!", AlertType.RECOMMEND_USER, true)))
             .map(tokenAndAlert -> Pair.of(tokenAndAlert.getFirst(), alertService.save(tokenAndAlert.getSecond())))
             .forEach(tokenAndAlert ->
                 alertPublisher.publish(tokenAndAlert.getFirst(), tokenAndAlert.getSecond(), Map.of())

src/main/java/net/teumteum/alert/domain/Alert.java

@@ -25,7 +25,7 @@ public class Alert extends TimeBaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "userId", nullable = false)
+    @Column(name = "user_id", nullable = false)
     private Long userId;
 
     @Column(name = "title", nullable = false, length = 20)
@@ -37,4 +37,11 @@ public class Alert extends TimeBaseEntity {
     @Column(name = "type")
     @Enumerated(EnumType.STRING)
     private AlertType type;
+
+    @Column(name = "is_read", nullable = false)
+    private Boolean isRead;
+
+    public void read() {
+        isRead = true;
+    }
 }

src/main/java/net/teumteum/alert/domain/AlertService.java

@@ -22,8 +22,12 @@ public Alert save(Alert alert) {
         return alertRepository.save(alert);
     }
 
+    @Transactional
     public AlertsResponse findAllByUserId(Long userId) {
-        return AlertsResponse.of(alertRepository.findAllByUserId(userId));
+        var alerts = alertRepository.findAllByUserId(userId);
+        var alertsResponse = AlertsResponse.of(alerts);
+        alerts.forEach(Alert::read);
+        return alertsResponse;
     }
 
     @Transactional

src/main/java/net/teumteum/alert/domain/response/AlertsResponse.java

@@ -1,5 +1,6 @@
 package net.teumteum.alert.domain.response;
 
+import java.time.Instant;
 import java.util.List;
 import net.teumteum.alert.domain.Alert;
 
@@ -10,15 +11,23 @@ public record AlertsResponse(
     public static AlertsResponse of(List<Alert> alerts) {
         return new AlertsResponse(
             alerts.stream()
-                .map(alert -> new AlertResponse(alert.getTitle(), alert.getBody(), alert.getType().name()))
+                .map(alert -> new AlertResponse(
+                    alert.getTitle(),
+                    alert.getBody(),
+                    alert.getType().name(),
+                    alert.getCreatedAt(),
+                    alert.getIsRead()
+                ))
                 .toList()
         );
     }
 
     public record AlertResponse(
         String title,
         String body,
-        String type
+        String type,
+        Instant createdAt,
+        boolean isRead
     ) {
 
     }

src/main/java/net/teumteum/core/security/service/RedisService.java

@@ -55,7 +55,7 @@ public void setUserLocation(UserLocation userLocation, Long duration) {
         } catch (JsonProcessingException e) {
             throw new IllegalArgumentException(e);
         }
-        setDataWithExpiration(key,value,duration);
+        setDataWithExpiration(key, value, duration);
     }
 
     public Set<UserLocation> getAllUserLocations() {
@@ -69,4 +69,8 @@ public Set<UserLocation> getAllUserLocations() {
             }
         }).collect(Collectors.toSet());
     }
+
+    public void deleteUserLocation(Long id) {
+        deleteData(HASH_KEY + id);
+    }
 }

src/main/java/net/teumteum/meeting/controller/MeetingController.java

@@ -9,6 +9,7 @@
 import net.teumteum.meeting.domain.Topic;
 import net.teumteum.meeting.domain.request.CreateMeetingRequest;
 import net.teumteum.meeting.domain.request.UpdateMeetingRequest;
+import net.teumteum.meeting.domain.response.MeetingParticipantsForReviewResponse;
 import net.teumteum.meeting.domain.response.MeetingResponse;
 import net.teumteum.meeting.domain.response.MeetingsResponse;
 import net.teumteum.meeting.model.PageDto;
@@ -39,8 +40,7 @@ public class MeetingController {
 
     @PostMapping()
     @ResponseStatus(HttpStatus.CREATED)
-    public MeetingResponse createMeeting(
-        @RequestPart @Valid CreateMeetingRequest meetingRequest,
+    public MeetingResponse createMeeting(@RequestPart @Valid CreateMeetingRequest meetingRequest,
         @RequestPart List<MultipartFile> images) {
         Long userId = securityService.getCurrentUserId();
         return meetingService.createMeeting(images, meetingRequest, userId);
@@ -55,10 +55,8 @@ public MeetingResponse getMeetingById(@PathVariable("meetingId") Long meetingId)
 
     @GetMapping
     @ResponseStatus(HttpStatus.OK)
-    public PageDto<MeetingsResponse> getMeetingsByCondition(
-        Pageable pageable,
-        @RequestParam(value = "isOpen") boolean isOpen,
-        @RequestParam(value = "topic", required = false) Topic topic,
+    public PageDto<MeetingsResponse> getMeetingsByCondition(Pageable pageable,
+        @RequestParam(value = "isOpen") boolean isOpen, @RequestParam(value = "topic", required = false) Topic topic,
         @RequestParam(value = "meetingAreaStreet", required = false) String meetingAreaStreet,
         @RequestParam(value = "participantUserId", required = false) Long participantUserId,
         @RequestParam(value = "searchWord", required = false) String searchWord) {
@@ -69,8 +67,7 @@ public PageDto<MeetingsResponse> getMeetingsByCondition(
 
     @PutMapping("/{meetingId}")
     @ResponseStatus(HttpStatus.OK)
-    public MeetingResponse updateMeeting(@PathVariable Long meetingId,
-        @RequestPart @Valid UpdateMeetingRequest request,
+    public MeetingResponse updateMeeting(@PathVariable Long meetingId, @RequestPart @Valid UpdateMeetingRequest request,
         @RequestPart List<MultipartFile> images) {
         Long userId = securityService.getCurrentUserId();
         return meetingService.updateMeeting(meetingId, images, request, userId);
@@ -97,6 +94,12 @@ public void deleteParticipant(@PathVariable("meetingId") Long meetingId) {
         meetingService.cancelParticipant(meetingId, userId);
     }
 
+    @GetMapping("/{meetingId}/participants")
+    @ResponseStatus(HttpStatus.OK)
+    public MeetingParticipantsForReviewResponse getParticipants(@PathVariable("meetingId") Long meetingId) {
+        return meetingService.getParticipants(meetingId);
+    }
+
     @PostMapping("/{meetingId}/reports")
     @ResponseStatus(HttpStatus.CREATED)
     public void reportMeeting(@PathVariable("meetingId") Long meetingId) {

src/main/java/net/teumteum/meeting/domain/response/MeetingParticipantsForReviewResponse.java

@@ -0,0 +1,30 @@
+package net.teumteum.meeting.domain.response;
+
+import java.util.List;
+import net.teumteum.user.domain.User;
+
+public record MeetingParticipantsForReviewResponse(
+    List<MeetingParticipantForReviewResponse> participants
+) {
+
+    public static MeetingParticipantsForReviewResponse of(List<User> users) {
+        return new MeetingParticipantsForReviewResponse(
+            users.stream()
+                .map(user -> new MeetingParticipantForReviewResponse(
+                    user.getId(),
+                    user.getCharacterId(),
+                    user.getName(),
+                    user.getJob().getDetailJobClass()))
+                .toList()
+        );
+    }
+
+    public record MeetingParticipantForReviewResponse(
+        Long id,
+        Long characterId,
+        String name,
+        String job
+    ) {
+
+    }
+}

src/main/java/net/teumteum/meeting/service/MeetingService.java

@@ -1,6 +1,7 @@
 package net.teumteum.meeting.service;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import net.teumteum.meeting.domain.ImageUpload;
@@ -11,9 +12,12 @@
 import net.teumteum.meeting.domain.Topic;
 import net.teumteum.meeting.domain.request.CreateMeetingRequest;
 import net.teumteum.meeting.domain.request.UpdateMeetingRequest;
+import net.teumteum.meeting.domain.response.MeetingParticipantsForReviewResponse;
 import net.teumteum.meeting.domain.response.MeetingResponse;
 import net.teumteum.meeting.domain.response.MeetingsResponse;
 import net.teumteum.meeting.model.PageDto;
+import net.teumteum.user.domain.User;
+import net.teumteum.user.domain.UserConnector;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -27,6 +31,7 @@ public class MeetingService {
 
     private final MeetingRepository meetingRepository;
     private final ImageUpload imageUpload;
+    private final UserConnector userConnector;
 
     @Transactional
     public MeetingResponse createMeeting(List<MultipartFile> images, CreateMeetingRequest meetingRequest, Long userId) {
@@ -148,6 +153,18 @@ public void cancelParticipant(Long meetingId, Long userId) {
         existMeeting.cancelParticipant(userId);
     }
 
+    @Transactional(readOnly = true)
+    public MeetingParticipantsForReviewResponse getParticipants(Long meetingId) {
+        var existMeeting = getMeeting(meetingId);
+
+        List<User> participantUsers = existMeeting.getParticipantUserIds().stream()
+            .map(userConnector::findUserById)
+            .flatMap(Optional::stream)
+            .toList();
+
+        return MeetingParticipantsForReviewResponse.of(participantUsers);
+    }
+
     @Transactional
     public void addBookmark(Long meetingId, Long userId) {
         var existMeeting = getMeeting(meetingId);

src/main/java/net/teumteum/teum_teum/domain/response/UserAroundLocationsResponse.java

@@ -1,13 +1,14 @@
 package net.teumteum.teum_teum.domain.response;
 
 import java.util.List;
+import java.util.Set;
 import net.teumteum.teum_teum.domain.UserLocation;
 
 public record UserAroundLocationsResponse(
     List<UserAroundLocationResponse> aroundUserLocations
 ) {
 
-    public static UserAroundLocationsResponse of(List<UserLocation> userData) {
+    public static UserAroundLocationsResponse of(Set<UserLocation> userData) {
         return new UserAroundLocationsResponse(
             userData.stream()
                 .map(UserAroundLocationResponse::of)

src/main/java/net/teumteum/teum_teum/service/TeumTeumService.java

@@ -6,42 +6,43 @@
 import static java.lang.Math.toRadians;
 import static java.util.Comparator.comparingDouble;
 
-import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import net.teumteum.core.security.service.RedisService;
 import net.teumteum.teum_teum.domain.UserLocation;
 import net.teumteum.teum_teum.domain.request.UserLocationRequest;
 import net.teumteum.teum_teum.domain.response.UserAroundLocationsResponse;
 import org.springframework.stereotype.Service;
 
-@Slf4j
+
 @Service
 @RequiredArgsConstructor
 public class TeumTeumService {
 
     private static final int SEARCH_LIMIT = 6;
+    private static final long USER_LOCATION_DATA_DURATION = 10L;
+    private static final int AROUND_USER_LOCATION_DISTANCE = 100;
 
     private final RedisService redisService;
 
     public UserAroundLocationsResponse saveAndGetUserAroundLocations(UserLocationRequest request) {
-        redisService.setUserLocation(request.toUserLocation(), 60L);
+        redisService.setUserLocation(request.toUserLocation(), USER_LOCATION_DATA_DURATION);
         return getUserAroundLocations(request);
     }
 
     private UserAroundLocationsResponse getUserAroundLocations(UserLocationRequest request) {
         Set<UserLocation> allUserLocations = redisService.getAllUserLocations();
 
-        List<UserLocation> aroundUserLocations = allUserLocations.stream()
+        Set<UserLocation> aroundUserLocations = allUserLocations.stream()
             .filter(userLocation -> !userLocation.id().equals(request.id()))
             .filter(userLocation -> calculateDistance(request.latitude(), request.longitude(),
-                userLocation.latitude(), userLocation.longitude()) <= 100)
+                userLocation.latitude(), userLocation.longitude()) <= AROUND_USER_LOCATION_DISTANCE)
             .sorted(comparingDouble(userLocation
                 -> calculateDistance(request.latitude(), request.longitude(),
                 userLocation.latitude(), userLocation.longitude()))
             ).limit(SEARCH_LIMIT)
-            .toList();
+            .collect(Collectors.toSet());
 
         return UserAroundLocationsResponse.of(aroundUserLocations);
     }

src/main/java/net/teumteum/user/service/UserService.java

@@ -81,9 +81,10 @@ public void addFriends(Long myId, Long friendId) {
     public void withdraw(UserWithdrawRequest request, Long userId) {
         var existUser = getUser(userId);
 
-        userRepository.delete(existUser);
         redisService.deleteData(String.valueOf(userId));
 
+        userRepository.delete(existUser);
+
         withdrawReasonRepository.saveAll(request.toEntity());
     }
 
@@ -95,9 +96,9 @@ public UserRegisterResponse register(UserRegisterRequest request) {
         return UserRegisterResponse.of(savedUser.getId(), jwtService.createServiceToken(savedUser));
     }
 
-    @Transactional
     public void logout(Long userId) {
         redisService.deleteData(String.valueOf(userId));
+
         SecurityService.clearSecurityContext();
     }
 
@@ -143,10 +144,11 @@ public InterestQuestionResponse getInterestQuestionByUserIds(List<Long> userIds,
     }
 
     private void checkUserExistence(Authenticated authenticated, String oauthId) {
-        userRepository.findByAuthenticatedAndOAuthId(authenticated, oauthId)
-            .ifPresent(user -> {
+        boolean userExists = userRepository.findByAuthenticatedAndOAuthId(authenticated, oauthId).isPresent();
+        Assert.isTrue(!userExists, () -> {
                 throw new IllegalArgumentException("일치하는 user 가 이미 존재합니다.");
-            });
+            }
+        );
     }
 
     private void checkMeetingExistence(Long meetingId) {

src/main/resources/db/migration/V14__add_is_read_column_on_alert.sql

@@ -0,0 +1,2 @@
+alter table alert
+    add column is_read boolean not null;

src/test/java/net/teumteum/integration/Api.java

@@ -213,4 +213,12 @@ ResponseSpec registerUserReview(String accessToken, Long meetingId, ReviewRegist
             .bodyValue(request)
             .exchange();
     }
+
+    ResponseSpec getMeetingParticipants(String accessToken, Long meetingId) {
+        return webTestClient
+            .get()
+            .uri("/meetings/" + meetingId + "/participants")
+            .header(HttpHeaders.AUTHORIZATION, accessToken)
+            .exchange();
+    }
 }