Skip to content
Snippets Groups Projects

fix(notification): prevent error when request creation of an org unit

Merged Florent Poittevin requested to merge fpo/prevent_error_when_create_notification into master
Files
4
@@ -48,6 +48,7 @@ import ch.dlcm.DLCMMetadataVersion;
import ch.dlcm.model.Access;
import ch.dlcm.model.DataCategory;
import ch.dlcm.model.DataTag;
import ch.dlcm.model.DataUsePolicy;
import ch.dlcm.model.EmbargoInfo;
import ch.dlcm.model.PackageStatus;
import ch.dlcm.model.dto.FileUploadDto;
@@ -78,6 +79,9 @@ public abstract class AbstractPreingestDemoIT extends AbstractPreingestIT {
protected final String BODMER_DEPOSIT_FOLDER = "deposit/bodmer";
protected final String DLCM_DEPOSIT_FOLDER = "deposit/dlcm";
protected final String BODMER_FILES = "Faust*1072035571.zip";
protected final String YARETA_SMALL_FILES = "Yareta-small.zip";
protected final String DUA_FOLDER = "deposit/dua";
protected final String UPDATED_BY = " => ";
protected ArchiveCheckITService archiveCheckITService;
@@ -153,10 +157,21 @@ public abstract class AbstractPreingestDemoIT extends AbstractPreingestIT {
this.depositITService.uploadDataFileToDeposit(deposit.getResId(), file, fileInfo);
}
protected void addDataUseAgreement(Deposit deposit, Resource file) {
FileUploadDto<DepositDataFile> fileInfo = new FileUploadDto<>();
fileInfo.setDataCategory(DataCategory.Internal);
fileInfo.setDataType(DataCategory.ArchiveDataUseAgreement);
this.depositITService.uploadDataFileToDeposit(deposit.getResId(), file, fileInfo);
}
protected boolean checkIfThumbnailSupported(DLCMMetadataVersion version) {
return version.getVersionNumber() >= DLCMMetadataVersion.V2_1.getVersionNumber();
}
protected boolean checkIfDataUsePolicySupported(DLCMMetadataVersion version) {
return version.getVersionNumber() >= DLCMMetadataVersion.V3_1.getVersionNumber();
}
protected boolean checkCompatibleVersion(DLCMMetadataVersion version1, DLCMMetadataVersion version2) {
return version1.getVersionNumber() <= version2.getVersionNumber();
}
@@ -526,7 +541,10 @@ public abstract class AbstractPreingestDemoIT extends AbstractPreingestIT {
log.info("Creating new collection {} for {}", depositName, version.getVersion());
Access collectionAccessLevel = Access.PUBLIC;
DataTag collectionDataTag = DataTag.BLUE;
Deposit deposit = this.createDeposit(orgUnit, version, collectionName, collectionName, submissionPolicy, preservationPolicy);
Deposit deposit = this.createDeposit(
orgUnit, version, collectionName, collectionName,
Access.PUBLIC, DataTag.BLUE, DataUsePolicy.LICENSE,
submissionPolicy, preservationPolicy);
// Add contributors
this.addContributors(deposit);
for (final ArchivalInfoPackage aip : this.aipClientService.searchByProperties(Map.of("info.organizationalUnitId", orgUnit.getResId(),
@@ -587,6 +605,9 @@ public abstract class AbstractPreingestDemoIT extends AbstractPreingestIT {
DLCMMetadataVersion version,
String title,
String description,
Access accessLevel,
DataTag dataTag,
DataUsePolicy dataUsePolicy,
SubmissionPolicy submissionPolicy,
PreservationPolicy preservationPolicy) {
String label = this.getVersionLabel(version);
@@ -596,6 +617,9 @@ public abstract class AbstractPreingestDemoIT extends AbstractPreingestIT {
final Deposit deposit = new Deposit();
deposit.init();
deposit.setMetadataVersion(version);
deposit.setAccess(accessLevel);
deposit.setDataSensitivity(dataTag);
deposit.setDataUsePolicy(dataUsePolicy);
deposit.setTitle(title + label);
deposit.setDescription(description + label);
deposit.setStatus(DepositStatus.IN_PROGRESS);
Loading