Merge branch 'release/0.7.0'

Author: mkimberlin

.github/workflows/gradle-build-publish.yml

@@ -0,0 +1,35 @@
+name: Gradle Publish to GitHub Packages
+on:
+  release:
+    types: [created]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Node 14
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '14'
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache Gradle packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+        with:
+          arguments: publish
+        env:
+          REACT_APP_API_URL: https://checkins.objectcomputing.com
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -77,7 +77,7 @@ project.tasks["sonarqube"].dependsOn ":web-ui:yarn_run_coverage", ":server:jacoc
 publishing {
      publications {
         checkInsProject(MavenPublication) {
-            version "0.6.0"
+            version "0.7.0"
             group "com.objectcomputing.checkins"         
             from components.java
 

server/build.gradle

@@ -10,7 +10,7 @@ rewrite {
     activeRecipe("org.openrewrite.java.micronaut.Micronaut2to3Migration")
 }
 
-version "0.6.0"
+version "0.7.0"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/AlreadyExistsHandler.java

@@ -15,7 +15,7 @@
 @Produces
 @Singleton
 @Requires(classes = {AlreadyExistsException.class, ExceptionHandler.class})
-public class AlreadyExistsHandler implements ExceptionHandler<AlreadyExistsException, HttpResponse> {
+public class AlreadyExistsHandler implements ExceptionHandler<AlreadyExistsException, HttpResponse<?>> {
 
     @Override
     public HttpResponse<?> handle(HttpRequest request, AlreadyExistsException e) {

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/ArgumentsHandler.java

@@ -14,7 +14,7 @@
 @Produces
 @Singleton
 @Requires(classes = {BadArgException.class, ExceptionHandler.class})
-public class ArgumentsHandler implements ExceptionHandler<BadArgException, HttpResponse> {
+public class ArgumentsHandler implements ExceptionHandler<BadArgException, HttpResponse<?>> {
 
     @Override
     public HttpResponse<?> handle(HttpRequest request, BadArgException e) {

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/DataAccessExceptionHandler.java

@@ -0,0 +1,30 @@
+package com.objectcomputing.checkins.exceptions.handlers;
+
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.data.exceptions.DataAccessException;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.annotation.Produces;
+import io.micronaut.http.hateoas.JsonError;
+import io.micronaut.http.hateoas.Link;
+import io.micronaut.http.server.exceptions.ExceptionHandler;
+import jakarta.inject.Singleton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Produces
+@Singleton
+@Requires(classes = {DataAccessException.class, ExceptionHandler.class})
+public class DataAccessExceptionHandler implements ExceptionHandler<DataAccessException, HttpResponse<?>> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DataAccessExceptionHandler.class);
+    @Override
+    public HttpResponse<?> handle(HttpRequest request, DataAccessException e) {
+        JsonError error = new JsonError(e.getMessage())
+                .link(Link.SELF, Link.of(request.getUri()));
+        LOG.error(e.getMessage());
+        return HttpResponse.<JsonError>status(HttpStatus.BAD_REQUEST).body(error);
+    }
+
+}

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/NotFoundHandler.java

@@ -14,7 +14,7 @@
 @Produces
 @Singleton
 @Requires(classes = {NotFoundException.class, ExceptionHandler.class})
-public class NotFoundHandler implements ExceptionHandler<NotFoundException, HttpResponse> {
+public class NotFoundHandler implements ExceptionHandler<NotFoundException, HttpResponse<?>> {
 
     @Override
     public HttpResponse<?> handle(HttpRequest request, NotFoundException e) {

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/PermissionsHandler.java

@@ -15,7 +15,7 @@
 @Produces
 @Singleton
 @Requires(classes = {PermissionException.class, ExceptionHandler.class})
-public class PermissionsHandler implements ExceptionHandler<PermissionException, HttpResponse> {
+public class PermissionsHandler implements ExceptionHandler<PermissionException, HttpResponse<?>> {
 
     @Override
     public HttpResponse<?> handle(HttpRequest request, PermissionException e) {

server/src/main/java/com/objectcomputing/checkins/security/permissions/Permissions.java

@@ -1,21 +1,39 @@
 package com.objectcomputing.checkins.security.permissions;
 
 public enum Permissions {
-    CAN_VIEW_FEEDBACK_REQUEST,
-    CAN_CREATE_FEEDBACK_REQUEST,
-    CAN_DELETE_FEEDBACK_REQUEST,
-    CAN_VIEW_FEEDBACK_ANSWER,
-    CAN_DELETE_ORGANIZATION_MEMBERS,
-    CAN_CREATE_ORGANIZATION_MEMBERS,
-    CAN_VIEW_ROLE_PERMISSIONS,
-    CAN_ASSIGN_ROLE_PERMISSIONS,
-    CAN_VIEW_PERMISSIONS,
-    CAN_VIEW_SKILLS_REPORT,
-    CAN_VIEW_RETENTION_REPORT,
-    CAN_VIEW_ANNIVERSARY_REPORT,
-    CAN_VIEW_BIRTHDAY_REPORT,
-    CAN_VIEW_PROFILE_REPORT,
-    CAN_CREATE_CHECKINS,
-    CAN_VIEW_CHECKINS,
-    CAN_UPDATE_CHECKINS,
-}
+    CAN_VIEW_FEEDBACK_REQUEST("View feedback requests", "Feedback"),
+    CAN_CREATE_FEEDBACK_REQUEST("Create feedback requests", "Feedback"),
+    CAN_DELETE_FEEDBACK_REQUEST("Delete feedback requests", "Feedback"),
+    CAN_VIEW_FEEDBACK_ANSWER("View feedback answers", "Feedback"),
+    CAN_DELETE_ORGANIZATION_MEMBERS("Delete organization members", "User Management"),
+    CAN_CREATE_ORGANIZATION_MEMBERS("Create organization members", "User Management"),
+    CAN_VIEW_ROLE_PERMISSIONS("View role permissions", "Security"),
+    CAN_ASSIGN_ROLE_PERMISSIONS("Assign role permissions", "Security"),
+    CAN_VIEW_PERMISSIONS("View all permissions", "Security"),
+    CAN_VIEW_SKILLS_REPORT("View skills report", "Reporting"),
+    CAN_VIEW_RETENTION_REPORT("View retention report", "Reporting"),
+    CAN_VIEW_ANNIVERSARY_REPORT("View anniversary report", "Reporting"),
+    CAN_VIEW_BIRTHDAY_REPORT("View birthday report", "Reporting"),
+    CAN_VIEW_PROFILE_REPORT("View profile report", "Reporting"),
+    CAN_CREATE_CHECKINS("Create check-ins", "Check-ins"),
+    CAN_VIEW_CHECKINS("View check-ins", "Check-ins"),
+    CAN_UPDATE_CHECKINS("Update check-ins", "Check-ins"),
+    CAN_EDIT_SKILL_CATEGORIES("Edit skill categories", "Skills"),
+    CAN_VIEW_SKILL_CATEGORIES("View skill categories", "Skills");
+
+    private final String description;
+    private final String category;
+
+    Permissions(String description, String category) {
+        this.description = description;
+        this.category = category;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+}

server/src/main/java/com/objectcomputing/checkins/services/feedback/suggestions/FeedbackSuggestionServiceImpl.java

@@ -9,6 +9,8 @@
 import io.micronaut.context.annotation.Property;
 import com.objectcomputing.checkins.exceptions.PermissionException;
 import jakarta.inject.Singleton;
+
+import java.time.LocalDate;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -47,11 +49,11 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
         }
 
         List<FeedbackSuggestionDTO> suggestions = new LinkedList<>();
-        if(suggestFor.getSupervisorid() != null && !suggestFor.getSupervisorid().equals(currentUser.getId())) {
+        if(suggestFor.getSupervisorid() != null && !suggestFor.getSupervisorid().equals(currentUser.getId()) && isMemberActive(suggestFor.getSupervisorid())) {
             suggestions.add(new FeedbackSuggestionDTO("Supervisor of requestee", suggestFor.getSupervisorid()));
         }
 
-        if(suggestFor.getPdlId() != null && !suggestFor.getPdlId().equals(currentUser.getId())) {
+        if(suggestFor.getPdlId() != null && !suggestFor.getPdlId().equals(currentUser.getId()) && isMemberActive(suggestFor.getPdlId())) {
             suggestions.add(new FeedbackSuggestionDTO("PDL of requestee", suggestFor.getPdlId()));
         }
 
@@ -60,6 +62,7 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
         for(TeamMember currentMembership: teamMemberships){
             Set<TeamMember> teamMembers = teamMemberServices.findByFields(currentMembership.getTeamId(), null, null);
             Set<TeamMember> leads = teamMembers.stream().filter((member)-> member.isLead()).collect(Collectors.toSet());
+            leads = filterTerminated(leads);
             for(TeamMember lead: leads) {
                 if(suggestions.size() < maxSuggestions && !lead.getMemberId().equals(id) && !lead.getMemberId().equals(currentUserId)) {
                     suggestions.add(new FeedbackSuggestionDTO("Team lead for requestee", lead.getMemberId()));
@@ -72,6 +75,7 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
         for(TeamMember currentMembership: teamMemberships){
             Set<TeamMember> teamMembers = teamMemberServices.findByFields(currentMembership.getTeamId(), null, null);
             teamMembers = teamMembers.stream().filter((member)-> !member.isLead()).collect(Collectors.toSet());
+            teamMembers = filterTerminated(teamMembers);
             for(TeamMember teamMember: teamMembers) {
                 if(suggestions.size() < maxSuggestions && !teamMember.getMemberId().equals(id) && !teamMember.getMemberId().equals(currentUserId)) {
                     suggestions.add(new FeedbackSuggestionDTO("Team member for requestee", teamMember.getMemberId()));
@@ -80,6 +84,20 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
 
             if(suggestions.size() >= maxSuggestions) break;
         }
+        
+        return suggestions;
+    }
+
+    private Set<TeamMember> filterTerminated(Set<TeamMember> suggestions) {
+        suggestions = suggestions.stream().filter((TeamMember suggestion) -> {
+            return isMemberActive(suggestion.getMemberId());
+        }).collect(Collectors.toSet());
         return suggestions;
     }
+
+    private boolean isMemberActive(UUID memberId) {
+        MemberProfile suggested = memberProfileServices.getById(memberId);
+        LocalDate terminationDate = suggested.getTerminationDate();
+        return !(terminationDate != null && terminationDate.isBefore(LocalDate.now().atStartOfDay().toLocalDate()));
+    }
 }