Skip to content

#3240: Fixed analysis package registration #3423

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

Merged
moellerth merged 2 commits into from
May 26, 2025
Merged

#3240: Fixed analysis package registration #3423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f7de2
#3240: fixed repo collection of analysis and data packages based on a…
moellerth May 23, 2025
77ab21f
#3240: removed unused import
moellerth May 23, 2025
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
19 changes: 5 additions & 14 deletions src/main/java/eu/dzhw/fdz/metadatamanagement/projectmanagement/service/DataCiteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -178,28 +177,20 @@ private HttpStatus sendToDataCite(JsonNode payload) {
public JsonNode getDataCiteMetadataForProject(DataAcquisitionProject project) throws DataCiteMetadataException {
Map<String, Object> attrObj = null;
if (project.getConfiguration().getRequirements().isDataPackagesRequired()) {
final var dataPackages = this.dataPackageRepository.findByDataAcquisitionProjectId(project.getId());
if (dataPackages.isEmpty()) {
final var dataPackage = this.dataPackageRepository.findOneByDataAcquisitionProjectId(project.getId());
if (dataPackage == null) {
throw new DataCiteMetadataException(
String.format("The project with id '%s' has no data package linked to it.", project.getId()));
} else if (dataPackages.size() > 1) {
throw new DataCiteMetadataException(
String.format("The project with id '%s' has more than one data package linked to it.", project.getId()));
}
final DataPackage dataPackage = dataPackages.get(0);
final List<Survey> surveys = this.surveyRepository.findByDataAcquisitionProjectId(project.getId());
attrObj = this.createAttrObjectForDataPackage(project, dataPackage, surveys);
} else if (project.getConfiguration().getRequirements().isAnalysisPackagesRequired()) {
final var analysisPackages = this.analysisPackageRepository
.findByDataAcquisitionProjectIdAndShadowIsTrue(project.getId()).collect(Collectors.toList());
if (analysisPackages.isEmpty()) {
final var analysisPackage = this.analysisPackageRepository
.findOneByDataAcquisitionProjectId(project.getId());
if (analysisPackage == null) {
throw new DataCiteMetadataException(
String.format("The project with id '%s' has no analysis package linked to it.", project.getId()));
} else if (analysisPackages.size() > 1) {
throw new DataCiteMetadataException(
String.format("The project with id '%s' has more than one analysis package linked to it.", project.getId()));
}
final AnalysisPackage analysisPackage = analysisPackages.get(0);
attrObj = this.createAttrObjectForAnalysisPackage(project, analysisPackage);
}

Expand Down