Mongo Schema Refactor (#39)

* remove old 404

* Change db Schema

* change id fieldname

* remove realID references

Author: SentryMan

src/main/java/com/mangasite/domain/Manga.java

@@ -1,6 +1,5 @@
 package com.mangasite.domain;
 
-import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.List;
@@ -14,7 +13,6 @@
 /**
  * A class that represents a single manga <br>
  * <br>
- * a = alias <br>
  * c = categories(genre) <br>
  * h = hits <br>
  * i = infoSourceUrl <br>
@@ -29,30 +27,17 @@
 @Document(collection = "Manga")
 public class Manga {
 
-  @Id private BigInteger id;
-  private int realID;
-  private String a;
+  @Id private Integer id;
+  private String t;
   private List<String> c;
   private Integer h;
   private String im;
   private long ld;
   private Integer s;
-  private String t;
   private MangaInfo info;
 
   @PersistenceConstructor
-  public Manga(
-      int realID,
-      String a,
-      List<String> c,
-      Integer h,
-      String im,
-      long ld,
-      Integer s,
-      String t,
-      MangaInfo info) {
-    this.realID = realID;
-    this.a = a;
+  public Manga(List<String> c, Integer h, String im, long ld, Integer s, String t, MangaInfo info) {
     this.c = c;
     this.h = h;
     this.im = im;
@@ -63,7 +48,6 @@ public Manga(
   }
 
   public Manga(MangaChangeRequest request) {
-    a = request.alias();
     c = request.genre();
     h = request.hits();
     im = request.coverImageURL();
@@ -93,20 +77,12 @@ public Manga(MangaChangeRequest request) {
     info.setReleased(request.releaseDate());
   }
 
-  public int getRealID() {
-    return realID;
-  }
-
-  public void setRealID(int realID) {
-    this.realID = realID;
-  }
-
-  public String getA() {
-    return a;
+  public int getId() {
+    return id;
   }
 
-  public void setA(String a) {
-    this.a = a;
+  public void setId(int id) {
+    this.id = id;
   }
 
   public List<String> getC() {
@@ -165,16 +141,8 @@ public void setInfo(MangaInfo info) {
     this.info = info;
   }
 
-  public BigInteger getId() {
-    return id;
-  }
-
-  public void setId(BigInteger id) {
-    this.id = id;
-  }
-
   @Override
   public String toString() {
-    return "Manga [realID=" + realID + ", h=" + h + ", t=" + t + "]";
+    return "Manga [id=" + id + ", h=" + h + ", t=" + t + "]";
   }
 }

src/main/java/com/mangasite/domain/MangaChapters.java

@@ -1,6 +1,5 @@
 package com.mangasite.domain;
 
-import java.math.BigInteger;
 import java.util.List;
 
 import org.springframework.data.annotation.Id;
@@ -10,48 +9,36 @@
 @Document(collection = "Chapters")
 public class MangaChapters {
 
-  @Id private BigInteger id;
-  private Integer realID;
+  @Id private Integer id;
   private String mangaName;
   private List<Chapter> chapters;
 
   @PersistenceConstructor
-  public MangaChapters(int realID, String mangaName, List<Chapter> chapters) {
+  public MangaChapters(String mangaName, List<Chapter> chapters) {
 
-    this.realID = realID;
     this.mangaName = mangaName;
     this.chapters = chapters;
   }
 
-  public MangaChapters() {}
-
-  public MangaChapters(String mangaName, int realID, String index, String firstPageURL) {
+  public MangaChapters(int id, String mangaName, String index, String firstPageURL) {
 
+    this.id = id;
     final var chapter = new Chapter();
     chapter.setChapterIndex("Chapter " + index);
     final List<List<Object>> imageList = List.of(List.of(0, firstPageURL));
     chapter.setImages(imageList);
     this.mangaName = mangaName;
     chapters = List.of(chapter);
-    this.realID = realID;
   }
 
-  public BigInteger getId() {
+  public Integer getId() {
     return id;
   }
 
-  public void setId(BigInteger id) {
+  public void setId(Integer id) {
     this.id = id;
   }
 
-  public Integer getRealID() {
-    return realID;
-  }
-
-  public void setRealID(Integer realID) {
-    this.realID = realID;
-  }
-
   public String getMangaName() {
     return mangaName;
   }
@@ -67,4 +54,9 @@ public List<Chapter> getChapters() {
   public void setChapters(List<Chapter> chapters) {
     this.chapters = chapters;
   }
+
+  @Override
+  public String toString() {
+    return "MangaChapters [id=" + id + ", mangaName=" + mangaName + "]";
+  }
 }

src/main/java/com/mangasite/record/MangaChangeRequest.java

@@ -5,7 +5,6 @@
 /**
  * A class that represents a single manga <br>
  * <br>
- * a = alias <br>
  * c = categories(genre) <br>
  * h = hits <br>
  * i = infoSourceUrl <br>
@@ -18,7 +17,6 @@
  * @author Josiah
  */
 public record MangaChangeRequest(
-	      String alias,
 	      List<String> genre,
 	      Integer hits,
 	      String coverImageURL,

src/main/java/com/mangasite/repo/ChapterRepo.java

@@ -1,7 +1,5 @@
 package com.mangasite.repo;
 
-import java.math.BigInteger;
-
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
@@ -12,12 +10,10 @@
 import reactor.core.publisher.Mono;
 
 @Repository
-public interface ChapterRepo extends ReactiveMongoRepository<MangaChapters, BigInteger> {
+public interface ChapterRepo extends ReactiveMongoRepository<MangaChapters, Integer> {
 
   Mono<MangaChapters> getByMangaName(String Name);
 
-  Mono<MangaChapters> getByRealID(int realID);
-
-  @Query("{'realID' : ?0}")
-  Flux<MangaChapters> getDupsByRealID(int realID);
+  @Query("{'id' : ?0}")
+  Flux<MangaChapters> getDupsById(int id);
 }

src/main/java/com/mangasite/repo/MangaRepo.java

@@ -1,7 +1,5 @@
 package com.mangasite.repo;
 
-import java.math.BigInteger;
-
 import org.springframework.data.mongodb.repository.Aggregation;
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
@@ -13,16 +11,13 @@
 import reactor.core.publisher.Mono;
 
 @Repository
-public interface MangaRepo extends ReactiveMongoRepository<Manga, BigInteger> {
+public interface MangaRepo extends ReactiveMongoRepository<Manga, Integer> {
 
   @Aggregation("{$sample: {size: ?0}}")
   Flux<Manga> sample(int size);
 
-  Mono<Manga> getBya(String a);
-
-  @Query("{'realID' : ?0}")
-  Mono<Manga> getByRealID(int RealID);
-
   @Query("{'ld' : { $gte: ?0, $lte: ?1 } }")
   Flux<Manga> findByLd(long l, long m);
+
+  Mono<Manga> getByt(String t);
 }

src/main/java/com/mangasite/services/ChapterService.java

@@ -52,9 +52,9 @@ public ChapterService(ChapterRepo repo, MangaRepo mangaRepo) {
    *
    * @param ChapterID the numerical ID of the chapter
    */
-  public Mono<MangaChapters> getByID(int ChapterID) {
+  public Mono<MangaChapters> getByID(int chapterID) {
 
-    return repo.getByRealID(ChapterID);
+    return repo.findById(chapterID);
   }
 
   /** Returns a single Mono<Chapter> that contains the Chapter with the given name */
@@ -71,11 +71,11 @@ public Mono<MangaChapters> getOne(String name) {
   public Mono<Tuple2<Manga, MangaChapters>> addChapter(List<ChapterChangeRequest> requestList) {
 
     return mangaRepo
-        .getByRealID(requestList.get(0).mangaId())
+        .findById(requestList.get(0).mangaId())
         .zipWith(
-            repo.getByRealID(requestList.get(0).mangaId()),
+            repo.findById(requestList.get(0).mangaId()),
             (m, c) -> {
-              System.out.println("Updating " + m.getT() + "\nRealID: " + m.getRealID());
+              System.out.println("Updating " + m.getT() + "\nID: " + m.getId());
               System.out.println(
                   "Before change : " + m.getInfo().getChapters().size() + " chapters");
               requestList.forEach(processChapterRequests(m, c));
@@ -94,7 +94,7 @@ public Mono<Tuple2<Manga, MangaChapters>> addChapter(List<ChapterChangeRequest>
   public Flux<Tuple2<PageChangeRequest, String>> updatePageLink(
       int id, List<PageChangeRequest> requestList) {
 
-    return repo.getByRealID(id)
+    return repo.findById(id)
         // if Chapter Doesn't exist, create in table
         .flatMap(chapterExistsFunc(requestList))
         .doOnNext(c -> requestList.forEach(processPageRequests(c)))
@@ -202,7 +202,7 @@ private Function<MangaChapters, Mono<MangaChapters>> chapterExistsFunc(
                             r.mangaId(), r.chapterIndex(), r.chapterName(), 0, ""))
                 .toList();
 
-        return addChapter(chapterRequests).then(repo.getByRealID(c.getRealID()));
+        return addChapter(chapterRequests).then(repo.findById(c.getId()));
       }
       return just(c);
     };
@@ -222,9 +222,9 @@ public void deleteDuplicateChapters(Optional<Integer> idParam) {
 
     idParam.ifPresentOrElse(
         id -> {
-          repo.getByRealID(id)
+          repo.findById(id)
               .flatMap(this::removeChapterDups)
-              .mergeWith(mangaRepo.getByRealID(id).flatMap(this::removeMangaDups))
+              .mergeWith(mangaRepo.findById(id).flatMap(this::removeMangaDups))
               .distinct()
               .subscribe(System.out::println);
         },
@@ -264,12 +264,12 @@ public Mono<Tuple2<Manga, MangaChapters>> clearChapters(int id) {
 
     final var mangaClearMono =
         mangaRepo
-            .getByRealID(id)
+            .findById(id)
             .doOnNext(m -> m.getInfo().getChapters().removeIf(c -> !c.get(0).equals("1")))
             .flatMap(mangaRepo::save);
 
     final var chapterClearMono =
-        repo.getByRealID(id)
+        repo.findById(id)
             .doOnNext(
                 mc -> mc.getChapters().removeIf(c -> !c.getChapterIndex().equals("Chapter 1")))
             .doOnNext(mc -> mc.getChapters().get(0).setImages(List.of(List.of(0, ""))))