Nikolay-Raspaev/IP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Вроде всё работает

Browse Source
This commit is contained in:
Николай 2023-03-16 09:11:30 +04:00
parent afea5a0b50
commit cfeaf090f8
6 changed files with 237 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/LabWork/app/student/model/Manga.java
View File

@ -22,7 +22,7 @@ public class Manga {
@JoinColumn(name="creator_fk") @JoinColumn(name="creator_fk")
private Creator creator; private Creator creator;
@ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE, CascadeType.PERSIST}) @ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "mangas_readers", @JoinTable(name = "mangas_readers",
joinColumns = @JoinColumn(name = "manga_fk"), joinColumns = @JoinColumn(name = "manga_fk"),
inverseJoinColumns = @JoinColumn(name = "reader_fk")) inverseJoinColumns = @JoinColumn(name = "reader_fk"))
@ -74,8 +74,8 @@ public class Manga {
public String toString() { public String toString() {
return "Manga{" + return "Manga{" +
"id=" + id + "id=" + id +
", firstName='" + mangaName + '\'' + ", mangaName='" + mangaName + '\'' +
", lastName='" + chapterCount + '\'' + ", chapterCount='" + chapterCount + '\'' +
'}'; '}';
} }
@Override @Override

2
src/main/java/com/LabWork/app/student/model/Reader.java
View File

@ -19,7 +19,7 @@ public class Reader {
private String hashedPassword; private String hashedPassword;
@ManyToMany(mappedBy = "readers", fetch = FetchType.EAGER) @ManyToMany(mappedBy = "readers", fetch = FetchType.EAGER, cascade = CascadeType.MERGE)
private List<Manga> mangas; private List<Manga> mangas;
public Reader() { public Reader() {

57
src/main/java/com/LabWork/app/student/service/CreatorService.java
View File

@ -6,6 +6,7 @@ import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityNotFoundException; import jakarta.persistence.EntityNotFoundException;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -17,6 +18,9 @@ public class CreatorService {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
@Autowired
MangaService mangaService;
@Transactional @Transactional
public Creator findCreator(Long id) { public Creator findCreator(Long id) {
final Creator creator = em.find(Creator.class, id); final Creator creator = em.find(Creator.class, id);
@ -32,22 +36,22 @@ public class CreatorService {
} }
@Transactional @Transactional
public Creator addCreator(String readername, String password) { public Creator addCreator(String creatorName, String password) {
if (!StringUtils.hasText(readername) || !StringUtils.hasText(password)) { if (!StringUtils.hasText(creatorName) || !StringUtils.hasText(password)) {
throw new IllegalArgumentException("Creator's readername or password is empty"); throw new IllegalArgumentException("Creator's creatorName or password is empty");
} }
final Creator creator = new Creator(readername, password); final Creator creator = new Creator(creatorName, password);
em.persist(creator); em.persist(creator);
return creator; return creator;
} }
@Transactional @Transactional
public Creator updateCreator(Long id, String readername, String password) { public Creator updateCreator(Long id, String creatorName, String password) {
if (!StringUtils.hasText(readername) || !StringUtils.hasText(password)) { if (!StringUtils.hasText(creatorName) || !StringUtils.hasText(password)) {
throw new IllegalArgumentException("Creator's readername or password is empty"); throw new IllegalArgumentException("Creator's creatorName or password is empty");
} }
final Creator customer = findCreator(id); final Creator customer = findCreator(id);
customer.setCreatorName(readername); customer.setCreatorName(creatorName);
customer.setHashedPassword(password); customer.setHashedPassword(password);
return em.merge(customer); return em.merge(customer);
} }
@ -60,18 +64,27 @@ public class CreatorService {
} }
@Transactional @Transactional
public void deleteAllCreators() { public void deleteAllCreators() { em.createQuery("delete from Creator").executeUpdate(); }
em.createQuery("delete from Creator").executeUpdate();
/* List<Creator> creatorList = em.createQuery("select s from Creator s", Creator.class).getResultList(); /*
List<Manga> mangaList = new ArrayList<>();*/ //бесполезная штука
/* for (Creator creator: creatorList){ @Transactional
mangaList.addAll(creator.getMangas()); public Creator addManga(Long creatorId, Manga manga) {
}*/ final Creator creator = findCreator(creatorId);
/* for (Manga manga: mangaList){ creator.getMangas().add(manga);
manga.getReaders().remove(manga); em.merge(creator);
}*/ return creator;
/* for (Creator creator: creatorList){ }*/
creator.getMangas().clear();
}*/ /* //бесполезная штука
} @Transactional
public Manga deleteManga(Long creatorId, Manga manga) {
Creator creator = findCreator(creatorId);
if (creator.getMangas().contains(manga)){
final Manga currentManga = em.createQuery("select m from Manga m where m.id = " + manga.getId(), Manga.class).getSingleResult();
em.remove(currentManga);
return currentManga;
}
return null;
}*/
} }

5
src/main/java/com/LabWork/app/student/service/MangaService.java
View File

@ -55,7 +55,8 @@ public class MangaService {
} }
final Manga manga = findManga(id); final Manga manga = findManga(id);
manga.setChapterCount(chapterCount); manga.setChapterCount(chapterCount);
return em.merge(manga); em.merge(manga);
return manga;
} }
@Transactional @Transactional
@ -66,7 +67,7 @@ public class MangaService {
} }
@Transactional @Transactional
public void deleteAllMangs() { public void deleteAllMangas() {
em.createQuery("delete from Manga").executeUpdate(); em.createQuery("delete from Manga").executeUpdate();
} }
} }

6
src/main/java/com/LabWork/app/student/service/ReaderService.java
View File

@ -45,7 +45,7 @@ public class ReaderService {
final Reader reader = findReader(readerId); final Reader reader = findReader(readerId);
reader.getMangas().add(manga); reader.getMangas().add(manga);
manga.getReaders().add(reader); manga.getReaders().add(reader);
em.merge(manga); em.merge(reader);
} }
@Transactional @Transactional
@ -67,6 +67,10 @@ public class ReaderService {
@Transactional @Transactional
public Reader deleteReader(Long id) { public Reader deleteReader(Long id) {
final Reader currentReader = findReader(id); final Reader currentReader = findReader(id);
for (Manga manga : currentReader.getMangas()){
manga.getReaders().remove(currentReader);
}
em.merge(currentReader);
em.remove(currentReader); em.remove(currentReader);
return currentReader; return currentReader;
} }

311
src/test/java/com/LabWork/app/ReMangaTest.java
View File

@ -27,92 +27,177 @@ public class ReMangaTest {
private static final Logger log = LoggerFactory.getLogger(ReMangaTest.class); private static final Logger log = LoggerFactory.getLogger(ReMangaTest.class);
@Test @Test
void testCreator() { void testCreatorAddAndFind() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Creator c2 = creatorService.addCreator("second", "2");
Assertions.assertEquals(c1.getCreatorName(), creatorService.findCreator(c1.getId()).getCreatorName());
Assertions.assertEquals(c1, creatorService.findCreator(c1.getId()));
Assertions.assertEquals(2, creatorService.findAllCreators().size());
}
/* @Test
void testCreatorAddManga() {
readerService.deleteAllReaders();
mangaService.deleteAllMangs();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
c1 = creatorService.findCreator(c1.getId());
creatorService.addManga(c1.getId(), m1);
creatorService.addManga(c1.getId(), m2);
log.info(c1.getMangas().toString());
Assertions.assertEquals(2, c1.getMangas().size());
log.info(m1.getCreator().toString());
log.info(c1.toString());
Assertions.assertEquals(c1.getCreatorName(), m1.getCreator().getCreatorName());
}*/
/* //бесполезня штука
@Test
void testCreatorDeleteManga() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangs();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1"); Creator c1 = creatorService.addCreator("first", "1");
Creator c2 = creatorService.addCreator("second", "2"); Creator c2 = creatorService.addCreator("second", "2");
Creator c3 = creatorService.addCreator("third", "3");
Assertions.assertEquals("first", c1.getCreatorName()); Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Assertions.assertEquals("second", c2.getCreatorName()); Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Assertions.assertEquals("third", c3.getCreatorName()); Manga m3 = mangaService.addManga(c2, 0, "Manga_3");
Assertions.assertEquals(c1, creatorService.findCreator(c1.getId())); creatorService.addManga(c1.getId(), m1);
creatorService.addManga(c1.getId(), m2);
creatorService.deleteCreator(c2.getId()); creatorService.deleteManga(c1.getId(), m2);
Assertions.assertEquals(2, creatorService.findAllCreators().size()); c1 = creatorService.findCreator(c1.getId());
Creator c4 = creatorService.updateCreator(c3.getId(), "fourth", "4"); log.info(c1.getMangas().toString());
log.info(mangaService.findAllMangas().toString());
Assertions.assertNotEquals(c3.getCreatorName(), c4.getCreatorName()); Assertions.assertEquals(1, c1.getMangas().size());
Assertions.assertNotEquals(c3.getHashedPassword(), c4.getHashedPassword()); }*/
@Test
void testCreatorUpdated() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Creator c2 = creatorService.updateCreator(c1.getId(),"second", "1");
Creator c3 = creatorService.findCreator(c1.getId());
Assertions.assertNotEquals(c1.getCreatorName(), c2.getCreatorName());
Assertions.assertEquals(c1.getHashedPassword(), c2.getHashedPassword());
Assertions.assertEquals(c3.getCreatorName(), c2.getCreatorName());
} }
@Test @Test
void testManga() { void testCreatorDelete() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1"); Creator c1 = creatorService.addCreator("first", "1");
Creator c2 = creatorService.addCreator("second", "2"); Creator c2 = creatorService.addCreator("second", "2");
creatorService.deleteCreator(c2.getId());
log.info(creatorService.findAllCreators().toString());
Assertions.assertEquals(1, creatorService.findAllCreators().size());
}
Manga m1 = mangaService.addManga(c1, 0, "vagabond"); @Test
Manga m2 = mangaService.addManga(c2, 10, "Berserk"); void testCreatorDeleteAll() {
Assertions.assertEquals(2, mangaService.findAllMangas().size());
Assertions.assertEquals(m1.getCreator(), c1);
Assertions.assertEquals(m2.getCreator(), c2);
Assertions.assertEquals(c1.getMangas().get(0), m1);
Assertions.assertEquals(c2.getMangas().get(0), m2);
Assertions.assertEquals(m1, mangaService.findManga(m1.getId()));
Assertions.assertEquals(m2, mangaService.findManga(m2.getId()));
Manga p3 = mangaService.addManga(c1, 10, "Solo Leveling");
Manga test_manga = mangaService.deleteManga(m1.getId());
log.info(test_manga.toString());
log.info(test_manga.getMangaName());
log.info(creatorService.findCreator(c1.getId()).getMangas().toString());
Assertions.assertEquals(1, creatorService.findCreator(c1.getId()).getMangas().size());
Manga p4 = mangaService.updateManga(m2.getId(), 100);
Assertions.assertNotEquals(m2.getChapterCount(), p4.getChapterCount());
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Creator c2 = creatorService.addCreator("second", "2");
creatorService.deleteAllCreators();
Assertions.assertEquals(0, creatorService.findAllCreators().size());
}
@Test
void testMangaAddAndFind() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
c1 = creatorService.findCreator(c1.getId());
m1 = mangaService.findManga(m1.getId());
log.info(c1.getMangas().toString());
Assertions.assertEquals(2, c1.getMangas().size());
Assertions.assertEquals(c1.getCreatorName(), m1.getCreator().getCreatorName());
}
@Test
void testMangaUpdated() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.updateManga(m1.getId(), 10);
m2 = mangaService.findManga(m2.getId());
c1 = creatorService.findCreator(c1.getId());
Assertions.assertEquals(m1.getMangaName(), m2.getMangaName());
Assertions.assertNotEquals(m1.getChapterCount(), m2.getChapterCount());
Assertions.assertEquals(c1.getMangas().get(0).getChapterCount(), m2.getChapterCount());
}
@Test
void testMangaDelete() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Reader r1 = readerService.addReader("reader1", "password1");
readerService.addManga(m1, r1.getId());
readerService.addManga(m2, r1.getId());
mangaService.deleteManga(m1.getId());
r1 = readerService.findReader(r1.getId());
log.info(mangaService.findAllMangas().toString());
log.info(readerService.findAllReaders().toString());
Assertions.assertEquals(1, mangaService.findAllMangas().size());
Assertions.assertEquals(1, r1.getMangas().size());
}
@Test
void testMangaDeleteAll() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
mangaService.deleteAllMangas();
Assertions.assertEquals(0, mangaService.findAllMangas().size());
} }
@Test @Test
void testAddToMangaReader() { void testAddToMangaReader() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first_C", "1"); Creator c1 = creatorService.addCreator("first_C", "1");
Manga m1 = mangaService.addManga(c1, 0, "vagabond"); Manga m1 = mangaService.addManga(c1, 0, "vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk"); Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Reader r1 = readerService.addReader("first_R", "1"); Reader r1 = readerService.addReader("first_R", "1");
log.info(r1.getMangas().size() + "");
readerService.addManga(m1, r1.getId()); readerService.addManga(m1, r1.getId());
log.info(r1.getMangas().size() + "");
readerService.addManga(m2, r1.getId()); readerService.addManga(m2, r1.getId());
log.info(r1.getMangas().toString()); log.info(r1.getMangas().toString());
Reader r2 = readerService.findReader(r1.getId()); Reader r2 = readerService.findReader(r1.getId());
log.info(r2.getMangas().toString()); log.info(r2.getMangas().toString());
Assertions.assertEquals(2, r2.getMangas().size()); Assertions.assertEquals(2, r2.getMangas().size());
@ -120,98 +205,82 @@ public class ReMangaTest {
} }
@Test @Test
void testRemoveToMangaReader() { void testReaderAddAndFind() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first_C", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Reader r1 = readerService.addReader("first_R", "1"); Reader r1 = readerService.addReader("first_R", "1");
log.info(r1.getMangas().size() + "");
readerService.addManga(m1, r1.getId());
log.info(r1.getMangas().size() + "");
readerService.addManga(m2, r1.getId());
log.info(r1.getMangas().toString());
Reader r11 = readerService.findReader(r1.getId());
log.info(r11.getMangas().toString());
Assertions.assertEquals(2, r11.getMangas().size());
Assertions.assertEquals(1, m1.getReaders().size());
Reader r2 = readerService.addReader("second_R", "2"); Reader r2 = readerService.addReader("second_R", "2");
readerService.addManga(m1, r2.getId()); r1 = readerService.findReader(r1.getId());
readerService.addManga(m2, r2.getId()); r2 = readerService.findReader(r2.getId());
Reader r22 = readerService.findReader(r2.getId()); Assertions.assertEquals(2, readerService.findAllReaders().size());
Assertions.assertEquals(2, r22.getMangas().size());
Assertions.assertEquals(2, m1.getReaders().size());
log.info(r22.getMangas().toString());
readerService.removeManga(m1, r22.getId());
log.info(r22.getMangas().toString());
Reader r23 = readerService.findReader(r22.getId());
log.info(r23.getMangas().toString());
Manga m11 = mangaService.findManga(m1.getId());
log.info(m11.getReaders().toString());
log.info(m2.getReaders().toString());
Assertions.assertEquals(1, r23.getMangas().size());
log.info(mangaService.findAllMangas().toString());
readerService.deleteAllReaders();
mangaService.deleteAllMangs();
creatorService.deleteAllCreators();
Reader r3 = readerService.findReader(r2.getId());
Assertions.assertEquals(r2.getReaderName(), r3.getReaderName());
} }
@Test @Test
void testReader() { void testRemoveToMangaReader() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first_C", "1"); Creator c1 = creatorService.addCreator("first_C", "1");
Creator c2 = creatorService.addCreator("second_C", "2"); Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Manga m1 = mangaService.addManga(c1, 0, "vagabond");
Manga m2 = mangaService.addManga(c2, 10, "Berserk");
Assertions.assertEquals(2, mangaService.findAllMangas().size());
Reader r1 = readerService.addReader("first_R", "1"); Reader r1 = readerService.addReader("first_R", "1");
Reader r2 = readerService.addReader("second_R", "2");
readerService.addManga(m1, r1.getId()); readerService.addManga(m1, r1.getId());
readerService.addManga(m2, r2.getId()); readerService.addManga(m2, r1.getId());
r1 = readerService.findReader(r1.getId());
log.info(r1.getMangas().get(0).getCreator().toString());
log.info(c1.toString());
r2 = readerService.findReader(r2.getId());
Assertions.assertEquals(c1, r1.getMangas().get(0).getCreator());
Assertions.assertEquals(c2, r2.getMangas().get(0).getCreator());
Reader r11 = readerService.findReader(r1.getId());
readerService.removeManga(m1, r11.getId());
Reader r12 = readerService.findReader(r11.getId());
Reader r3 = readerService.addReader("third_R", "3"); Manga m11 = mangaService.findManga(m1.getId());
Assertions.assertEquals(1, r12.getMangas().size());
log.info(m1.getReaders().toString()); log.info(mangaService.findAllMangas().toString());
log.info(c1.getId().toString()); }
Assertions.assertEquals(r1, m1.getReaders().get(0));
Reader r4 = readerService.updateReader(r3.getId(), "fourth_R", "3");
Assertions.assertNotEquals(r3.getReaderName(), r4.getReaderName());
Assertions.assertEquals(r3.getHashedPassword(), r4.getHashedPassword());
@Test
void testReaderRemove() {
readerService.deleteAllReaders(); readerService.deleteAllReaders();
mangaService.deleteAllMangs(); mangaService.deleteAllMangas();
creatorService.deleteAllCreators(); creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first_C", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Reader r1 = readerService.addReader("first_R", "1");
readerService.addManga(m1, r1.getId());
readerService.addManga(m2, r1.getId());
Reader r11 = readerService.findReader(r1.getId());
readerService.deleteReader(r11.getId());
Manga m11 = mangaService.findManga(m1.getId());
log.info(readerService.findAllReaders().toString());
log.info(m11.getReaders().toString());
Assertions.assertEquals(0, m11.getReaders().size());
}
@Test
void testReaderUpdate() {
readerService.deleteAllReaders();
mangaService.deleteAllMangas();
creatorService.deleteAllCreators();
Creator c1 = creatorService.addCreator("first_C", "1");
Manga m1 = mangaService.addManga(c1, 0, "Vagabond");
Manga m2 = mangaService.addManga(c1, 10, "Berserk");
Reader r1 = readerService.addReader("first_R", "1");
readerService.addManga(m1, r1.getId());
readerService.addManga(m2, r1.getId());
Reader r11 = readerService.updateReader(r1.getId(), "reader", "password");
r11 = readerService.findReader(r11.getId());
m1 = mangaService.findManga(m1.getId());
Assertions.assertNotEquals(r11.getReaderName(), r1.getReaderName());
Assertions.assertEquals(r11.getReaderName(), m1.getReaders().get(0).getReaderName());
} }
} }