From 8441417952d407728e27909d71defec682ec7029 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Mon, 14 Mar 2022 16:37:32 +0200
Subject: [PATCH] FromVersion patch for master

---
 .../repository/FalseRecommendationEntryRepository.java        | 2 +-
 .../peristence/v1/server/controller/DictionaryController.java | 4 ++--
 .../src/main/resources/db/changelog/db.changelog-master.yaml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FalseRecommendationEntryRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FalseRecommendationEntryRepository.java
index 86e002a94..28d8f3549 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FalseRecommendationEntryRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FalseRecommendationEntryRepository.java
@@ -26,6 +26,6 @@ public interface FalseRecommendationEntryRepository extends JpaRepository<Dictio
     void updateTypeIdAndIncrementVersionByOne(String typeId, String newTypeId);
 
 
-    List<DictionaryFalsePositiveEntryEntity> findByTypeIdAndVersionGreaterThan(String typeId, long version);
+    List<DictionaryFalseRecommendationEntryEntity> findByTypeIdAndVersionGreaterThan(String typeId, long version);
 
 }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
index 5748513d5..da3e0f75d 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
@@ -259,8 +259,8 @@ public class DictionaryController implements DictionaryResource {
     public List<DictionaryEntry> getEntriesForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
                                                    @RequestParam(value = FROM_VERSION_PARAM, required = false) Long fromVersion,
                                                    @RequestParam(value = "dictionaryEntryType", required = false, defaultValue = "ENTRY") DictionaryEntryType dictionaryEntryType) {
-
-        return convert(entryPersistenceService.getEntries(typeId, dictionaryEntryType, fromVersion), DictionaryEntry.class);
+        var entries = entryPersistenceService.getEntries(typeId, dictionaryEntryType, fromVersion);
+        return convert(entries, DictionaryEntry.class);
     }
 
     private Set<String> getInvalidEntries(Set<String> entries) {
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml
index 06cba527e..61b60d191 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -29,7 +29,7 @@ databaseChangeLog:
       file: db/changelog/12-dossier-visibility.changelog.yaml
   - include:
       file: db/changelog/13-file-manual-change-date.changelog.yaml
-- include:
+  - include:
       file: db/changelog/release-3.2.0/1-add-index-on-dictionary-entry.changelog.yaml
   - include:
       file: db/changelog/14-add-redaction-source-id.changelog.yaml