Change structure acheievements #6419
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -9,7 +9,7 @@ | |||
| import greencity.dto.PageableAdvancedDto; | |||
| import greencity.dto.achievement.AchievementManagementDto; | |||
| import greencity.dto.achievement.AchievementPostDto; | |||
| import greencity.dto.achievement.AchievementTranslationVO; | |||
|
|
|||
| @@ -162,11 +162,10 @@ | |||
| import greencity.entity.event.EventComment; | |||
| import greencity.entity.event.EventDateLocation; | |||
| import greencity.entity.event.EventGrade; | |||
| import greencity.entity.localization.AchievementTranslation; | |||
|
|
|||
| @@ -454,7 +452,7 @@ public static UserVO getUserVOWithData() { | |||
| .build(), | |||
| UserAchievementVO.builder() | |||
| .id(39L) | |||
| .achievementStatus(AchievementStatus.INACTIVE) | |||
|
|
|||
| @@ -1379,48 +1377,44 @@ public static AdvicePostDto getAdvicePostDto() { | |||
| } | |||
|
|
|||
| public static Achievement getAchievement() { | |||
| return new Achievement(1L, Collections.singletonList(getAchievementTranslation()), Collections.emptyList(), | |||
| return new Achievement(1L, | |||
| "CREATED_5_NEWS", "CREATED_5_NEWS", "CREATED_5_NEWS", | |||
There was a problem hiding this comment.
it is not a good practice to use the same value for the different variables
| } | ||
|
|
||
| public static AchievementPostDto getAchievementPostDto() { | ||
| return new AchievementPostDto(Collections.emptyList(), getAchievementCategoryDto(), 1); | ||
| return new AchievementPostDto("CREATED_5_NEWS", "CREATED_5_NEWS", "CREATED_5_NEWS", getAchievementCategoryDto(), |
| } | ||
|
|
||
| public static AchievementVO getAchievementVO() { | ||
| return new AchievementVO(1L, Collections.emptyList(), Collections.emptyList(), new AchievementCategoryVO(), 1); | ||
| return new AchievementVO(1L, "CREATED_5_NEWS", "CREATED_5_NEWS", "CREATED_5_NEWS", new AchievementCategoryVO(), |
| @@ -1698,7 +1692,7 @@ public static UserVO createUserVO2() { | |||
| .userAchievements(List.of( | |||
| UserAchievementVO.builder() | |||
| .id(47L) | |||
| .achievementStatus(AchievementStatus.ACTIVE) | |||
|
|
|||
| @@ -1708,7 +1702,7 @@ public static UserVO createUserVO2() { | |||
| .build(), | |||
| UserAchievementVO.builder() | |||
| .id(39L) | |||
| .achievementStatus(AchievementStatus.INACTIVE) | |||
|
|
|||
| @@ -1776,7 +1770,7 @@ public static UserVO createUserVO2() { | |||
| .userAchievements(List.of( | |||
| UserAchievementVO.builder() | |||
| .id(47L) | |||
| .achievementStatus(AchievementStatus.ACTIVE) | |||
|
|
|||
| @@ -1786,7 +1780,7 @@ public static UserVO createUserVO2() { | |||
| .build(), | |||
| UserAchievementVO.builder() | |||
| .id(39L) | |||
| .achievementStatus(AchievementStatus.INACTIVE) | |||
|
|
|||
| import greencity.entity.Language; | ||
| import greencity.entity.UserAchievement; | ||
| import greencity.entity.localization.AchievementTranslation; | ||
|
|
| import greencity.enums.AchievementCategoryType; | ||
|
|
| when(modelMapper.map(ecoNews, AddEcoNewsDtoResponse.class)).thenReturn(addEcoNewsDtoResponse); | ||
| when(modelMapper.map(ModelUtils.getUserVO(), User.class)).thenReturn(ModelUtils.getUser()); |
| @@ -178,7 +184,7 @@ void saveEcoNews() { | |||
| when(modelMapper.map(tagVOList, | |||
| new TypeToken<List<Tag>>() { | |||
| }.getType())).thenReturn(tags); | |||
|
|
|||
| when(userService.findByEmail(anyString())).thenReturn(ModelUtils.getUserVO()); | |||
RomaMocherniuk
approved these changes
Oct 3, 2023
|
Kudos, SonarCloud Quality Gate passed!
|
HelenSotnik
approved these changes
Oct 4, 2023
ABbondar
approved these changes
Oct 4, 2023
Maksym-Lenets
approved these changes
Oct 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GreenCity PR
Update Achievement structure #6421
Summary Of Changes 🔥
Added new enum of achievements
Updated old implementation of achievement service
Added
New enum of achievements
Changed
Implementation of achievement service
Deleted
Unused methods and fields
PR Checklist Forms
(to be filled out by PR submitter)
devbranch.NEED_REVIEWandREADY_FOR_REVIEWlabels are added.