Fix saving settings

CHANGELOG.md

@@ -18,6 +18,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Prevent duplicate workflow runs by @dennisvang in #628
 - Clean up Dockerfile by @dennisvang in #626
 - Fix index API by @dennisvang in #637 (backward incompatible)
+- Fix saving settings by @MarekSuchanek in #657
 
 ## [1.17.2]
 

src/main/java/org/fairdatapoint/service/settings/SettingsMapper.java

@@ -31,7 +31,6 @@
 import org.fairdatapoint.config.properties.RepositoryConnectionProperties;
 import org.fairdatapoint.config.properties.RepositoryProperties;
 import org.fairdatapoint.entity.settings.*;
-import org.fairdatapoint.service.search.SearchMapper;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
@@ -48,8 +47,6 @@ public class SettingsMapper {
 
     private final RepositoryProperties repositoryProperties;
 
-    private final SearchMapper searchMapper;
-
     public SettingsDTO toDTO(Settings settings) {
         return SettingsDTO.builder()
                 .clientUrl(instanceProperties.getClientUrl())
@@ -142,12 +139,14 @@ private String redact(String secret) {
     }
 
     public Settings fromUpdateDTO(SettingsUpdateDTO dto, Settings settings) {
-        return settings.toBuilder()
+        return Settings.builder()
+                .uuid(settings.getUuid())
                 .appTitle(dto.getAppTitle())
                 .appSubtitle(dto.getAppSubtitle())
                 .pingEnabled(dto.getPing().isEnabled())
                 .pingEndpoints(dto.getPing().getEndpoints())
                 .autocompleteSearchNamespace(dto.getForms().getAutocomplete().getSearchNamespace())
+                .createdAt(settings.getCreatedAt())
                 .updatedAt(Instant.now())
                 .build();
     }

src/main/java/org/fairdatapoint/service/settings/SettingsService.java

@@ -77,9 +77,15 @@ public SettingsDTO getCurrentSettings() {
     public SettingsDTO updateSettings(SettingsUpdateDTO dto) {
         final Settings oldSettings = getOrDefaults();
 
+        // delete old Settings
+        final Optional<Settings> oldPersistedSettings = settingsRepository.findByUuid(KnownUUIDs.SETTINGS_UUID);
+        if (oldPersistedSettings.isPresent()) {
+            settingsRepository.delete(oldPersistedSettings.get());
+            entityManager.flush();
+        }
+
         // update Settings
-        final Settings newSettings = mapper.fromUpdateDTO(dto, oldSettings);
-        settingsRepository.saveAndFlush(newSettings);
+        final Settings newSettings = settingsRepository.saveAndFlush(mapper.fromUpdateDTO(dto, oldSettings));
 
         // update Metrics
         final List<SettingsMetric> metrics = updateMetrics(dto, newSettings);
@@ -98,8 +104,6 @@ public SettingsDTO updateSettings(SettingsUpdateDTO dto) {
     }
 
     private List<SettingsMetric> updateMetrics(SettingsUpdateDTO dto, Settings settings) {
-        // Delete old
-        metricRepository.deleteAll(settings.getMetrics());
         // Add new
         final List<SettingsMetric> metrics = new ArrayList<>();
         final List<SettingsMetricDTO> dtos = dto.getMetadataMetrics();
@@ -110,8 +114,6 @@ private List<SettingsMetric> updateMetrics(SettingsUpdateDTO dto, Settings setti
     }
 
     private List<SettingsAutocompleteSource> updateSources(SettingsUpdateDTO dto, Settings settings) {
-        // Delete old
-        metricRepository.deleteAll(settings.getMetrics());
         // Add new
         final List<SettingsAutocompleteSource> metrics = new ArrayList<>();
         final List<SettingsAutocompleteSourceDTO> dtos = dto.getForms().getAutocomplete().getSources();
@@ -122,9 +124,6 @@ private List<SettingsAutocompleteSource> updateSources(SettingsUpdateDTO dto, Se
     }
 
     private List<SettingsSearchFilter> updateSearchFilters(SettingsUpdateDTO dto, Settings settings) {
-        // Delete old
-        searchFilterRepository.deleteAll(settings.getSearchFilters());
-        entityManager.flush();
         // Add new
         final List<SettingsSearchFilter> searchFilters = new ArrayList<>();
         final List<SearchFilterDTO> dtos = dto.getSearch().getFilters();