Merge pull request #3128 from dzhw/jgolinowski/issue3108

New naming scheme for dataset report files
dzhw · Sep 27, 2022 · 907f36b · 907f36b
2 parents 848b0d4 + 77e7f5c
commit 907f36b
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/...va/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetAttachmentService.java b/...va/eu/dzhw/fdz/metadatamanagement/datasetmanagement/service/DataSetAttachmentService.java
@@ -210,9 +210,24 @@ public void attachDataSetReport(String dataSetId, String language, MultipartFile
       throws IOException {
     DataSet dataSet = dataSetRepository.findById(dataSetId).get();
     DataSetAttachmentMetadata metadata = null;
+    // create a second metadata object using the old naming scheme to allow deletion of files
+    // that have been attached before the naming scheme change
+    DataSetAttachmentMetadata oldFilenameMetadata = null;
     switch (language) {
       case "de":
         metadata = DataSetAttachmentMetadata.builder().dataSetId(dataSetId)
+            .dataAcquisitionProjectId(dataSet.getDataAcquisitionProjectId())
+            .dataSetNumber(dataSet.getNumber())
+            .fileName(dataSet.getDataAcquisitionProjectId() + "-ds"
+                + dataSet.getNumber() + "_DsReport_de.pdf")
+            .title("Datensatzreport:\n" + dataSet.getDescription().getDe())
+            .description(new I18nString(
+                "Codebook/Variablenreport/Datensatzreport von \"" + dataSet.getDescription().getDe()
+                    + "\"",
+                "Codebook/Variable Report/Dataset Report of \"" + dataSet.getDescription().getEn()
+                    + "\""))
+            .language("de").indexInDataSet(0).build();
+        oldFilenameMetadata = DataSetAttachmentMetadata.builder().dataSetId(dataSetId)
             .dataAcquisitionProjectId(dataSet.getDataAcquisitionProjectId())
             .dataSetNumber(dataSet.getNumber())
             .fileName("dsreport-" + dataSet.getDataAcquisitionProjectId() + "-ds"
@@ -227,6 +242,18 @@ public void attachDataSetReport(String dataSetId, String language, MultipartFile
         break;
       case "en":
         metadata = DataSetAttachmentMetadata.builder().dataSetId(dataSetId)
+            .dataAcquisitionProjectId(dataSet.getDataAcquisitionProjectId())
+            .dataSetNumber(dataSet.getNumber())
+            .fileName(dataSet.getDataAcquisitionProjectId() + "-ds"
+                + dataSet.getNumber() + "_DsReport_en.pdf")
+            .title("Dataset Report:\n" + dataSet.getDescription().getEn())
+            .description(new I18nString(
+                "Codebook/Variablenreport/Datensatzreport von \"" + dataSet.getDescription().getDe()
+                    + "\"",
+                "Codebook/Variable Report/Dataset Report of \"" + dataSet.getDescription().getEn()
+                    + "\""))
+            .language("en").indexInDataSet(0).build();
+        oldFilenameMetadata = DataSetAttachmentMetadata.builder().dataSetId(dataSetId)
             .dataAcquisitionProjectId(dataSet.getDataAcquisitionProjectId())
             .dataSetNumber(dataSet.getNumber())
             .fileName("dsreport-" + dataSet.getDataAcquisitionProjectId() + "-ds"
@@ -242,6 +269,7 @@ public void attachDataSetReport(String dataSetId, String language, MultipartFile
       default:
         throw new IllegalArgumentException("Unsupported language '" + language + "'!");
     }
+    deleteByDataSetIdAndFilename(dataSetId, oldFilenameMetadata.getFileName());
     deleteByDataSetIdAndFilename(dataSetId, metadata.getFileName());
     createDataSetAttachment(reportFile, metadata);
   }