Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'document-data-markdown' into 'master'

Browse Source 
CLARI: document-data-markdown

See merge request redactmanager/persistence-service!609
This commit is contained in:
Maverick Studer 2024-07-19 10:35:37 +02:00
commit 20f760b37c
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
View File

@ -23,7 +23,7 @@ dependencies {
exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1")
exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
} }
api("com.knecon.fforesight:layoutparser-service-internal-api:0.145.0") { api("com.knecon.fforesight:layoutparser-service-internal-api:0.149.0") {
exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1")
exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1")
} }

5
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/layoutparsing/LayoutParsingRequestFactory.java
View File

@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
import com.iqser.red.service.persistence.management.v1.processor.settings.FileManagementServiceSettings;
import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils; import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest;
@ -23,6 +24,7 @@ public class LayoutParsingRequestFactory {
private final FileManagementStorageService fileManagementStorageService; private final FileManagementStorageService fileManagementStorageService;
private final LayoutParsingRequestIdentifierService layoutParsingRequestIdentifierService; private final LayoutParsingRequestIdentifierService layoutParsingRequestIdentifierService;
private final FileManagementServiceSettings fileManagementServiceSettings;
public LayoutParsingRequest build(String dossierId, String fileId, boolean priority) { public LayoutParsingRequest build(String dossierId, String fileId, boolean priority) {
@ -55,6 +57,9 @@ public class LayoutParsingRequestFactory {
.positionBlockFileStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION)) .positionBlockFileStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.DOCUMENT_POSITION))
.simplifiedTextStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT)) .simplifiedTextStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SIMPLIFIED_TEXT))
.viewerDocumentStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.VIEWER_DOCUMENT)) .viewerDocumentStorageId(StorageIdUtils.getStorageId(dossierId, fileId, FileType.VIEWER_DOCUMENT))
.documentMarkdownFileStorageId(fileManagementServiceSettings.isStoreMarkdown() ? Optional.of(StorageIdUtils.getStorageId(dossierId,
fileId,
FileType.MARKDOWN)) : Optional.empty())
.build(); .build();
} }

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/settings/FileManagementServiceSettings.java
View File

@ -48,4 +48,6 @@ public class FileManagementServiceSettings {
private Set<String> defaultFilterTypes = new HashSet<>(); private Set<String> defaultFilterTypes = new HashSet<>();
private Set<String> defaultFilterHintTypes = new HashSet<>(); private Set<String> defaultFilterHintTypes = new HashSet<>();
private boolean storeMarkdown;
} }

3
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/file/FileType.java
View File

@ -30,7 +30,8 @@ public enum FileType {
// only for export // only for export
@Deprecated(forRemoval = true) // still needed for migration to delete existing ones, can be removed as soon as migration is done @Deprecated(forRemoval = true) // still needed for migration to delete existing ones, can be removed as soon as migration is done
SECTION_GRID(".json"); SECTION_GRID(".json"),
MARKDOWN(".md");
@Getter @Getter
private final String extension; private final String extension;