Skip to content

Commit

Permalink
use relationship approach for orcid sync setting
Browse files Browse the repository at this point in the history 
check if relationship exist using the relationshipservice rather than the search, becaude the requested item might not have been indexed yet if it is recent archived
  • Loading branch information
@floriangantner
floriangantner committed Nov 9, 2023
1 parent 393eb44 commit 6920c38
Showing 1 changed file with 45 additions and 54 deletions.
99 changes: 45 additions & 54 deletions dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.Relationship;
import org.dspace.content.service.ItemService;
import org.dspace.content.service.RelationshipService;
import org.dspace.core.Context;
Expand Down Expand Up @@ -200,28 +199,34 @@ public boolean isSynchronizationAllowed(Context context, Item profile, Item item
Optional<OrcidEntitySyncPreference> option;
option = getEntityPreference(profile, OrcidEntityType.fromEntityType(entityType));
if (option.isPresent()) {
switch (option.get()) {
case DISABLED:
return false;
case ALL:
return true;
case MINE:
case MY_SELECTED:
String relationname = configurationService.getProperty(
"orcid.relation." + entityType + "." + option.get().name());
boolean exclusion = configurationService.getBooleanProperty("orcid.relation."
+ entityType + "." + option.get().name() + ".exclusion", false);
if (isBlank(relationname)) {
try {
switch (option.get()) {
case DISABLED:
return false;
}
Iterator<Item> entities = checkRelation(context, profile, item, relationname, exclusion);
if (entities.hasNext()) {
case ALL:
return true;
} else {
case MINE:
case MY_SELECTED:
String relationname = configurationService.getProperty("orcid.relation." + entityType + "."
+ option.get().name());
if (isBlank(relationname)) {
return false;
}
if (configurationService.getBooleanProperty("orcid.relation." + entityType + "."
+ option.get().name() + ".exclusion", false)) {
//check if no relationship exists between profile and item (e.g. MINE)
return relationShipMatchForOrcidSync(context, profile, item, relationname, false);
} else {
//check, if any relationship exists between profile and item(e.g. MY_SELECTED)

return relationShipMatchForOrcidSync(context, profile, item, relationname, true);

}
default:
return false;
}
default:
return false;
}
} catch (SQLException e) {
throw new RuntimeException(e);
}
} else {
return false;
Expand Down Expand Up @@ -249,30 +254,20 @@ public boolean isSyncSettingsBasedOnRelationshipCriteriaNotValid(Context context
switch (option.get()) {
case MINE:
case MY_SELECTED:
// Consider MINE and MY_SELECTED Settings
String relationname = configurationService.getProperty(
"orcid.relation." + entityType + "." + option.get().name());
String relationname = configurationService.getProperty("orcid.relation." + entityType + "."
+ option.get().name());
if (isBlank(relationname)) {
return false;
}
boolean exclusion = configurationService.getBooleanProperty("orcid.relation."
+ entityType + "." + option.get().name() + ".exclusion", false);
if (exclusion) {
//check, if relationship exists
List<Relationship> rels = relationshipService.findByItem(context, profile);
boolean val = rels.stream()
.anyMatch(relationship ->
relationship.getLeftItem().getID().toString().equals(item.getID().toString()) &&
relationship.getLeftwardValue().contentEquals(relationname));
return val;

//because we check the criteria is not valid we have to check the opposite
if (configurationService.getBooleanProperty("orcid.relation." + entityType + "."
+ option.get().name() + ".exclusion", false)) {
//check, if any relationship exists between profile and item (e.g. MINE)
return relationShipMatchForOrcidSync(context, profile, item, relationname, true);
} else {
//check if no relationship exists
List<Relationship> rels = relationshipService.findByItem(context, profile);
boolean val = rels.stream()
.noneMatch(relationship ->
relationship.getLeftItem().getID().toString().equals(item.getID().toString()) &&
relationship.getLeftwardValue().contentEquals(relationname));
return val;
//check if none relationship exist between profile and item (e.g. MY_SELECT)
return relationShipMatchForOrcidSync(context, profile, item, relationname, false);
}

default:
Expand All @@ -285,21 +280,17 @@ public boolean isSyncSettingsBasedOnRelationshipCriteriaNotValid(Context context
return false;
}

private Iterator<Item> checkRelation(Context context, Item profile, Item item, String filterrelationname,
boolean exclusion) {
StringBuilder sb = new StringBuilder();
if (exclusion) {
sb.append("-");
protected boolean relationShipMatchForOrcidSync(Context context, Item profile, Item item, String relationname,
boolean any) throws SQLException {
if (any) {
return relationshipService.findByItem(context, profile).stream().anyMatch(relationship ->
relationship.getLeftItem().getID().toString().equals(item.getID().toString()) &&
relationship.getLeftwardValue().contentEquals(relationname));
} else {
return relationshipService.findByItem(context, profile).stream().noneMatch(relationship ->
relationship.getLeftItem().getID().toString().equals(item.getID().toString()) &&
relationship.getLeftwardValue().contentEquals(relationname));
}
sb.append("relation." + filterrelationname + ":");
sb.append(profile.getID().toString());

DiscoverQuery discoverQuery = new DiscoverQuery();
discoverQuery.setDSpaceObjectFilter(IndexableItem.TYPE);
discoverQuery.addFilterQueries("search.resourceid:" + item.getID());
discoverQuery.addFilterQueries(sb.toString());
discoverQuery.setMaxResults(1);
return new DiscoverResultItemIterator(context, discoverQuery);
}

@Override
Expand Down

0 comments on commit 6920c38

Please sign in to comment.