From b620bbf62dfa3b892abc35229dc24fda9eecc5ac Mon Sep 17 00:00:00 2001
From: Pavel_Sorokin <sorokin.zxcv@gmail.com>
Date: Fri, 24 Mar 2023 08:56:17 +0400
Subject: [PATCH] =?UTF-8?q?3=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../is/sbapp/Favourite/service/FavouriteService.java   |  6 ++----
 src/test/java/ru/ulstu/is/sbapp/JpaFavouriteTests.java | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/ulstu/is/sbapp/Favourite/service/FavouriteService.java b/src/main/java/ru/ulstu/is/sbapp/Favourite/service/FavouriteService.java
index 9f2583e..81d4df3 100644
--- a/src/main/java/ru/ulstu/is/sbapp/Favourite/service/FavouriteService.java
+++ b/src/main/java/ru/ulstu/is/sbapp/Favourite/service/FavouriteService.java
@@ -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) {
diff --git a/src/test/java/ru/ulstu/is/sbapp/JpaFavouriteTests.java b/src/test/java/ru/ulstu/is/sbapp/JpaFavouriteTests.java
index 2f78bcb..d19797e 100644
--- a/src/test/java/ru/ulstu/is/sbapp/JpaFavouriteTests.java
+++ b/src/test/java/ru/ulstu/is/sbapp/JpaFavouriteTests.java
@@ -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);