[Issue #260] Rename ReadingList.created -> .lastUpdated

comixed · Jun 21, 2020 · 84feedf · 84feedf
1 parent d5ed175
commit 84feedf
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/comixed-library/src/main/java/org/comixed/model/comic/Comic.java b/comixed-library/src/main/java/org/comixed/model/comic/Comic.java
@@ -273,7 +273,7 @@ public class Comic {
   private String summary;
 
   @Formula(
-      "(SELECT COUNT(*) FROM comics c WHERE c.series = series AND c.volume = volume AND C.issue_number = issue_number)")
+      "(SELECT COUNT(*) FROM comics c WHERE c.series = series AND c.volume = volume AND c.issue_number = issueNumber)")
   @JsonProperty("duplicateCount")
   @JsonView(View.ComicList.class)
   private Integer duplicateCount;

diff --git a/comixed-library/src/main/java/org/comixed/model/library/ReadingList.java b/comixed-library/src/main/java/org/comixed/model/library/ReadingList.java
@@ -66,11 +66,11 @@ public class ReadingList {
   @JsonView(View.ComicList.class)
   private ComiXedUser owner;
 
-  @Column(name = "created")
-  @JsonProperty("createdDate")
+  @Column(name = "last_updated")
+  @JsonProperty("lastUpdated")
   @JsonView(View.ComicList.class)
   @JsonFormat(shape = JsonFormat.Shape.NUMBER)
-  private Date created = new Date();
+  private Date lastUpdated = new Date();
 
   public Long getId() {
     return this.id;
@@ -103,4 +103,12 @@ public String getSummary() {
   public void setSummary(String summary) {
     this.summary = summary;
   }
+
+  public Date getLastUpdated() {
+    return lastUpdated;
+  }
+
+  public void setLastUpdated(Date lastUpdated) {
+    this.lastUpdated = lastUpdated;
+  }
 }
diff --git a/...c/main/resources/db/migrations/0.6.0/003_issue-260_rename_reading_list_created_column.xml b/...c/main/resources/db/migrations/0.6.0/003_issue-260_rename_reading_list_created_column.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+  <changeSet id="003_issue-260_rename_reading_list_created_column.xml"
+             author="mcpierce">
+
+    <renameColumn tableName="reading_lists"
+                  oldColumnName="created"
+                  newColumnName="last_updated"
+                  columnDataType="datetime"/>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/comixed-library/src/main/resources/db/migrations/0.6.0/changelog-0.6.0.xml b/comixed-library/src/main/resources/db/migrations/0.6.0/changelog-0.6.0.xml
@@ -8,5 +8,6 @@
 
   <include file="/db/migrations/0.6.0/001_issue-143_add_persisted_task_tables.xml"/>
   <include file="/db/migrations/0.6.0/002_issue-120_add_publisher_details_fields.xml"/>
+  <include file="/db/migrations/0.6.0/003_issue-260_rename_reading_list_created_column.xml"/>
 
 </databaseChangeLog>
diff --git a/comixed-library/src/test/resources/test-comics.xml b/comixed-library/src/test/resources/test-comics.xml
@@ -412,12 +412,12 @@
                  name="First Reading List"
                  owner_id="1000"
                  summary="This is my reading list"
-                 created="2019-01-01 13:00:00"/>
+                 last_updated="2019-01-01 13:00:00"/>
   <reading_lists id="1001"
                  name="Second Reading List"
                  owner_id="1000"
                  summary="This is my other reading list"
-                 created="2019-02-01 13:00:00"/>
+                 last_updated="2019-02-01 13:00:00"/>
   <reading_list_entries id="1000"
                         reading_list_id="1000"
                         comic_id="1000"

diff --git a/comixed-rest-api/src/test/java/org/comixed/controller/library/LibraryControllerTest.java b/comixed-rest-api/src/test/java/org/comixed/controller/library/LibraryControllerTest.java
@@ -214,7 +214,7 @@ public void testConsolidate() {
     List<Comic> response =
         libraryController.consolidateLibrary(
             new ConsolidateLibraryRequest(TEST_DELETE_PHYSICAL_FILES));
-
+k
     assertNotNull(response);
     assertSame(comicList, response);