Merge pull request #44 from neicnordic/feature/unencrypted-filesize

Retrieve decrypted filesize
neicnordic · Oct 26, 2020 · c40aeab · c40aeab
2 parents 0aac584 + 274e68f
commit c40aeab
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>no.uio.ifi</groupId>
     <artifactId>localega-doa</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <name>localega-doa</name>
     <description>LocalEGA Data Out API</description>
 

diff --git a/src/main/java/no/uio/ifi/localega/doa/dto/File.java b/src/main/java/no/uio/ifi/localega/doa/dto/File.java
@@ -19,6 +19,9 @@ public class File {
     private Long fileSize;
     private String unencryptedChecksum;
     private String unencryptedChecksumType;
+    private Long decryptedFileSize;
+    private String decryptedFileChecksum;
+    private String decryptedFileChecksumType;
     private String fileStatus;
 
 }
diff --git a/src/main/java/no/uio/ifi/localega/doa/model/LEGAFile.java b/src/main/java/no/uio/ifi/localega/doa/model/LEGAFile.java
@@ -43,6 +43,7 @@ public class LEGAFile {
     @Column(name = "display_file_name", insertable = false, updatable = false, length = 128)
     private String displayFileName;
 
+    // This is the size of the file that is in the archive, the encrypted part of the file
     @Column(name = "file_size", insertable = false, updatable = false)
     private Long fileSize;
 
@@ -62,6 +63,15 @@ public class LEGAFile {
     @Column(name = "unencrypted_checksum_type", insertable = false, updatable = false, length = 12)
     private String unencryptedChecksumType;
 
+    @Column(name = "decrypted_file_size", insertable = false, updatable = false)
+    private Long decryptedFileSize;
+
+    @Column(name = "decrypted_file_checksum", insertable = false, updatable = false)
+    private String decryptedFileChecksum;
+
+    @Column(name = "decrypted_file_checksum_type", insertable = false, updatable = false)
+    private String decryptedFileChecksumType;
+
     @Size(max = 13)
     @Column(name = "file_status", insertable = false, updatable = false, length = 13)
     private String fileStatus;

diff --git a/src/main/java/no/uio/ifi/localega/doa/services/MetadataService.java b/src/main/java/no/uio/ifi/localega/doa/services/MetadataService.java
@@ -58,6 +58,9 @@ public Collection<File> files(String datasetId) {
                     file.setDisplayFileName(f.getDisplayFileName());
                     file.setFileName(f.getFileName());
                     file.setFileSize(f.getFileSize());
+                    file.setDecryptedFileSize(f.getDecryptedFileSize());
+                    file.setDecryptedFileChecksum(f.getDecryptedFileChecksum());
+                    file.setDecryptedFileChecksumType(f.getDecryptedFileChecksumType());
                     file.setUnencryptedChecksum(f.getUnencryptedChecksum());
                     file.setUnencryptedChecksumType(f.getUnencryptedChecksumType());
                     file.setFileStatus(f.getFileStatus());