Skip to content

Commit fa617d1

Browse files
committed
CR added mapUserIdToMember utility to service
1 parent 31e2624 commit fa617d1

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

application/src/main/java/org/togetherjava/tjbot/features/tophelper/TopHelpersAssignmentRoutine.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.Objects;
3939
import java.util.Optional;
4040
import java.util.Set;
41-
import java.util.function.Function;
4241
import java.util.function.Predicate;
4342
import java.util.regex.Pattern;
4443
import java.util.stream.Collectors;
@@ -179,8 +178,7 @@ private void sendSelectionMenu(Collection<TopHelpersService.TopHelperStats> topH
179178
.setMinValues(1)
180179
.setMaxValues(topHelpers.size());
181180

182-
Map<Long, Member> userIdToMember =
183-
members.stream().collect(Collectors.toMap(Member::getIdLong, Function.identity()));
181+
Map<Long, Member> userIdToMember = TopHelpersService.mapUserIdToMember(members);
184182
topHelpers.stream()
185183
.map(topHelper -> topHelperToSelectOption(topHelper,
186184
userIdToMember.get(topHelper.authorId())))

application/src/main/java/org/togetherjava/tjbot/features/tophelper/TopHelpersService.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ public static String asAsciiTable(Collection<TopHelperStats> topHelpers,
185185

186186
private static String asAsciiTable(Collection<TopHelperStats> topHelpers,
187187
Collection<? extends Member> members, boolean includeIds) {
188-
Map<Long, Member> userIdToMember =
189-
members.stream().collect(Collectors.toMap(Member::getIdLong, Function.identity()));
188+
Map<Long, Member> userIdToMember = mapUserIdToMember(members);
190189

191190
List<List<String>> topHelpersDataTable = topHelpers.stream()
192191
.map(topHelper -> topHelperToDataRow(topHelper,
@@ -196,6 +195,16 @@ private static String asAsciiTable(Collection<TopHelperStats> topHelpers,
196195
return dataTableToString(topHelpersDataTable, includeIds);
197196
}
198197

198+
/**
199+
* Given a list of members, maps them by their user ID.
200+
*
201+
* @param members the members to map
202+
* @return a map of user ID to corresponding member
203+
*/
204+
public static Map<Long, Member> mapUserIdToMember(Collection<? extends Member> members) {
205+
return members.stream().collect(Collectors.toMap(Member::getIdLong, Function.identity()));
206+
}
207+
199208
/**
200209
* Visual representation of the given members name as it should be used for display purposes.
201210
*

0 commit comments

Comments
 (0)