Commit with update habit method change

ita-social-projects · Oct 4, 2023 · 86a045e · 86a045e
1 parent 22737dc
commit 86a045e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/service/src/main/java/greencity/service/HabitServiceImpl.java b/service/src/main/java/greencity/service/HabitServiceImpl.java
@@ -382,10 +382,11 @@ private void enhanceHabitWithNewData(Habit toUpdate, CustomHabitDtoRequest habit
             toUpdate.setDefaultDuration(habitDto.getDefaultDuration());
         }
         if (isNotEmpty(habitDto.getHabitTranslations())) {
-            toUpdate.setHabitTranslations(mapHabitTranslationFromAddCustomHabitDtoRequest(habitDto));
+            habitTranslationRepo.deleteAllByHabit(toUpdate);
             saveHabitTranslationListsToHabitTranslationRepo(habitDto, toUpdate);
         }
         if (isNotEmpty(habitDto.getCustomShoppingListItemDto())) {
+            customShoppingListItemRepo.deleteCustomShoppingListItemsByHabitId(toUpdate.getId());
             setCustomShoppingListItemToHabit(habitDto, toUpdate, user);
         }
         if (StringUtils.isNotBlank(habitDto.getImage())) {

diff --git a/service/src/test/java/greencity/service/HabitServiceImplTest.java b/service/src/test/java/greencity/service/HabitServiceImplTest.java
@@ -838,7 +838,7 @@ void updateCustomHabitTest() throws IOException {
         verify(habitRepo).save(any());
         verify(customHabitMapper).convert(customHabitDtoRequest);
         verify(tagsRepo).findById(20L);
-        verify(habitTranslationMapper, times(3)).mapAllToList(List.of(habitTranslationDto));
+        verify(habitTranslationMapper, times(2)).mapAllToList(List.of(habitTranslationDto));
         verify(languageRepo, times(2)).findByCode(anyString());
         verify(customShoppingListItemRepo).findAllByUserIdAndHabitId(anyLong(), anyLong());
         verify(customShoppingListMapper).mapAllToList(anyList());
@@ -895,7 +895,7 @@ void updateCustomHabitNoSuchElementExceptionWithNotExistingLanguageCodes() throw
 
         verify(habitRepo).findById(anyLong());
         verify(userRepo).findByEmail(user.getEmail());
-        verify(habitTranslationMapper, times(3))
+        verify(habitTranslationMapper, times(2))
             .mapAllToList(customHabitDtoRequest.getHabitTranslations());
         verify(languageRepo, times(2)).findByCode(anyString());
     }