#3330: fixed property name

dzhw · Apr 24, 2024 · 1985e4c · 1985e4c
1 parent 2d166c1
commit 1985e4c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/...rontend/src/app/dataacquisitionprojectmanagement/dataacquisitionproject.search.service.ts b/...rontend/src/app/dataacquisitionprojectmanagement/dataacquisitionproject.search.service.ts
@@ -179,7 +179,7 @@ export class DataacquisitionprojectSearchService {
         }
 
         if (verbundFdb) {
-            let dataTransmissionBase = {'isTransmittedViaVerbundFDB': verbundFdb === 'true' ? true : false};
+            let dataTransmissionBase = {'isTransmittedViaVerbundFdb': verbundFdb === 'true' ? true : false};
             let dataTransmissionFilter = this.createFilterFragment(QueryFragmentType.term, dataTransmissionBase);
             boolQuery.bool.filter?.push(dataTransmissionFilter);
         }

diff --git a/...hw/fdz/metadatamanagement/datapackagemanagement/service/DataPackageManagementService.java b/...hw/fdz/metadatamanagement/datapackagemanagement/service/DataPackageManagementService.java
@@ -261,9 +261,9 @@ public DataPackage save(DataPackage dataPackage) {
         project.setHasUserServiceRemarks(false);
       }
       if (dataPackage.getTransmissionViaVerbundFdb()) {
-        project.setIsTransmittedViaVerbundFDB(true);
+        project.setIsTransmittedViaVerbundFdb(true);
       } else {
-        project.setIsTransmittedViaVerbundFDB(false);
+        project.setIsTransmittedViaVerbundFdb(false);
       }
       if (dataPackage.getExternalDataPackage()) {
         project.setIsExternalDataPackage(true);

diff --git a/.../java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/DataAcquisitionProject.java b/.../java/eu/dzhw/fdz/metadatamanagement/projectmanagement/domain/DataAcquisitionProject.java
@@ -105,16 +105,16 @@ public class DataAcquisitionProject extends AbstractShadowableRdcDomainObject
    * for data packages.
    */
   @NotNull(message = "data-acquisition-project-management.error.data-acquisition-project"
-    + ".is-external.not-null")
+      + ".is-external.not-null")
   private Boolean isExternalDataPackage = false;
 
   /**
    * Flag indicating whether this project is transmitted via VerbundFDB. Can only be true
    * for data packages.
    */
   @NotNull(message = "data-acquisition-project-management.error.data-acquisition-project"
-    + ".is-tansmitted-via-verbundfdb.not-null")
-  private Boolean isTransmittedViaVerbundFDB = false;
+      + ".is-tansmitted-via-verbundfdb.not-null")
+  private Boolean isTransmittedViaVerbundFdb = false;
 
   /**
    * A valid {@link Release} object.

diff --git a/...dzhw/fdz/metadatamanagement/searchmanagement/service/ElasticsearchUpdateQueueService.java b/...dzhw/fdz/metadatamanagement/searchmanagement/service/ElasticsearchUpdateQueueService.java
@@ -332,6 +332,14 @@ private boolean addUpsertActionForDataAcquisitionProjects(ElasticsearchUpdateQue
           && !dataPackage.getRemarksUserService().equals("")) {
         project.setHasUserServiceRemarks(true);
       }
+      if (dataPackage != null
+          && dataPackage.getExternalDataPackage()) {
+        project.setIsExternalDataPackage(true);
+      }
+      if (dataPackage != null
+          && dataPackage.getTransmissionViaVerbundFdb()) {
+        project.setIsTransmittedViaVerbundFdb(true);
+      }
       DataAcquisitionProjectSearchDocument searchDocument = new DataAcquisitionProjectSearchDocument(
           project);
 

diff --git a/src/main/resources/elasticsearch/data_acquisition_projects/mapping.json b/src/main/resources/elasticsearch/data_acquisition_projects/mapping.json
@@ -73,7 +73,7 @@
       "type": "boolean",
       "copy_to": "all"
     },
-    "isTransmittedViaVerbundFDB": {
+    "isTransmittedViaVerbundFdb": {
       "type": "boolean",
       "copy_to": "all"
     },

diff --git a/...hw/fdz/metadatamanagement/common/unittesthelper/util/UnitTestCreateDomainObjectUtils.java b/...hw/fdz/metadatamanagement/common/unittesthelper/util/UnitTestCreateDomainObjectUtils.java
@@ -85,7 +85,7 @@ public static DataAcquisitionProject buildDataAcquisitionProject(String projectI
     DataAcquisitionProject project =
         DataAcquisitionProject.builder().id(projectId).hasBeenReleasedBefore(false)
             .configuration(configuration).assigneeGroup(AssigneeGroup.PUBLISHER).hasUserServiceRemarks(false)
-            .isExternalDataPackage(false).isTransmittedViaVerbundFDB(false).build();
+            .isExternalDataPackage(false).isTransmittedViaVerbundFdb(false).build();
 
     project.setMasterId(projectId);
     return project;