Merge branch 'dev' of https://github.com/appirio-tech/direct-app into dev

Author: ajefts

services/project_service/src/java/main/com/topcoder/service/project/impl/ProjectServiceBean.java

@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -371,6 +372,13 @@
 @TransactionManagement(TransactionManagementType.CONTAINER)
 @TransactionAttribute(TransactionAttributeType.REQUIRED)
 public class ProjectServiceBean implements ProjectServiceLocal, ProjectServiceRemote {
+    /**
+     * Represents the pattern for project name
+     *
+     * @since 2.4
+     */
+    private static final String NAME_PATTERN = "[a-zA-Z0-9\\$\\!\\(\\)\\[\\]'\\\"\\-\\.\\,\\/\\+ ]+";
+
     /**
      * Represents the field names to be audit.
      * 
@@ -1988,6 +1996,17 @@ private void checkProjectData(ProjectData projectData, boolean isCreate) throws
             throw logException(new IllegalArgumentFault("The name attribute of the project data can not be null."));
         } else if (name.trim().length() == 0) {
             throw logException(new IllegalArgumentFault("The name attribute of the project data can not be empty."));
+        } else if (!Pattern.matches(NAME_PATTERN, name)) {
+            throw logException(new IllegalArgumentFault("The name attribute of the project data is not following pattern as - " + NAME_PATTERN));
+        }
+
+        String description = projectData.getDescription();
+        if (null == description) {
+            throw logException(new IllegalArgumentFault("The description attribute of the project data can not be null."));
+        } else if (description.trim().length() == 0) {
+            throw logException(new IllegalArgumentFault("The description attribute of the project data can not be empty."));
+        } else if (!Pattern.matches(NAME_PATTERN, description)) {
+            throw logException(new IllegalArgumentFault("The description attribute of the project data is not following pattern as - " + NAME_PATTERN));
         }
 
         //added in version 2.2

services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java

@@ -426,7 +426,6 @@
  * <ul>
  *     <li>updated on {@link #createProjectWithTemplate(Project, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
  *     <li>updated on {@link #updateProject(Project, String, com.topcoder.project.phases.Project, Resource[], Date, Date, String)}</li>
- *     <li>added {@link #checkPrivateProjectPhase(Project, com.topcoder.project.phases.Project)}</li>
  * </ul>
  * <p>
  *
@@ -2080,10 +2079,21 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
                         // code with auto assigned review only requires one reviewer.
                         p.setAttribute("Reviewer Number", "2");
                     }
+
+                    if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId() && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) {
+                        if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) {
+                            if (p.getPhaseStatus().getId() != PhaseStatus.CLOSED.getId()) {
+                                p.setPhaseStatus(PhaseStatus.CLOSED);
+                            }
+                        } else {
+                            if (p.getPhaseStatus().getId() == PhaseStatus.CLOSED.getId()) {
+                                p.setPhaseStatus(PhaseStatus.SCHEDULED);
+                            }
+                        }
+                    }
                 }
             }
 
-            checkPrivateProjectPhase(projectHeader, projectPhases);
             setScorecards(projectHeader, projectPhases);
             // call phaseManager.updatePhases(projectPhases,operator)
             Util.log(logger, Level.DEBUG, "Starts calling PhaseManager#updatePhases method.");
@@ -2740,7 +2750,6 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
             }
 
             setNewPhasesProperties(projectHeader, newProjectPhases, (multiRoundEndDate != null), isStudio);
-            checkPrivateProjectPhase(projectHeader, newProjectPhases);
 
             return this.createProject(projectHeader, newProjectPhases, projectResources, operator);
 
@@ -5151,25 +5160,11 @@ private void setNewPhasesProperties(Project projectHeader,
                 p.setAttribute(SCORECARD_ID_PHASE_ATTRIBUTE_KEY, String.valueOf(iterativeReviewTemplateId));
                 p.setAttribute("Reviewer Number", "1");
             }
-        }
-    }
 
-    /**
-     * Helper to check project phase status. It must set to CLOSED for private project
-     *
-     * @param projectHeader Project
-     * @param projectPhases Project phases
-     * @since 2.3
-     */
-    private void checkPrivateProjectPhase(Project projectHeader, com.topcoder.project.phases.Project projectPhases) {
-        for (Phase p : projectPhases.getAllPhases()) {
             if (p.getPhaseType().getId() == PhaseType.REGISTRATION_PHASE.getId()) {
-                if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")) {
+                if (projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && projectHeader.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1") && projectHeader.getProjectStatus().getId() == ProjectStatus.DRAFT.getId()) {
                     p.setPhaseStatus(PhaseStatus.CLOSED);
-                }else{
-                    p.setPhaseStatus(PhaseStatus.SCHEDULED);
                 }
-                break;
             }
         }
     }