Removed comic file entries [#1053]

comixed · Oct 25, 2021 · d990a79 · d990a79
1 parent ae9b8f6
commit d990a79
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 176 deletions.
diff --git a/...ed-adaptors/src/main/java/org/comixedproject/adaptors/archive/AbstractArchiveAdaptor.java b/...ed-adaptors/src/main/java/org/comixedproject/adaptors/archive/AbstractArchiveAdaptor.java
@@ -21,7 +21,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
+import java.util.*;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

diff --git a/comixed-model/src/main/java/org/comixedproject/model/comicbooks/Comic.java b/comixed-model/src/main/java/org/comixedproject/model/comicbooks/Comic.java
@@ -94,12 +94,6 @@ public class Comic {
   @Setter
   private ComicFileDetails fileDetails;
 
-  @OneToMany(mappedBy = "comic", cascade = CascadeType.ALL, orphanRemoval = true)
-  @OrderColumn(name = "FileNumber")
-  @JsonView({View.ComicDetailsView.class, View.AuditLogEntryDetail.class})
-  @Getter
-  private Set<ComicFileEntry> fileEntries = new HashSet<>();
-
   @Column(name = "ComicState", nullable = false, updatable = true)
   @Enumerated(EnumType.STRING)
   @JsonProperty("comicState")

diff --git a/comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicFileEntry.java b/comixed-model/src/main/java/org/comixedproject/model/comicbooks/ComicFileEntry.java
diff --git a/comixed-model/src/main/resources/db/migrations/0.11.0/008_1053_remove_comic_file_entries.xml b/comixed-model/src/main/resources/db/migrations/0.11.0/008_1053_remove_comic_file_entries.xml
@@ -0,0 +1,12 @@
+<?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="008_1053_remove_comic_file_entries.xml"
+             author="mcpierce">
+
+    <dropTable tableName="ComicFileEntries"/>
+
+  </changeSet>
+</databaseChangeLog>
diff --git a/comixed-model/src/main/resources/db/migrations/0.11.0/changelog-0.11.0.xml b/comixed-model/src/main/resources/db/migrations/0.11.0/changelog-0.11.0.xml
@@ -13,5 +13,6 @@
   <include file="/db/migrations/0.11.0/005_866_expand_comic_notes_column.xml"/>
   <include file="/db/migrations/0.11.0/006_801_rename_scraping_rules_table.xml"/>
   <include file="/db/migrations/0.11.0/007_1046_make_comicvineid_a_number.xml"/>
+  <include file="/db/migrations/0.11.0/008_1053_remove_comic_file_entries.xml"/>
 
 </databaseChangeLog>
diff --git a/...e/src/main/java/org/comixedproject/state/comicbooks/actions/ComicFileRecreatedAction.java b/...e/src/main/java/org/comixedproject/state/comicbooks/actions/ComicFileRecreatedAction.java
@@ -42,8 +42,6 @@ public void execute(final StateContext<ComicState, ComicEvent> context) {
     // prepare the comic for reprocessing
     log.trace("Clearing file details");
     comic.setFileDetails(null);
-    log.trace("Clearing file entries");
-    comic.getFileEntries().clear();
     log.trace("Clearing pages");
     comic.getPages().clear();
     log.trace("Turning off file contents loaded flag");

diff --git a/...ain/java/org/comixedproject/state/comicbooks/actions/PrepareComicForProcessingAction.java b/...ain/java/org/comixedproject/state/comicbooks/actions/PrepareComicForProcessingAction.java
@@ -39,8 +39,6 @@ public void execute(final StateContext<ComicState, ComicEvent> context) {
     final Comic comic = this.fetchComic(context);
     log.trace("Clearing file details");
     comic.setFileDetails(null);
-    log.trace("Clearing file entries");
-    comic.getFileEntries().clear();
     log.trace("Clearing pages");
     comic.getPages().clear();
     log.trace("Turning off file contents loaded flag");

diff --git a/...c/test/java/org/comixedproject/state/comicbooks/actions/ComicFileRecreatedActionTest.java b/...c/test/java/org/comixedproject/state/comicbooks/actions/ComicFileRecreatedActionTest.java
@@ -19,9 +19,7 @@
 package org.comixedproject.state.comicbooks.actions;
 
 import java.util.List;
-import java.util.Set;
 import org.comixedproject.model.comicbooks.Comic;
-import org.comixedproject.model.comicbooks.ComicFileEntry;
 import org.comixedproject.model.comicbooks.ComicState;
 import org.comixedproject.model.comicpages.Page;
 import org.comixedproject.state.comicbooks.ComicEvent;
@@ -41,7 +39,6 @@ public class ComicFileRecreatedActionTest {
   @Mock private StateContext<ComicState, ComicEvent> context;
   @Mock private MessageHeaders messageHeaders;
   @Mock private Comic comic;
-  @Mock private Set<ComicFileEntry> fileEntrySet;
   @Mock private List<Page> pageList;
 
   @Before
@@ -53,14 +50,12 @@ public void setUp() {
 
   @Test
   public void testExecute() {
-    Mockito.when(comic.getFileEntries()).thenReturn(fileEntrySet);
     Mockito.when(comic.getPages()).thenReturn(pageList);
 
     action.execute(context);
 
     Mockito.verify(comic, Mockito.times(1)).setRecreating(false);
     Mockito.verify(comic, Mockito.times(1)).setFileDetails(null);
-    Mockito.verify(fileEntrySet, Mockito.times(1)).clear();
     Mockito.verify(pageList, Mockito.times(1)).clear();
     Mockito.verify(comic, Mockito.times(1)).setFileContentsLoaded(false);
     Mockito.verify(comic, Mockito.times(1)).setBlockedPagesMarked(false);

diff --git a/...java/org/comixedproject/state/comicbooks/actions/PrepareComicForProcessingActionTest.java b/...java/org/comixedproject/state/comicbooks/actions/PrepareComicForProcessingActionTest.java
@@ -19,9 +19,7 @@
 package org.comixedproject.state.comicbooks.actions;
 
 import java.util.List;
-import java.util.Set;
 import org.comixedproject.model.comicbooks.Comic;
-import org.comixedproject.model.comicbooks.ComicFileEntry;
 import org.comixedproject.model.comicbooks.ComicState;
 import org.comixedproject.model.comicpages.Page;
 import org.comixedproject.state.comicbooks.ComicEvent;
@@ -41,7 +39,6 @@ public class PrepareComicForProcessingActionTest {
   @Mock private StateContext<ComicState, ComicEvent> context;
   @Mock private MessageHeaders messageHeaders;
   @Mock private Comic comic;
-  @Mock private Set<ComicFileEntry> fileEntrySet;
   @Mock private List<Page> pageList;
 
   @Before
@@ -53,13 +50,11 @@ public void setUp() {
 
   @Test
   public void testEvaluate() {
-    Mockito.when(comic.getFileEntries()).thenReturn(fileEntrySet);
     Mockito.when(comic.getPages()).thenReturn(pageList);
 
     action.execute(context);
 
     Mockito.verify(comic, Mockito.times(1)).setFileDetails(null);
-    Mockito.verify(fileEntrySet, Mockito.times(1)).clear();
     Mockito.verify(pageList, Mockito.times(1)).clear();
     Mockito.verify(comic, Mockito.times(1)).setFileContentsLoaded(false);
     Mockito.verify(comic, Mockito.times(1)).setBlockedPagesMarked(false);

diff --git a/...rc/test/java/org/comixedproject/state/comicbooks/actions/RecreateComicFileActionTest.java b/...rc/test/java/org/comixedproject/state/comicbooks/actions/RecreateComicFileActionTest.java
@@ -18,11 +18,8 @@
 
 package org.comixedproject.state.comicbooks.actions;
 
-import java.util.List;
 import org.comixedproject.model.comicbooks.Comic;
-import org.comixedproject.model.comicbooks.ComicFileEntry;
 import org.comixedproject.model.comicbooks.ComicState;
-import org.comixedproject.model.comicpages.Page;
 import org.comixedproject.state.comicbooks.ComicEvent;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,8 +37,6 @@ public class RecreateComicFileActionTest {
   @Mock private StateContext<ComicState, ComicEvent> context;
   @Mock private MessageHeaders messageHeaders;
   @Mock private Comic comic;
-  @Mock private List<ComicFileEntry> fileEntryList;
-  @Mock private List<Page> pageList;
 
   @Before
   public void setUp() {

diff --git a/comixed-webui/src/app/comic-books/comic-books.fixtures.ts b/comixed-webui/src/app/comic-books/comic-books.fixtures.ts
@@ -100,8 +100,7 @@ export const COMIC_1: Comic = {
   lastModifiedOn: 0,
   nextIssueId: null,
   previousIssueId: null,
-  fileDetails: FILE_DETAILS_1,
-  fileEntries: []
+  fileDetails: FILE_DETAILS_1
 };
 
 export const COMIC_2: Comic = {
@@ -138,8 +137,7 @@ export const COMIC_2: Comic = {
   lastModifiedOn: 0,
   nextIssueId: null,
   previousIssueId: null,
-  fileDetails: FILE_DETAILS_1,
-  fileEntries: []
+  fileDetails: FILE_DETAILS_1
 };
 
 export const COMIC_3: Comic = {
@@ -176,8 +174,7 @@ export const COMIC_3: Comic = {
   lastModifiedOn: 0,
   nextIssueId: null,
   previousIssueId: null,
-  fileDetails: FILE_DETAILS_1,
-  fileEntries: []
+  fileDetails: FILE_DETAILS_1
 };
 
 export const COMIC_4: Comic = {
@@ -214,8 +211,7 @@ export const COMIC_4: Comic = {
   lastModifiedOn: 0,
   nextIssueId: null,
   previousIssueId: null,
-  fileDetails: FILE_DETAILS_1,
-  fileEntries: []
+  fileDetails: FILE_DETAILS_1
 };
 
 export const COMIC_5: Comic = {
@@ -252,8 +248,7 @@ export const COMIC_5: Comic = {
   lastModifiedOn: 0,
   nextIssueId: null,
   previousIssueId: null,
-  fileDetails: FILE_DETAILS_1,
-  fileEntries: []
+  fileDetails: FILE_DETAILS_1
 };
 
 export const SCRAPING_VOLUME_1: ScrapingVolume = {

diff --git a/comixed-webui/src/app/comic-books/components/comic-overview/comic-overview.component.html b/comixed-webui/src/app/comic-books/components/comic-overview/comic-overview.component.html
@@ -111,22 +111,6 @@
     </span>
   </mat-grid-tile>
 
-  <mat-grid-tile class="cx-accent-light-background" colspan="1" rowspan="1">
-    <span class="cx-align-text-right">
-      {{ "comic-book.label.file-entries" | translate }}
-    </span>
-  </mat-grid-tile>
-  <mat-grid-tile colspan="3" rowspan="1">
-    <span
-      class="cx-width-100 cx-text-nowrap cx-align-text-left cx-padding-left-5"
-    >
-      {{
-        "comic-book.text.file-entries"
-          | translate: { count: comic.fileEntries.length }
-      }}
-    </span>
-  </mat-grid-tile>
-
   <mat-grid-tile class="cx-accent-light-background" colspan="1" rowspan="1">
     <span class="cx-align-text-right">
       {{ "comic-book.label.added-date" | translate }}

diff --git a/comixed-webui/src/app/comic-books/models/comic-file-entry.ts b/comixed-webui/src/app/comic-books/models/comic-file-entry.ts
diff --git a/comixed-webui/src/app/comic-books/models/comic.ts b/comixed-webui/src/app/comic-books/models/comic.ts
@@ -17,7 +17,6 @@
  */
 
 import { FileDetails } from '@app/comic-books/models/file-details';
-import { ComicFileEntry } from '@app/comic-books/models/comic-file-entry';
 import { ComicCredit } from '@app/comic-books/models/comic-credit';
 import { Page } from '@app/comic-books/models/page';
 import { ComicBookState } from '@app/comic-books/models/comic-book-state';
@@ -31,7 +30,6 @@ export interface Comic {
   comicState: ComicBookState;
   missing: boolean;
   fileDetails: FileDetails;
-  fileEntries: ComicFileEntry[];
   addedDate: number;
   deletedDate: number;
   lastModifiedOn: number;

diff --git a/comixed-webui/src/assets/i18n/de/comic-books.json b/comixed-webui/src/assets/i18n/de/comic-books.json
@@ -34,7 +34,6 @@
       "credits": "Creative Team ({count})",
       "description": "Issue Description",
       "file-details": "Comic File Details",
-      "file-entries": "File Entries",
       "filename": "Filename",
       "filesize": "Filesize",
       "imprint": "Imprint",
@@ -84,7 +83,6 @@
     "text": {
       "comic-changed": "Write metadata to the comic file.",
       "comicvine-issue-link": "ComicVine Details Page",
-      "file-entries": "There {count, plural, =1{is one file} other{are # files}} in this archive.",
       "filesize": "{size, plural, =1{One byte} other{# bytes}}",
       "no-matching-volumes": "No matching volumes were found...",
       "state-ADDED": "Unchanged",

diff --git a/comixed-webui/src/assets/i18n/en/comic-books.json b/comixed-webui/src/assets/i18n/en/comic-books.json
@@ -34,7 +34,6 @@
       "credits": "Creative Team ({count})",
       "description": "Issue Description",
       "file-details": "Comic File Details",
-      "file-entries": "File Entries",
       "filename": "Filename",
       "filesize": "Filesize",
       "imprint": "Imprint",
@@ -82,7 +81,6 @@
     "text": {
       "comic-changed": "Write metadata to the comic file.",
       "comicvine-issue-link": "ComicVine Details Page",
-      "file-entries": "There {count, plural, =1{is one file} other{are # files}} in this archive.",
       "filesize": "{size, plural, =1{One byte} other{# bytes}}",
       "no-matching-volumes": "No matching volumes were found...",
       "state-ADDED": "Unchanged",

diff --git a/comixed-webui/src/assets/i18n/es/comic-books.json b/comixed-webui/src/assets/i18n/es/comic-books.json
@@ -34,7 +34,6 @@
       "credits": "Equipo creativo ({count})",
       "description": "Descripción de la edición",
       "file-details": "Detalles del archivo cómico",
-      "file-entries": "Entradas de archivos",
       "filename": "Nombre de archivo",
       "filesize": "Tamaño de archivo",
       "imprint": "Marca",
@@ -82,7 +81,6 @@
     "text": {
       "comic-changed": "Write metadata to the comic file.",
       "comicvine-issue-link": "ComicVine Details Page",
-      "file-entries": "Hay {count, plural, =1{is one file} other{are # files}} en este archivo.",
       "filesize": "{size, plural, =1{One byte} other{# bytes}}",
       "no-matching-volumes": "No matching volumes were found...",
       "state-ADDED": "Igual",