Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Tag): Prevent creating a duplicate tag #268

Merged
merged 1 commit into from
Apr 9, 2024
Merged

feat(Tag): Prevent creating a duplicate tag #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/wise/portal/presentation/web/controllers/tag/UserTagController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ public class UserTagController {
protected ResponseEntity<Map<String, Object>> createTag(Authentication auth,
@RequestBody Map<String, Object> tag) {
User user = userService.retrieveUserByUsername(auth.getName());
UserTag userTag = userTagsService.createTag(user, (String) tag.get("text"));
String tagText = ((String) tag.get("text")).trim();
if (userTagsService.hasTag(user, tagText)) {
return ResponseEntityGenerator.createError("tagAlreadyExists");
}
UserTag userTag = userTagsService.createTag(user, tagText);
return ResponseEntityGenerator.createSuccess(userTag.toMap());
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/wise/portal/service/usertags/UserTagsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public interface UserTagsService {

Set<UserTag> getTags(User user, Project project);

Boolean hasTag(User user, String tag);

Boolean hasTag(User user, Project project, String tag);

void applyTag(Project project, UserTag tag);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/wise/portal/service/usertags/impl/UserTagsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ public Set<UserTag> getTags(User user, Project project) {
.collect(Collectors.toSet());
}

@Override
public Boolean hasTag(User user, String tag) {
return getTags(user).stream()
.anyMatch(t -> t.getText().toLowerCase().equals(tag.toLowerCase()));
}

@Override
public Boolean hasTag(User user, Project project, String tag) {
MutableAclTargetObjectIdentity mutableObjectIdentity = getMutableObjectIdentity(project);
Expand Down
Loading