RED-9849: Counter for re-uploaded files
This commit is contained in:
parent
8314000c83
commit
64a8092c65
@ -201,6 +201,8 @@ public class FileEntity {
|
|||||||
@ElementCollection
|
@ElementCollection
|
||||||
private List<FileEntityComponentMappingVersionEntity> componentMappingVersions;
|
private List<FileEntityComponentMappingVersionEntity> componentMappingVersions;
|
||||||
|
|
||||||
|
@Column
|
||||||
|
private Integer overwriteFileCounter;
|
||||||
|
|
||||||
public OffsetDateTime getLastOCRTime() {
|
public OffsetDateTime getLastOCRTime() {
|
||||||
|
|
||||||
|
|||||||
@ -72,7 +72,6 @@ public class FileService {
|
|||||||
|
|
||||||
if (existingStatus != null) {
|
if (existingStatus != null) {
|
||||||
// the file is already uploaded, just reanalyse it.
|
// the file is already uploaded, just reanalyse it.
|
||||||
|
|
||||||
fileStatusService.overwriteFile(request.getDossierId(), request.getFileId(), request.getUploader(), request.getFilename(), keepManualRedactions, disableAutomaticAnalysis);
|
fileStatusService.overwriteFile(request.getDossierId(), request.getFileId(), request.getUploader(), request.getFilename(), keepManualRedactions, disableAutomaticAnalysis);
|
||||||
} else {
|
} else {
|
||||||
// the file is new, should create a new status for it.
|
// the file is new, should create a new status for it.
|
||||||
|
|||||||
@ -66,6 +66,7 @@ public class FileStatusPersistenceService {
|
|||||||
file.setLastUpdated(now);
|
file.setLastUpdated(now);
|
||||||
file.setFileManipulationDate(now);
|
file.setFileManipulationDate(now);
|
||||||
file.setProcessingErrorCounter(0);
|
file.setProcessingErrorCounter(0);
|
||||||
|
file.setOverwriteFileCounter(0);
|
||||||
file.setFileSize(size);
|
file.setFileSize(size);
|
||||||
file.setComponentMappingVersions(new ArrayList<>());
|
file.setComponentMappingVersions(new ArrayList<>());
|
||||||
file.setExcludedFromAutomaticAnalysis(disableAutomaticAnalysis);
|
file.setExcludedFromAutomaticAnalysis(disableAutomaticAnalysis);
|
||||||
|
|||||||
@ -219,6 +219,7 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
|
|||||||
+ "f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, "
|
+ "f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, "
|
||||||
+ "f.deleted = null, f.hardDeletedTime = null, f.hasHighlights = false, "
|
+ "f.deleted = null, f.hardDeletedTime = null, f.hasHighlights = false, "
|
||||||
+ "f.processingErrorCounter = 0, f.errorCause = null, f.errorQueue = null, f.errorService = null, "
|
+ "f.processingErrorCounter = 0, f.errorCause = null, f.errorQueue = null, f.errorService = null, "
|
||||||
|
+ "f.overwriteFileCounter = coalesce(f.overwriteFileCounter, 0) + 1, "
|
||||||
+ "f.errorTimestamp = null where f.id = :fileId")
|
+ "f.errorTimestamp = null where f.id = :fileId")
|
||||||
int overwriteFile(@Param("fileId") String fileId,
|
int overwriteFile(@Param("fileId") String fileId,
|
||||||
@Param("filename") String filename,
|
@Param("filename") String filename,
|
||||||
@ -238,6 +239,7 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
|
|||||||
+ "f.dictionaryVersion = 0, f.dossierDictionaryVersion = 0, f.rulesVersion = 0, f.hasImages = false, "
|
+ "f.dictionaryVersion = 0, f.dossierDictionaryVersion = 0, f.rulesVersion = 0, f.hasImages = false, "
|
||||||
+ "f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, "
|
+ "f.hasHints = false, f.hasRedactions = false, f.hasSuggestions = false, f.hasUpdates = false, "
|
||||||
+ "f.deleted = null, f.hardDeletedTime = null, f.hasHighlights = false, f.processingErrorCounter = 0, "
|
+ "f.deleted = null, f.hardDeletedTime = null, f.hasHighlights = false, f.processingErrorCounter = 0, "
|
||||||
|
+ "f.overwriteFileCounter = coalesce(f.overwriteFileCounter, 0) + 1, "
|
||||||
+ "f.ocrStartTime = null, f.ocrEndTime = null, f.numberOfPagesToOCR = null, f.numberOfOCRedPages = null, "
|
+ "f.ocrStartTime = null, f.ocrEndTime = null, f.numberOfPagesToOCR = null, f.numberOfOCRedPages = null, "
|
||||||
+ "f.errorCause = null, f.errorQueue = null, f.errorService = null, f.errorTimestamp = null "
|
+ "f.errorCause = null, f.errorQueue = null, f.errorService = null, f.errorTimestamp = null "
|
||||||
+ "where f.id = :fileId")
|
+ "where f.id = :fileId")
|
||||||
|
|||||||
@ -215,3 +215,5 @@ databaseChangeLog:
|
|||||||
file: db/changelog/tenant/129-add-component-table.yaml
|
file: db/changelog/tenant/129-add-component-table.yaml
|
||||||
- include:
|
- include:
|
||||||
file: db/changelog/tenant/131-changed-max-size-for-id-in-entity.yaml
|
file: db/changelog/tenant/131-changed-max-size-for-id-in-entity.yaml
|
||||||
|
- include:
|
||||||
|
file: db/changelog/tenant/141-add-overwrite-file-counter-to-file.yaml
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
databaseChangeLog:
|
||||||
|
- changeSet:
|
||||||
|
id: add-overwrite-file-counter-to-file
|
||||||
|
author: maverick
|
||||||
|
changes:
|
||||||
|
- addColumn:
|
||||||
|
columns:
|
||||||
|
- column:
|
||||||
|
name: overwrite_file_counter
|
||||||
|
type: INTEGER
|
||||||
|
defaultValue: '0'
|
||||||
|
tableName: file
|
||||||
Loading…
x
Reference in New Issue
Block a user