MODLISTS-63:Include list_versioning in refresh data

folio-org · Dec 21, 2023 · 07d0347 · 07d0347
1 parent 02caa9d
commit 07d0347
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/folio/list/domain/ListEntity.java b/src/main/java/org/folio/list/domain/ListEntity.java
@@ -131,6 +131,7 @@ public void refreshStarted(User startedBy) {
       .refreshedBy(startedBy.id())
       .refreshedByUsername(startedBy.getFullName().orElse(startedBy.id().toString()))
       .refreshStartDate(OffsetDateTime.now())
+      .version(getVersion())
       .build();
   }
 

diff --git a/src/main/java/org/folio/list/domain/ListRefreshDetails.java b/src/main/java/org/folio/list/domain/ListRefreshDetails.java
@@ -56,6 +56,10 @@ public class ListRefreshDetails {
   @Column(name = "error_message")
   @Size(max = 1024)
   private String errorMessage;
+
+  @Column(name = "list_version")
+  private Integer listVersion;
+
   @Column(name = "metadata")
   @JdbcTypeCode(SqlTypes.JSON)
   private Map<String, String> metadata;

diff --git a/src/main/java/org/folio/list/mapper/ListRefreshMapper.java b/src/main/java/org/folio/list/mapper/ListRefreshMapper.java
@@ -18,6 +18,7 @@ public interface ListRefreshMapper {
   @Mapping(target = "recordsCount", source = "listRefreshDetails.recordsCount")
   @Mapping(target = "contentVersion", source = "listRefreshDetails.contentVersion")
   @Mapping(target = "error", expression = "java(convertToListAppError(listRefreshDetails))")
+  @Mapping(target = "version", source = "listRefreshDetails.version")
   ListRefreshDTO toListRefreshDTO(ListRefreshDetails listRefreshDetails);
 
   default ListAppError convertToListAppError(ListRefreshDetails listRefreshDetails) {

diff --git a/src/main/resources/db/changelog/changes/v1.1.0/changelog-v1.1.0.xml b/src/main/resources/db/changelog/changes/v1.1.0/changelog-v1.1.0.xml
@@ -7,4 +7,5 @@
   <include file="sql/create-list-versions-table.sql" relativeToChangelogFile="true"/>
   <include file="yml/update-list-versions-fkey.yaml" relativeToChangelogFile="true"/>
   <include file="yml/alter-list-details-updated-metadata-add-not-null-constraint.yaml" relativeToChangelogFile="true"/>
+  <include file="sql/update-list-refresh-details-table.sql" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/changes/v1.1.0/sql/update-list-refresh-details-table.sql b/src/main/resources/db/changelog/changes/v1.1.0/sql/update-list-refresh-details-table.sql
@@ -0,0 +1 @@
+ALTER TABLE IF EXISTS list_refresh_details ADD COLUMN list_version TYPE integer;
diff --git a/src/main/resources/swagger.api/schemas/ListRefreshDTO.json b/src/main/resources/swagger.api/schemas/ListRefreshDTO.json
@@ -48,6 +48,10 @@
     "error": {
       "description": "Error encountered during list refresh",
       "$ref": "ListAppError.json"
+    },
+    "listVersion": {
+      "description": "Contains the version of the list",
+      "type": "integer"
     }
   },
   "additionalProperties": false,

diff --git a/src/test/java/org/folio/list/mapper/ListRefreshMapperTest.java b/src/test/java/org/folio/list/mapper/ListRefreshMapperTest.java
@@ -30,6 +30,7 @@ void shouldMapEntityToDTO() {
       listRefreshDetails.getRefreshEndDate()));
     assertEquals(dto.getRefreshedBy(), listRefreshDetails.getRefreshedBy());
     assertEquals(dto.getRefreshedByUsername(), listRefreshDetails.getRefreshedByUsername());
+    assertEquals(dto.getVersion(), listRefreshDetails.getVersion());
     assertEquals(dto.getRecordsCount(), listRefreshDetails.getRecordsCount());
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE IF EXISTS list_refresh_details ADD COLUMN list_version TYPE integer;