3 лаба название исправил
This commit is contained in:
parent
6bee6f84ee
commit
b620bbf62d
@ -2,7 +2,6 @@ package ru.ulstu.is.sbapp.Favourite.service;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import ru.ulstu.is.sbapp.FavouriteTiding.FavouriteTiding;
|
||||
import ru.ulstu.is.sbapp.FavouriteTiding.FavouriteTidingId;
|
||||
|
||||
@ -10,7 +9,6 @@ import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import ru.ulstu.is.sbapp.Favourite.model.Favourite;
|
||||
import ru.ulstu.is.sbapp.client.model.Client;
|
||||
import ru.ulstu.is.sbapp.news.model.Tiding;
|
||||
|
||||
import java.util.Date;
|
||||
@ -72,7 +70,7 @@ public class FavouriteService {
|
||||
em.createQuery("delete from Favourite").executeUpdate();
|
||||
}
|
||||
@Transactional
|
||||
public void addTechniqueInPurchase(Long id, Tiding tiding) {
|
||||
public void addTidingInFavourite(Long id, Tiding tiding) {
|
||||
final Favourite favourite = findFavourite(id);
|
||||
FavouriteTiding favouriteTiding = em.find(FavouriteTiding.class, new FavouriteTidingId(favourite.getId(), tiding.getId()));
|
||||
if (favouriteTiding == null) {
|
||||
@ -82,7 +80,7 @@ public class FavouriteService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void removeTechniqueInPurchase(Long id, Tiding tiding) {
|
||||
public void removeTidingInFavourite(Long id, Tiding tiding) {
|
||||
final Favourite favourite = findFavourite(id);
|
||||
FavouriteTiding favouriteTiding = em.find(FavouriteTiding.class, new FavouriteTidingId(favourite.getId(), tiding.getId()));
|
||||
if (favouriteTiding == null) {
|
||||
|
@ -83,8 +83,8 @@ public class JpaFavouriteTests {
|
||||
Favourite favourite = favouriteService.addFavourite(dateofadd1);
|
||||
final Tiding tidingOne = tidingService.addTiding("Tiding 1", "abcd");
|
||||
final Tiding tidingTwo = tidingService.addTiding("Tiding 2", "efgh");
|
||||
favouriteService.addTechniqueInPurchase(favourite.getId(), tidingOne);
|
||||
favouriteService.addTechniqueInPurchase(favourite.getId(), tidingTwo);
|
||||
favouriteService.addTidingInFavourite(favourite.getId(), tidingOne);
|
||||
favouriteService.addTidingInFavourite(favourite.getId(), tidingTwo);
|
||||
favourite = favouriteService.findFavourite(favourite.getId());
|
||||
log.info("testAddTidingInFavourite: " + favourite.getTidings().toString());
|
||||
Assertions.assertEquals(favourite.getTidings().size(), 2);
|
||||
@ -101,9 +101,9 @@ public class JpaFavouriteTests {
|
||||
Favourite favourite = favouriteService.addFavourite(dateofadd1);
|
||||
final Tiding tidingOne = tidingService.addTiding("Tiding 1", "abcd");
|
||||
final Tiding tidingTwo = tidingService.addTiding("Tiding 2", "efgh");
|
||||
favouriteService.addTechniqueInPurchase(favourite.getId(), tidingOne);
|
||||
favouriteService.addTechniqueInPurchase(favourite.getId(), tidingTwo);
|
||||
favouriteService.removeTechniqueInPurchase(favourite.getId(), tidingOne);
|
||||
favouriteService.addTidingInFavourite(favourite.getId(), tidingOne);
|
||||
favouriteService.addTidingInFavourite(favourite.getId(), tidingTwo);
|
||||
favouriteService.removeTidingInFavourite(favourite.getId(), tidingOne);
|
||||
favourite = favouriteService.findFavourite(favourite.getId());
|
||||
log.info("testRemoveTidingFromFavourite: " + favourite.getTidings());
|
||||
Assertions.assertEquals(favourite.getTidings().size(), 1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user