small refactoring and code style changes

mhinkie · mhinkie · commit 74909cb47393 · 2022-05-25T15:25:06.000+02:00
diff --git a/src/main/java/io/github/patternatlas/api/entities/candidate/comment/CandidateComment.java b/src/main/java/io/github/patternatlas/api/entities/candidate/comment/CandidateComment.java
@@ -32,21 +32,15 @@ public class CandidateComment extends Comment implements Serializable {
     @ManyToOne
     private Candidate candidate;
 
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ToString.Exclude
-    @ManyToOne
-    private UserEntity user;
-
     @JsonIgnore
     @OneToMany(mappedBy = "candidateComment", cascade = CascadeType.ALL, orphanRemoval = true)
     private Set<CandidateCommentRating> userRating = new HashSet<>();
 
     private int rating = 0;
 
     public CandidateComment(String text, Candidate candidate, UserEntity user) {
-        super(text);
+        super(text, user);
         this.candidate = candidate;
-        this.user = user;
     }
 
     public void updateComment(String text) {
diff --git a/src/main/java/io/github/patternatlas/api/entities/issue/comment/IssueComment.java b/src/main/java/io/github/patternatlas/api/entities/issue/comment/IssueComment.java
@@ -30,21 +30,15 @@ public class IssueComment extends Comment implements Serializable {
     @ManyToOne
     private Issue issue;
 
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @ToString.Exclude
-    @ManyToOne
-    private UserEntity user;
-
     @JsonIgnore
     @OneToMany(mappedBy = "issueComment", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<IssueCommentRating> userRating = new ArrayList<>();
 
     private int rating = 0;
 
     public IssueComment(String text, Issue issue, UserEntity user) {
-        super(text);
+        super(text, user);
         this.issue = issue;
-        this.user = user;
     }
 
     public void updateComment(String text) {
diff --git a/src/main/java/io/github/patternatlas/api/entities/shared/Comment.java b/src/main/java/io/github/patternatlas/api/entities/shared/Comment.java
@@ -2,12 +2,18 @@
 
 import java.util.Objects;
 import java.util.UUID;
+
+import io.github.patternatlas.api.entities.user.UserEntity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 @MappedSuperclass
 @Data
@@ -20,8 +26,14 @@ public abstract class Comment {
 
     private String text;
 
-    public Comment(String text) {
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @ToString.Exclude
+    @ManyToOne
+    private UserEntity user;
+
+    public Comment(String text, UserEntity user) {
         this.text = text;
+        this.user = user;
     }
 
     @Override
@@ -30,7 +42,8 @@ public boolean equals(Object o) {
         if (!(o instanceof Comment)) return false;
         Comment that = (Comment) o;
         return id.equals(that.id) &&
-                text.equals(that.text);
+                text.equals(that.text) &&
+                user.equals(that.user);
     }
 
     @Override
diff --git a/src/main/java/io/github/patternatlas/api/entities/user/UserEntity.java b/src/main/java/io/github/patternatlas/api/entities/user/UserEntity.java
@@ -52,14 +52,8 @@ public class UserEntity implements Serializable{
     @JsonIgnore
     @ToString.Exclude
     @ManyToMany()
-    /*@JoinTable(
-        name = "user_entity_roles",
-        joinColumns = { @JoinColumn(name = "users_id") },
-        inverseJoinColumns = { @JoinColumn(name = "roles_id") }
-    )*/
     private Set<Role> roles;
 
-    //@NaturalId(mutable = true)
     @Column(nullable = false, unique = false)
     private String email;
 
@@ -107,13 +101,6 @@ public class UserEntity implements Serializable{
     private List<CandidateEvidence> candidateEvidence = new ArrayList<>();
 
     /** Pattern fields*/
-//    @JsonIgnore
-//    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-//    private Set<CandidateRating> candidateRatings = new HashSet<>();
-//
-//    @JsonIgnore
-//    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-//    private List<CandidateComment> candidateComments = new ArrayList<>();
 
     public UserEntity(UserModel userModel, String password) {
         this(userModel.getName(), userModel.getEmail(), password, null);
diff --git a/src/main/java/io/github/patternatlas/api/entities/user/role/Role.java b/src/main/java/io/github/patternatlas/api/entities/user/role/Role.java
@@ -31,11 +31,6 @@ public class Role {
     private Set<UserEntity> users;
 
     @ManyToMany(cascade = CascadeType.ALL)
-    /*@JoinTable(
-        name = "role_privileges",
-        joinColumns = { @JoinColumn(name = "roles_id") },
-        inverseJoinColumns = { @JoinColumn(name = "privileges_id") }
-    )*/
     private Collection<Privilege> privileges;
 
     public Role(String name) {
diff --git a/src/main/java/io/github/patternatlas/api/rest/controller/CandidateController.java b/src/main/java/io/github/patternatlas/api/rest/controller/CandidateController.java
@@ -16,7 +16,6 @@
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,19 +64,19 @@ public CandidateController(
      */
     @Operation(operationId = "getAllCandidates", responses = {@ApiResponse(responseCode = "200")}, description = "Retrieve all candidates")
     @GetMapping(value = "")
-    CollectionModel<EntityModel<CandidateModel>> all(@RequestParam(value = "lid", required = false) UUID languageId) {
-        
+    CollectionModel<EntityModel<CandidateModel>> getAllCandidates(@RequestParam(value = "lid", required = false) UUID languageId) {
+
         List<EntityModel<CandidateModel>> candidates;
         if (languageId == null) {
             candidates = this.candidateService.getAllCandidates()
-                .stream()
-                .map(candidate -> new EntityModel<>(new CandidateModel(candidate)))
-                .collect(Collectors.toList());
+                    .stream()
+                    .map(candidate -> new EntityModel<>(new CandidateModel(candidate)))
+                    .collect(Collectors.toList());
         } else {
             candidates = this.candidateService.getAllCandidatesByLanguageId(languageId)
-                .stream()
-                .map(candidate -> new EntityModel<>(new CandidateModel(candidate)))
-                .collect(Collectors.toList());
+                    .stream()
+                    .map(candidate -> new EntityModel<>(new CandidateModel(candidate)))
+                    .collect(Collectors.toList());
         }
 
         return new CollectionModel<>(candidates);
diff --git a/src/main/java/io/github/patternatlas/api/rest/controller/IssueController.java b/src/main/java/io/github/patternatlas/api/rest/controller/IssueController.java
@@ -71,7 +71,6 @@ CollectionModel<EntityModel<IssueModel>> getAll() {
         List<EntityModel<IssueModel>> issues = this.issueService.getAllIssues()
                 .stream()
                 .map(issue -> new EntityModel<>(new IssueModel(issue)))
-//                .sorted(Comparator.comparingInt(i -> i.getContent().getRating()))
                 .sorted((i1, i2) -> Integer.compare(i2.getContent().getRating(), i1.getContent().getRating()))
                 .collect(Collectors.toList());
         return CollectionModel.of(issues);
diff --git a/src/main/java/io/github/patternatlas/api/rest/controller/UserController.java b/src/main/java/io/github/patternatlas/api/rest/controller/UserController.java
@@ -8,6 +8,8 @@
 import java.util.stream.Collectors;
 
 import io.github.patternatlas.api.entities.user.UserEntity;
+import io.github.patternatlas.api.entities.user.role.Privilege;
+import io.github.patternatlas.api.entities.user.role.Role;
 import io.github.patternatlas.api.rest.model.user.PrivilegeModel;
 import io.github.patternatlas.api.rest.model.user.RoleModel;
 import io.github.patternatlas.api.rest.model.user.RoleModelRequest;
@@ -98,8 +100,13 @@ public Map<String, Object> user(Principal principal) {
             Map<String, Object> model = new HashMap<String, Object>();
             model.put("name", user.getName());
             model.put("id", user.getId());
-            model.put("role", user.getRoles().stream().map(role -> role.getName()).collect(Collectors.toList()));
-            model.put("privileges", user.getRoles().stream().flatMap(role -> role.getPrivileges().stream()).map(privilege -> privilege.getName()).collect(Collectors.toList()));
+            model.put("role", user.getRoles().stream()
+                    .map(Role::getName)
+                    .collect(Collectors.toList()));
+            model.put("privileges", user.getRoles().stream()
+                    .flatMap(role -> role.getPrivileges().stream())
+                    .map(Privilege::getName)
+                    .collect(Collectors.toList()));
             return model;
         }
         return null;
diff --git a/src/main/java/io/github/patternatlas/api/rest/model/shared/CommentModel.java b/src/main/java/io/github/patternatlas/api/rest/model/shared/CommentModel.java
@@ -5,6 +5,8 @@
 import io.github.patternatlas.api.entities.issue.IssueRating;
 import io.github.patternatlas.api.entities.issue.comment.IssueComment;
 import io.github.patternatlas.api.entities.issue.comment.IssueCommentRating;
+import io.github.patternatlas.api.entities.shared.Comment;
+import io.github.patternatlas.api.entities.user.UserEntity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,24 +29,32 @@ public class CommentModel {
     private Collection<UUID> upVotes = new ArrayList<>();
     private Collection<UUID> downVotes = new ArrayList<>();
 
+    private void initialize(Comment comment) {
+        this.id = comment.getId();
+        this.userId = comment.getUser().getId();
+        this.userName = comment.getUser().getName();
+        this.text = comment.getText();
+        this.rating = 0;
+    }
+
+    private void updateRatingInformation(UserEntity user, int rating) {
+        if (rating == 1) {
+            this.upVotes.add(user.getId());
+            this.rating = this.rating + 1;
+        }
+        if (rating == -1) {
+            this.downVotes.add(user.getId());
+            this.rating = this.rating - 1;
+        }
+    }
+
     /**
      * For Issue Comments
      */
     public CommentModel(IssueComment issueComment) {
-        this.id = issueComment.getId();
-        this.userId = issueComment.getUser().getId();
-        this.userName = issueComment.getUser().getName();
-        this.text = issueComment.getText();
-        this.rating = 0;
+        initialize(issueComment);
         for (IssueCommentRating issueRating : issueComment.getUserRating()) {
-            if (issueRating.getRating() == 1) {
-                this.upVotes.add(issueRating.getUser().getId());
-                this.rating = this.rating + 1;
-            }
-            if (issueRating.getRating() == -1) {
-                this.downVotes.add(issueRating.getUser().getId());
-                this.rating = this.rating - 1;
-            }
+            updateRatingInformation(issueRating.getUser(), issueRating.getRating());
         }
     }
 
@@ -56,20 +66,9 @@ public static CommentModel from(IssueComment issueComment) {
      * For Candidate Comments
      */
     public CommentModel(CandidateComment candidateComment) {
-        this.id = candidateComment.getId();
-        this.userId = candidateComment.getUser().getId();
-        this.userName = candidateComment.getUser().getName();
-        this.text = candidateComment.getText();
-        this.rating = 0;
-        for (CandidateCommentRating candidateCommentRating : candidateComment.getUserRating()) {
-            if (candidateCommentRating.getRating() == 1) {
-                this.upVotes.add(candidateCommentRating.getUser().getId());
-                this.rating = this.rating + 1;
-            }
-            if (candidateCommentRating.getRating() == -1) {
-                this.downVotes.add(candidateCommentRating.getUser().getId());
-                this.rating = this.rating - 1;
-            }
+        initialize(candidateComment);
+        for (CandidateCommentRating issueRating : candidateComment.getUserRating()) {
+            updateRatingInformation(issueRating.getUser(), issueRating.getRating());
         }
     }
 
diff --git a/src/main/java/io/github/patternatlas/api/service/CandidateServiceImpl.java b/src/main/java/io/github/patternatlas/api/service/CandidateServiceImpl.java
@@ -260,15 +260,6 @@ public Candidate updateCandidateRating(UUID candidateId, UUID userId, RatingMode
         }
         CandidateRating updatedCandidateRating = this.candidateRatingRepository.save(candidateRating);
         return updatedCandidateRating.getCandidate();
-
-//        if (ratingModelMultiRequest.getRatingType().equals(RatingType.READABILITY)) {
-//            return new RatingModel(updatedCandidateRating, updatedCandidateRating.getReadability());
-//        } else if (ratingModelMultiRequest.getRatingType().equals(RatingType.UNDERSTANDABILITY)) {
-//            return new RatingModel(updatedCandidateRating, updatedCandidateRating.getUnderstandability());
-//        } else{
-//            return new RatingModel(updatedCandidateRating, updatedCandidateRating.getAppropriateness());
-//        }
-
     }
 
     @Override
diff --git a/src/main/java/io/github/patternatlas/api/service/IssueServiceImpl.java b/src/main/java/io/github/patternatlas/api/service/IssueServiceImpl.java
@@ -187,7 +187,6 @@ public Issue updateIssueRating(UUID issueId, UUID userId, RatingModelRequest rat
     public void deleteIssue(UUID issueId) {
         this.roleService.deleteAllRolesByResourceId(issueId);
         this.privilegeService.deleteAllPrivilegesByResourceId(issueId);
-        //this.getIssueById(issueId);
         this.issueRepository.deleteById(issueId);
     }
 
diff --git a/src/main/java/io/github/patternatlas/api/service/UserServiceImpl.java b/src/main/java/io/github/patternatlas/api/service/UserServiceImpl.java
@@ -245,11 +245,13 @@ public Role updateRole(UUID roleId, UUID privilegeId, RoleModelRequest roleModel
         Role role = this.roleRepository.findById(roleId).orElseThrow(() -> new ResourceNotFoundException(String.format(" Role %s not found!", roleId)));
         Privilege privilege = this.privilegeRepository.findById(privilegeId).orElseThrow(() -> new ResourceNotFoundException(String.format("Privilege %s not found!", privilegeId)));
 
-        if (role.getPrivileges().contains(privilege) && !roleModelRequest.isCheckboxValue())
+        if (role.getPrivileges().contains(privilege) && !roleModelRequest.isCheckboxValue()) {
             role.getPrivileges().remove(privilege);
+        }
 
-        if (!role.getPrivileges().contains(privilege) && roleModelRequest.isCheckboxValue())
+        if (!role.getPrivileges().contains(privilege) && roleModelRequest.isCheckboxValue()) {
             role.getPrivileges().add(privilege);
+        }
 
         return this.roleRepository.save(role);
     }
