Skip to content

MCR-3721 Add public methods to obtain MCRPI data stored in service flags #2981

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

Open
toKrause wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MCR-3721 Add public methods to obtain MCRPI data stored in service flags #2981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 35 additions & 9 deletions mycore-pi/src/main/java/org/mycore/pi/MCRPIService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,47 @@ public static boolean hasFlag(MCRBase obj, String additional, MCRPIRegistrationI
MCRObjectService service = obj.getService();
List<String> flags = service.getFlags(PI_FLAG);
Gson gson = getGson();
return flags.stream().anyMatch(s -> {
MCRPI flag = gson.fromJson(s, MCRPI.class);
return flag.getAdditional().equals(additional) && flag.getIdentifier().equals(mcrpi.getIdentifier());
});
return flags.stream()
.map(s -> gson.fromJson(s, MCRPI.class))
.anyMatch(flag -> matches(flag, mcrpi, additional));
}

public static List<MCRPI> getFlags(MCRBase obj, String additional, MCRPIRegistrationInfo mcrpi) {
MCRObjectService service = obj.getService();
List<String> flags = service.getFlags(PI_FLAG);
Gson gson = getGson();
return flags.stream()
.map(s -> gson.fromJson(s, MCRPI.class))
.filter(flag -> matches(flag, mcrpi, additional))
.toList();
}

private static boolean matches(MCRPI flag, MCRPIRegistrationInfo mcrpi, String additional) {
return flag.getAdditional().equals(additional) && flag.getIdentifier().equals(mcrpi.getIdentifier());
}

public static boolean hasFlag(MCRBase obj, String additional, MCRPIService<?> piService) {
MCRObjectService service = obj.getService();
List<String> flags = service.getFlags(PI_FLAG);
Gson gson = getGson();
return flags.stream().anyMatch(s -> {
MCRPI flag = gson.fromJson(s, MCRPI.class);
return flag.getAdditional().equals(additional)
&& Objects.equals(flag.getService(), piService.getServiceID());
});
return flags.stream()
.map(s -> gson.fromJson(s, MCRPI.class))
.anyMatch(flag -> matches(flag, piService, additional));
}

public static List<MCRPI> getFlags(MCRBase obj, String additional, MCRPIService<?> piService) {
MCRObjectService service = obj.getService();
List<String> flags = service.getFlags(PI_FLAG);
Gson gson = getGson();
return flags.stream()
.map(s -> gson.fromJson(s, MCRPI.class))
.filter(flag -> matches(flag, piService, additional))
.toList();
}

private static boolean matches(MCRPI flag, MCRPIService<?> piService, String additional) {
return flag.getAdditional().equals(additional)
&& Objects.equals(flag.getService(), piService.getServiceID());
}

public static void updateFlagsInDatabase(MCRBase obj) {
Expand Down
Loading