Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #95

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Develop #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d90046
Refactor : 접속한 멤버 정렬 추가
Kim-Dong-Jun99 Jan 18, 2024
7f967b9
Merge pull request #94 from FinalDoubleTen/BE-66-Refactor-STOMP
Kim-Dong-Jun99 Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/main/java/org/tenten/tentenstomp/domain/trip/repository/MessageProxyRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.tenten.tentenstomp.global.component.dto.response.TripPathCalculationResult;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand All @@ -39,17 +40,33 @@ public TripMemberMsg getTripMemberMsg(Long tripId, Map<String, HashSet<Long>> tr
}
HashSet<Long> connectedMember = tripConnectedMemberMap.getOrDefault(Long.toString(tripId), new HashSet<>());
Trip trip = tripRepository.getReferenceById(tripId);
TripMemberMsg tripMemberMsg = new TripMemberMsg(
tripId,
memberRepository.findTripMemberInfoByTripId(tripId).stream().map(
tm -> new TripMemberInfoMsg(tm.memberId(), tm.name(), tm.thumbnailUrl(), connectedMember.contains(tm.memberId()))
).toList(),
trip.getNumberOfPeople()
);
List<TripMemberInfoMsg> tripMembers = memberRepository.findTripMemberInfoByTripId(tripId).stream().map(
tm -> new TripMemberInfoMsg(tm.memberId(), tm.name(), tm.thumbnailUrl(), connectedMember.contains(tm.memberId()))
).toList();
TripMemberMsg tripMemberMsg = sortTripMemberMsg(Long.toString(tripId), tripMembers, trip);
redisCache.save(MEMBER, Long.toString(tripId), tripMemberMsg);
return tripMemberMsg;
}

private static TripMemberMsg sortTripMemberMsg(String tripId, List<TripMemberInfoMsg> tripMembers, Trip trip) {
List<TripMemberInfoMsg> tripMemberInfoMsgs = new ArrayList<>();
for (TripMemberInfoMsg tripMemberMsg : tripMembers) {
if (tripMemberMsg.connected()) {
tripMemberInfoMsgs.add(tripMemberMsg);
}
}
for (TripMemberInfoMsg tripMemberMsg : tripMembers) {
if (!tripMemberMsg.connected()) {
tripMemberInfoMsgs.add(tripMemberMsg);
}
}
return new TripMemberMsg(
Long.parseLong(tripId),
tripMemberInfoMsgs,
trip.getNumberOfPeople()
);
}

@Transactional(readOnly = true)
public TripBudgetMsg getTripBudgetMsg(Trip trip) {

Expand Down
28 changes: 22 additions & 6 deletions src/main/java/org/tenten/tentenstomp/domain/trip/service/TripService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,31 @@ public void connectMember(String tripId, MemberConnectMsg memberConnectMsg) {
Optional<TripMemberInfo> tripMemberInfoByMemberId = memberRepository.findTripMemberInfoByMemberId(memberConnectMsg.memberId());
tripMemberInfoByMemberId.ifPresent(tripMemberInfoMsg -> connectedMember.add(tripMemberInfoByMemberId.get().memberId()));

TripMemberMsg tripMemberMsg = new TripMemberMsg(
List<TripMemberInfoMsg> tripMembers = memberRepository.findTripMemberInfoByTripId(Long.parseLong(tripId)).stream().map(
tm -> new TripMemberInfoMsg(tm.memberId(), tm.name(), tm.thumbnailUrl(), connectedMember.contains(tm.memberId()))
).toList();
TripMemberMsg tripMemberMsg = sortTripMemberMsg(tripId, tripMembers, trip);
tripConnectedMemberMap.put(tripId, connectedMember);
kafkaProducer.sendAndSaveToRedis(tripMemberMsg);
}

private static TripMemberMsg sortTripMemberMsg(String tripId, List<TripMemberInfoMsg> tripMembers, Trip trip) {
List<TripMemberInfoMsg> tripMemberInfoMsgs = new ArrayList<>();
for (TripMemberInfoMsg tripMemberMsg : tripMembers) {
if (tripMemberMsg.connected()) {
tripMemberInfoMsgs.add(tripMemberMsg);
}
}
for (TripMemberInfoMsg tripMemberMsg : tripMembers) {
if (!tripMemberMsg.connected()) {
tripMemberInfoMsgs.add(tripMemberMsg);
}
}
return new TripMemberMsg(
Long.parseLong(tripId),
memberRepository.findTripMemberInfoByTripId(Long.parseLong(tripId)).stream().map(
tm -> new TripMemberInfoMsg(tm.memberId(), tm.name(), tm.thumbnailUrl(), connectedMember.contains(tm.memberId()))
).toList(),
tripMemberInfoMsgs,
trip.getNumberOfPeople()
);
tripConnectedMemberMap.put(tripId, connectedMember);
kafkaProducer.sendAndSaveToRedis(tripMemberMsg);
}

@Transactional
Expand Down