Pull request #346: RED-3818: Fixed migration problems

Merge in RED/persistence-service from RED-3818-5 to master

* commit 'ffced8a630d3597b8818ca9229c5848b63015523':
  RED-3818: Fixed migration problems
This commit is contained in:
Dominique Eiflaender 2022-04-08 12:38:09 +02:00
commit e3a1f1399f
2 changed files with 4 additions and 1 deletions

View File

@ -48,7 +48,7 @@ public class MigrateHighlights3 extends Migration {
dossiers.forEach(dossier -> { dossiers.forEach(dossier -> {
var files = fileStatusPersistenceService.getStatusesForDossier(dossier.getId()); var files = fileStatusPersistenceService.getStatusesForDossier(dossier.getId());
files.forEach(file -> { files.forEach(file -> {
if (file.getDeleted() != null) { if (file.getDeleted() == null) {
var fileBytes = fileManagementStorageService.getStoredObjectBytes(dossier.getId(), file.getId(), FileType.ORIGIN); var fileBytes = fileManagementStorageService.getStoredObjectBytes(dossier.getId(), file.getId(), FileType.ORIGIN);
var hasHighlights = pdfTronRedactionClient.extractHighlights(new DocumentRequest(dossier.getId(), file.getId(), fileBytes)); var hasHighlights = pdfTronRedactionClient.extractHighlights(new DocumentRequest(dossier.getId(), file.getId(), fileBytes));

View File

@ -8,8 +8,10 @@ import java.util.Set;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.iqser.red.service.peristence.v1.server.controller.DictionaryController; import com.iqser.red.service.peristence.v1.server.controller.DictionaryController;
import com.iqser.red.service.peristence.v1.server.migration.Migration; import com.iqser.red.service.peristence.v1.server.migration.Migration;
@ -51,6 +53,7 @@ public class TypeToEntityMigration5 extends Migration {
@Override @Override
@Transactional(timeout = 500000)
protected void migrate() { protected void migrate() {
var types = dictionaryPersistenceService.getAllTypes(); var types = dictionaryPersistenceService.getAllTypes();