Fix issue PLAT-843 (#159)

* reviewer and iterative_reviewer role check

Author: LieutenantRoger

conf/MessageResources.properties

@@ -1351,6 +1351,7 @@ error.com.cronos.onlinereview.actions.editProject.Resource.MissingGroupTerms=* R
 error.com.cronos.onlinereview.actions.editProject.Resource.NotEligible=*Resource is not eligible for the project.
 error.com.cronos.onlinereview.actions.editProject.Resource.NotEligibleByUser=*Resource {0} is not eligible for the project.
 error.com.cronos.onlinereview.actions.editProject.Resource.DuplicateSubmitterRole=*Duplicate submitter role assigned to user
+error.com.cronos.onlinereview.actions.editProject.Resource.DuplicateSubmitterReviewerRole=*The reviewer or iterative reviewer role can not be assigned,<br />because this member has already submitted a solution for the challenge.
 error.com.cronos.onlinereview.actions.editProject.explanation=*Explanation is a required field
 error.com.cronos.onlinereview.actions.editProject.TimelineNotification.NotFound=*There''s no Timeline Notification notification type
 error.com.cronos.onlinereview.actions.editProject.PhaseStartDateNotSet=Start date is required for {0} phase

src/main/java/com/cronos/onlinereview/actions/project/SaveProjectAction.java

@@ -173,6 +173,11 @@ public class SaveProjectAction extends BaseProjectAction {
      */
     private static final long SUBMITTER_ROLE_ID = 1L;
 
+    /**
+     * <p>A <code>Set</code> holding the IDs for reviewer role and iterative reviewer role Ids which do not allow to be assigned to</p>
+     */
+    private static final Set<Long> NO_REVIEWER_ITERATIVE_REVIEWER_ROLE_IDS = new HashSet<Long>(Arrays.asList(21L, 4L));
+
     /**
      * The jackson object mapping which is used to deserialize json return from API to domain model.
      */
@@ -1736,6 +1741,40 @@ private void saveResources(HttpServletRequest request,
             }
         }
 
+        // Validate that no submitters who have submitted for project were assigned as reviewer role or iterative reviewer role
+        // 0-index resource is skipped as it is a "dummy" one
+        for (int i = 1; i < resourceNames.length; i++) {
+            String resourceAction = (String) getModel().get("resources_action", i);
+            // check for additions or modifications
+            if (!"delete".equalsIgnoreCase(resourceAction)) {
+                String handle = resourceNames[i];
+                long resourceRoleId = (Long) getModel().get("resources_role", i);
+                if (NO_REVIEWER_ITERATIVE_REVIEWER_ROLE_IDS.contains(resourceRoleId)) {
+                    boolean resourceHasSubmissions = false;
+                    for (int j = 1; j < resourceNames.length; j++) {
+                        if (i == j) continue;
+                        Long otherResourceId = (Long) getModel().get("resources_id", j);
+                        if (otherResourceId != -1 && handle.equalsIgnoreCase(resourceNames[j])) {
+                            Resource otherResource = resourceManager.getResource(otherResourceId);
+                            String otherResourceRoleName = otherResource.getResourceRole().getName();
+                            if ("Submitter".equals(otherResourceRoleName)) {
+                                Long[] submissionIds = otherResource.getSubmissions();
+                                if ((submissionIds != null) && (submissionIds.length > 0)) {
+                                    resourceHasSubmissions = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if(resourceHasSubmissions) {
+                        ActionsHelper.addErrorToRequest(request, "resources_name[" + i + "]",
+                                "error.com.cronos.onlinereview.actions."
+                                        + "editProject.Resource.DuplicateSubmitterReviewerRole");
+                        allResourcesValid = false;
+                    }
+                }
+            }
+        }
 
         // No resources are updated if at least one of them is incorrect.
         if (!allResourcesValid) {