Merge 9b7b3ea into aad500b

Author: gunwoong1630

src/main/java/sevenstar/marineleisure/activity/service/ActivityService.java

@@ -208,25 +208,28 @@ public ActivityDetailResponse getActivityDetail(ActivityCategory activity, BigDe
     public ActivityWeatherResponse getWeatherBySpot(BigDecimal latitude, BigDecimal longitude) {
         OutdoorSpot nearSpot = outdoorSpotRepository.findByCoordinates(latitude, longitude, 1).getFirst();
 
-        Fishing fishingSpot = fishingRepository.findBySpotIdOrderByCreatedAt(nearSpot.getId()).get();
+        Optional<Fishing> fishingSpot = fishingRepository.findBySpotIdOrderByCreatedAt(nearSpot.getId());
+
+        if (fishingSpot.isPresent()) {
+            Fishing fishingSpotGet = fishingSpot.get();
 
-        if (fishingSpot != null) {
             return new ActivityWeatherResponse(
                 nearSpot.getName(),
-                fishingSpot.getWindSpeedMax().toString(),
-                fishingSpot.getWaveHeightMax().toString(),
-                fishingSpot.getSeaTempMax().toString()
+                fishingSpotGet.getWindSpeedMax().toString(),
+                fishingSpotGet.getWaveHeightMax().toString(),
+                fishingSpotGet.getSeaTempMax().toString()
             );
         }
 
-        Surfing surfingSpot = surfingRepository.findBySpotIdOrderByCreatedAt(nearSpot.getId()).get();
+        Optional<Surfing> surfingSpot = surfingRepository.findBySpotIdOrderByCreatedAt(nearSpot.getId());
 
-        if (surfingSpot != null) {
+        if (surfingSpot.isPresent()) {
+            Surfing surfingSpotGet = surfingSpot.get();
             return new ActivityWeatherResponse(
                 nearSpot.getName(),
-                surfingSpot.getWindSpeed().toString(),
-                surfingSpot.getWaveHeight().toString(),
-                surfingSpot.getSeaTemp().toString()
+                surfingSpotGet.getWindSpeed().toString(),
+                surfingSpotGet.getWaveHeight().toString(),
+                surfingSpotGet.getSeaTemp().toString()
             );
         } else {
             throw new RuntimeException("Spot not found");

src/main/java/sevenstar/marineleisure/meeting/dto/mapper/MeetingMapper.java

@@ -83,13 +83,14 @@ public Tag UpdateTag(UpdateMeetingRequest request, Tag tag) {
 				.build();
 	}
 
-	public MeetingDetailResponse MeetingDetailResponseMapper(Meeting targetMeeting, Member host,
+	public MeetingDetailResponse MeetingDetailResponseMapper(Meeting targetMeeting, Member host,Integer currentParticipant,
 		OutdoorSpot targetSpot, Tag targetTag) {
 		return MeetingDetailResponse.builder()
 			.id(targetMeeting.getId())
 			.title(targetMeeting.getTitle())
 			.category(targetMeeting.getCategory())
 			.capacity(targetMeeting.getCapacity())
+			.currentParticipants(currentParticipant)
 			.hostId(targetMeeting.getHostId())
 			.hostNickName(host.getNickname())
 			.hostEmail(host.getEmail())
@@ -102,9 +103,7 @@ public MeetingDetailResponse MeetingDetailResponseMapper(Meeting targetMeeting,
 			.meetingTime(targetMeeting.getMeetingTime())
 			.status(targetMeeting.getStatus())
 			.createdAt(targetMeeting.getCreatedAt())
-			.tag(TagList.builder()
-				.content(targetTag.getContent())
-				.build())
+			.tag(targetTag != null ? TagList.builder().content(targetTag.getContent()).build() : TagList.builder().content(Collections.emptyList()).build())
 			.build();
 	}
 

src/main/java/sevenstar/marineleisure/meeting/dto/response/MeetingDetailResponse.java

@@ -29,6 +29,7 @@ public record MeetingDetailResponse(
 	String title,
 	ActivityCategory category,
 	long capacity,
+	Integer currentParticipants,
 	long hostId,
 	String hostNickName,
 	String hostEmail,

src/main/java/sevenstar/marineleisure/meeting/service/MeetingServiceImpl.java

@@ -82,8 +82,11 @@ public MeetingDetailResponse getMeetingDetails(Long meetingId) {
 		Member host = memberValidate.foundMember(targetMeeting.getHostId());
 		OutdoorSpot targetSpot = spotValidate.foundOutdoorSpot(targetMeeting.getSpotId());
 		Tag targetTag = tagValidate.findByMeetingId(meetingId).orElse(null);
+		Integer currentParticipants = participantRepository.countMeetingId(targetMeeting.getId()).orElseThrow(
+			() -> new CustomException(ParticipantError.PARTICIPANT_NOT_FOUND)
+		);
 
-		return meetingMapper.MeetingDetailResponseMapper(targetMeeting, host, targetSpot, targetTag);
+		return meetingMapper.MeetingDetailResponseMapper(targetMeeting, host,currentParticipants,targetSpot, targetTag);
 	}
 
 	@Override