Last interface + Refactoring

Author: xome

src/main/java/de/mayer/backendspringpostgres/adventure/api/RecordByChapterController.java

@@ -21,7 +21,7 @@ public RecordByChapterController(RecordRepository recordRepository) {
     @Override
     public ResponseEntity<List<RecordInAChapter>> getRecordsByChapterName(String adventure, String chapterName) {
         try {
-            return ResponseEntity.ok(recordRepository.readByAdventureAndChapter(adventure, chapterName));
+            return ResponseEntity.ok(recordRepository.read(adventure, chapterName));
         } catch (ChapterNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
         }
@@ -30,7 +30,7 @@ public ResponseEntity<List<RecordInAChapter>> getRecordsByChapterName(String adv
     @Override
     public ResponseEntity<Void> deleteRecordsByChapterName(String adventure, String chapterName) {
         try {
-            recordRepository.deleteByAdventureAndChapter(adventure, chapterName);
+            recordRepository.delete(adventure, chapterName);
             return ResponseEntity.ok().build();
         } catch (ChapterNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).build();

src/main/java/de/mayer/backendspringpostgres/adventure/api/RecordByChapterNameAndIndexController.java

@@ -20,7 +20,7 @@ public RecordByChapterNameAndIndexController(RecordRepository recordRepository)
 
     @Override
     public ResponseEntity<RecordInAChapter> getRecordByNameAndIndex(String adventure, String chapterName, Integer index) {
-        var optionalRecord = recordRepository.readByAdventureAndChapterAndIndex(adventure, chapterName, index);
+        var optionalRecord = recordRepository.read(adventure, chapterName, index);
         return optionalRecord
                 .map(ResponseEntity::ok)
                 .orElseGet(() -> ResponseEntity.status(HttpStatus.NOT_FOUND).build());
@@ -59,6 +59,11 @@ public ResponseEntity<Void> patchRecordByChapterNameAndIndex(String adventure,
 
     @Override
     public ResponseEntity<Void> deleteRecordByChapterNameAndIndex(String adventure, String chapterName, Integer index) {
-        return RecordByChapterNameAndIndexHttpApi.super.deleteRecordByChapterNameAndIndex(adventure, chapterName, index);
+        try {
+            recordRepository.delete(adventure, chapterName, index);
+        } catch (ChapterNotFoundException | RecordNotFoundException e) {
+            return ResponseEntity.status((HttpStatus.NOT_FOUND)).build();
+        }
+        return ResponseEntity.ok().build();
     }
 }

src/main/java/de/mayer/backendspringpostgres/adventure/domainservice/RecordRepository.java

@@ -11,18 +11,29 @@
 
 public interface RecordRepository {
 
-    void create(Adventure adventure, Chapter chapter, RecordInAChapter record, Integer index) throws ChapterNotFoundException, ChapterToNotFoundException;
-    void createMultiple(Adventure adventure, Chapter chapter, List<RecordInAChapter> records) throws ChapterNotFoundException, ChapterToNotFoundException;
+    void create(Adventure adventure, Chapter chapter, RecordInAChapter record, Integer index)
+            throws ChapterNotFoundException, ChapterToNotFoundException;
 
-    LinkedList<RecordInAChapter> readByAdventureAndChapter(String adventureName, String chapterName) throws ChapterNotFoundException;
+    void create(String adventure, String chapterName, Integer index, RecordInAChapter record)
+            throws ChapterNotFoundException, ChapterToNotFoundException;
 
-    void deleteByAdventureAndChapter(String adventure, String chapter) throws ChapterNotFoundException;
+    void create(Adventure adventure, Chapter chapter, List<RecordInAChapter> records)
+            throws ChapterNotFoundException, ChapterToNotFoundException;
 
-    void deleteAllChapterLinksReferencing(String adventureName, String chapterName);
+    LinkedList<RecordInAChapter> read(String adventureName, String chapterName)
+            throws ChapterNotFoundException;
 
-    Optional<RecordInAChapter> readByAdventureAndChapterAndIndex(String adventure, String chapter, Integer index);
+    Optional<RecordInAChapter> read(String adventure, String chapter, Integer index);
 
-    void create(String adventure, String chapterName, Integer index, RecordInAChapter record) throws ChapterNotFoundException, ChapterToNotFoundException;
+    void update(String adventure, String chapterName, Integer index, RecordInAChapter record)
+            throws RecordNotFoundException, ChapterNotFoundException, ChapterToNotFoundException;
+
+    void delete(String adventure, String chapter)
+            throws ChapterNotFoundException;
+
+    void delete(String adventure, String chapter, Integer index)
+            throws ChapterNotFoundException, RecordNotFoundException;
+
+    void deleteChapterLinksReferencing(String adventureName, String chapterName);
 
-    void update(String adventure, String chapterName, Integer index, RecordInAChapter record) throws RecordNotFoundException, ChapterNotFoundException, ChapterToNotFoundException;
 }

src/main/java/de/mayer/backendspringpostgres/adventure/persistence/ChapterRepositoryWithJpa.java

@@ -90,8 +90,8 @@ public void update(String adventure, String nameOfChapterToBeUpdated, Chapter ch
                 null);
 
         if (chapterWithNewData.records() != null) {
-            recordRepository.deleteByAdventureAndChapter(adventure, nameOfChapterToBeUpdated);
-            recordRepository.createMultiple(
+            recordRepository.delete(adventure, nameOfChapterToBeUpdated);
+            recordRepository.create(
                     new Adventure(adventureJpa.getName(), null),
                     chapter,
                     chapterWithNewData.records());
@@ -110,8 +110,8 @@ public void delete(String adventureName, String chapterName) throws ChapterNotFo
         if (chapter.isEmpty())
             throw new ChapterNotFoundException();
 
-        recordRepository.deleteByAdventureAndChapter(adventureName, chapterName);
-        recordRepository.deleteAllChapterLinksReferencing(adventureName, chapterName);
+        recordRepository.delete(adventureName, chapterName);
+        recordRepository.deleteChapterLinksReferencing(adventureName, chapterName);
 
 
         chapterJpaRepository.delete(chapter.get());
@@ -142,12 +142,12 @@ public void create(String adventure, Chapter chapter) throws AdventureNotFoundEx
                 chapter.subheader(),
                 durationAsLong));
 
-        recordRepository.createMultiple(new Adventure(adventure, null), chapter, chapter.records());
+        recordRepository.create(new Adventure(adventure, null), chapter, chapter.records());
 
     }
     public Chapter mapJpaToDomain(String adventureName, ChapterJpa chapterJpa) throws ChapterNotFoundException {
 
-        var records = recordRepository.readByAdventureAndChapter(adventureName, chapterJpa.getName());
+        var records = recordRepository.read(adventureName, chapterJpa.getName());
 
         return new Chapter(chapterJpa.getName(),
                 chapterJpa.getSubheader(),