Skip to content

Commit 3de50dd

Browse files
committed
remove no longer used method. remove todo. tidy test code.
1 parent 11130a6 commit 3de50dd

File tree

3 files changed

+36
-82
lines changed

3 files changed

+36
-82
lines changed

src/main/java/com/researchspace/service/impl/RecordManagerImpl.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ public List<BaseRecord> getFilteredRecordsList(WorkspaceFilters filters, User us
10881088

10891089
if (filters.isMediaFilesFilter()) {
10901090
Set<BaseRecord> mediaFiles = recordDao.getViewableMediaFiles(List.of(user));
1091-
addOrRetain(hits, init, mediaFiles);
1091+
init = addOrRetain(hits, init, mediaFiles);
10921092

10931093
String mediaType = filters.getMediaFilesType();
10941094
if (mediaType != null) {
@@ -1187,8 +1187,7 @@ private List<BaseRecord> getViewableRecordsByRole(User subject, boolean onlyTemp
11871187
Set<BaseRecord> subjectsViewableRecords =
11881188
new HashSet<>(getRecordsSharedWithUser(subject, onlyTemplates, subject));
11891189

1190-
// records created by each of the subjects viewable users TODO: can this be simplified with
1191-
// the permissions check?
1190+
// records created by each of the subjects viewable users
11921191
for (User viewableUser : viewableUsers) {
11931192
subjectsViewableRecords.addAll(
11941193
getViewableRecordsByUsers(List.of(viewableUser), onlyTemplates));

src/main/java/com/researchspace/service/impl/SearchManagerImpl.java

-4
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,6 @@ private List<String> getUserFilterForInventory(User subject) {
167167
return invPermissionUtils.getUsernameOfUserAndAllMembersOfTheirGroups(subject);
168168
}
169169

170-
private List<BaseRecord> getFilteredRecords(WorkspaceFilters filters, User user) {
171-
return recordManager.getFilteredRecordsList(filters, user);
172-
}
173-
174170
@Override
175171
public ISearchResults<BaseRecord> searchUserRecordsWithSimpleQuery(
176172
User user, String searchQuery, Integer maxResults) throws IOException {

0 commit comments

Comments
 (0)