diff --git a/front/src/Mangs.html b/front/src/Mangs.html index cdabd1c..3f70723 100644 --- a/front/src/Mangs.html +++ b/front/src/Mangs.html @@ -13,8 +13,8 @@ <div class="container" id="root-div"> <nav class="navbar navbar-expand-lg navbar-light bg-light"> <a class="navbar-brand" href="index.html">Creator</a> - <a class="nav-link" href="Mangs.html">Manga</a> - <a class="nav-link" href="Readers.html">Reader</a> + <a class="navbar-brand" href="Mangs.html">Manga</a> + <a class="navbar-brand" href="Readers.html">Reader</a> </nav> <div class="content"> <h1>Manga</h1> diff --git a/front/src/Readers.html b/front/src/Readers.html index 0b8ce25..7657fe1 100644 --- a/front/src/Readers.html +++ b/front/src/Readers.html @@ -13,8 +13,8 @@ <div class="container" id="root-div"> <nav class="navbar navbar-expand-lg navbar-light bg-light"> <a class="navbar-brand" href="index.html">Creator</a> - <a class="nav-link" href="Mangs.html">Manga</a> - <a class="nav-link" href="Readers.html">Reader</a> + <a class="navbar-brand" href="Mangs.html">Manga</a> + <a class="navbar-brand" href="Readers.html">Reader</a> </nav> <div class="content"> <h1>Reader</h1> diff --git a/front/src/index.html b/front/src/index.html index c598b55..82b8133 100644 --- a/front/src/index.html +++ b/front/src/index.html @@ -13,8 +13,8 @@ <div class="container" id="root-div"> <nav class="navbar navbar-expand-lg navbar-light bg-light"> <a class="navbar-brand" href="index.html">Creator</a> - <a class="nav-link" href="Mangs.html">Manga</a> - <a class="nav-link" href="Readers.html">Reader</a> + <a class="navbar-brand" href="Mangs.html">Manga</a> + <a class="navbar-brand" href="Readers.html">Reader</a> </nav> <div class="content"> <h1>Creator</h1> diff --git a/front/src/scriptManga.js b/front/src/scriptManga.js index 125c774..76bf12f 100644 --- a/front/src/scriptManga.js +++ b/front/src/scriptManga.js @@ -15,18 +15,18 @@ window.addEventListener('DOMContentLoaded', function () { const response = await fetch(host + "/manga"); const data = await response.json(); console.log(data); - data.forEach(Manga => { + data.forEach(MangaDto => { let temp = "<select>"; - Manga.readers.forEach(String => { + MangaDto.readers.forEach(String => { temp += `<option>${String}</option>>` }) temp += "</select>" table.innerHTML += `<tr> - <th scope="row" id="componentId">${Manga.id}</th> - <td>${Manga.mangaName}</td> - <td>${Manga.chapterCount}</td> - <td>${Manga.creatorId}</td> + <th scope="row" id="componentId">${MangaDto.id}</th> + <td>${MangaDto.mangaName}</td> + <td>${MangaDto.chapterCount}</td> + <td>${MangaDto.creatorId}</td> <td>${temp}</td> </tr>`; }) diff --git a/front/src/scriptReader.js b/front/src/scriptReader.js index 845bf8c..ec3a8d2 100644 --- a/front/src/scriptReader.js +++ b/front/src/scriptReader.js @@ -73,7 +73,7 @@ window.addEventListener('DOMContentLoaded', function () { "Content-Type": "application/json", } }; - const response = await fetch(host + `/reader/` + readerIdInput.value, requestParams); + const response = await fetch(host + `/reader/${readerIdInput.value}`, requestParams); return await response.json(); } diff --git a/src/main/java/com/LabWork/app/MangaStore/model/Default/Reader.java b/src/main/java/com/LabWork/app/MangaStore/model/Default/Reader.java index 47d50db..bd216ab 100644 --- a/src/main/java/com/LabWork/app/MangaStore/model/Default/Reader.java +++ b/src/main/java/com/LabWork/app/MangaStore/model/Default/Reader.java @@ -46,7 +46,7 @@ public class Reader { public List<Manga> getMangas() { return mangas; } - public void setMangas(List<Manga> mangs) { this.mangas = mangs; } + public void setMangas(List<Manga> mangas) { this.mangas = mangas; } @Override public boolean equals(Object o) { diff --git a/src/main/java/com/LabWork/app/MangaStore/model/Dto/MangaDto.java b/src/main/java/com/LabWork/app/MangaStore/model/Dto/MangaDto.java index 14d7553..27369fc 100644 --- a/src/main/java/com/LabWork/app/MangaStore/model/Dto/MangaDto.java +++ b/src/main/java/com/LabWork/app/MangaStore/model/Dto/MangaDto.java @@ -44,6 +44,10 @@ public class MangaDto { return mangaName; } + public List<String> getReaders() { + return readers; + } + public Integer getChapterCount() { return chapterCount; } diff --git a/src/main/java/com/LabWork/app/MangaStore/service/CreatorService.java b/src/main/java/com/LabWork/app/MangaStore/service/CreatorService.java index a0837ea..239d836 100644 --- a/src/main/java/com/LabWork/app/MangaStore/service/CreatorService.java +++ b/src/main/java/com/LabWork/app/MangaStore/service/CreatorService.java @@ -63,7 +63,8 @@ public class CreatorService { List<Manga> listManga = currentCreator.getMangas();mangaService.findAllMangas(); for (Manga manga : listManga){ for (final Reader reader :mangaService.getReader(manga.getId())){ - readerRepository.delete(reader); + reader.getMangas().remove(manga); + readerRepository.save(reader); } } creatorRepository.delete(currentCreator); diff --git a/src/main/java/com/LabWork/app/MangaStore/service/ReaderService.java b/src/main/java/com/LabWork/app/MangaStore/service/ReaderService.java index 9e54222..519c46b 100644 --- a/src/main/java/com/LabWork/app/MangaStore/service/ReaderService.java +++ b/src/main/java/com/LabWork/app/MangaStore/service/ReaderService.java @@ -85,9 +85,7 @@ public class ReaderService { @Transactional public Reader deleteReader(Long id) { final Reader currentReader = findReader(id); -/* for (Manga manga : currentReader.getMangas()){ - manga.getReaders().remove(currentReader); - }*/ + currentReader.getMangas().clear(); readerRepository.delete(currentReader); return currentReader; } diff --git a/src/test/java/com/LabWork/app/ReMangaTest.java b/src/test/java/com/LabWork/app/ReMangaTest.java index f596515..b5684ae 100644 --- a/src/test/java/com/LabWork/app/ReMangaTest.java +++ b/src/test/java/com/LabWork/app/ReMangaTest.java @@ -26,6 +26,28 @@ public class ReMangaTest { private static final Logger log = LoggerFactory.getLogger(ReMangaTest.class); + @Test + void testReaderRemove2() { + readerService.deleteAllReaders(); + mangaService.deleteAllMangas(); + creatorService.deleteAllCreators(); + Creator c1 = creatorService.addCreator("first_C", "1"); + Manga m1 = mangaService.addManga(c1.getId(), 0, "Vagabond"); + Manga m2 = mangaService.addManga(c1.getId(), 10, "Berserk"); + Reader r1 = readerService.addReader("first_R", "1"); + + readerService.addManga(m1.getId(), r1.getId()); + readerService.addManga(m2.getId(), r1.getId()); + + Reader r11 = readerService.findReader(r1.getId()); + readerService.deleteReader(r11.getId()); + + log.info(readerService.findAllReaders().toString()); + mangaService.deleteAllMangas(); + readerService.deleteAllReaders(); + creatorService.deleteAllCreators(); + } + @Test void testAddToMangaReader2() { readerService.deleteAllReaders(); @@ -370,8 +392,8 @@ public class ReMangaTest { Manga m11 = mangaService.findManga(m1.getId()); log.info(readerService.findAllReaders().toString()); - //log.info(m11.getReaders().toString()); - //Assertions.assertEquals(0, m11.getReaders().size()); + log.info(mangaService.getReader(m11.getId()).toString()); + Assertions.assertEquals(0, mangaService.getReader(m11.getId()).size()); mangaService.deleteAllMangas(); readerService.deleteAllReaders(); creatorService.deleteAllCreators();