be able to set end date for registration phase and submission phase

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ContestServiceFacade.java

@@ -266,8 +266,14 @@
  * <ul>
  *     <li>Add {@link #getAllProjectGroups()}to get all project groups</li>
  * </ul>
+ *
+ * Version 1.8.7 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
+ * <ul>
+ *     <li>Added new createSoftwareContest and updateSoftwareContest methods to take an extra regEndDate argument</li>
+ * </ul>
+ *
  * @author pulky, murphydog, waits, BeBetter, hohosky, isv, lmmortal, Veve, GreatKevin, deedee, TCSASSEMBLER, TCSCODER
- * @version 1.8.6
+ * @version 1.8.7
  */
 public interface ContestServiceFacade {
 
@@ -512,6 +518,7 @@ public List<Technology> getActiveTechnologies(TCSubject tcSubject)
     public SoftwareCompetition createSoftwareContest(TCSubject tcSubject,SoftwareCompetition contest, long tcDirectProjectId)
         throws ContestServiceException, PermissionServiceException;
 
+
     /**
      * <p>
      * Creates a new <code>SoftwareCompetition</code> in the persistence.
@@ -537,6 +544,25 @@ public SoftwareCompetition createSoftwareContest(TCSubject tcSubject,SoftwareCom
     public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException;
 
+    /**
+     * <p>
+     * Creates a new <code>SoftwareCompetition</code> in the persistence.
+     * </p>
+     * 
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param contest the <code>SoftwareCompetition</code> to create as a contest
+     * @param tcDirectProjectId the TC direct project id. a <code>long</code> providing the ID of a client the new
+     *            competition belongs to.
+     * @param regEndDate the registration end date
+     * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
+     * @param endDate the end date for submission phase. Can be null if to use default.
+     * @return the created <code>SoftwareCompetition</code> as a contest
+     * @throws IllegalArgumentException if the input argument is invalid.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     */
+    public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
+            long tcDirectProjectId, Date regEndDate, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException;
+
     /**
      * <p>
      * BURG-1716: We need to add a method to get software contest by project id,
@@ -608,6 +634,23 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject,
     public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException;
 
+    /**
+     * <p>
+     * Updates a <code>SoftwareCompetition</code> in the persistence.
+     * </p>
+     * 
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param contest the <code>SoftwareCompetition</code> to update as a contest
+     * @param tcDirectProjectId the TC direct project id.
+     * @param regEndDate the registration end date
+     * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
+     * @param endDate the end date for submission phase. Can be null if to use default.
+     * @throws IllegalArgumentException if the input argument is invalid.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     */
+    public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
+            long tcDirectProjectId, Date regEndDate, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException;
+
     /**
      * <p>
      * Assigns a specified user to a specified <code>assetDTO</code>.

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

@@ -874,9 +874,15 @@
  *     <li>Add {@link #getAllProjectGroups()}to get all project groups</li>
  * </ul>
  *
+ * Version 3.8 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
+ * <ul>
+ *     <li>Added new createSoftwareContest and updateSoftwareContest methods to take an extra regEndDate argument</li>
+ *     <li>Updated the other methods to call the two methods above</li>
+ * </ul>
+ *
  * @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
  * @author isv, GreatKevin, Veve, deedee, TCSCODER, TCSASSEMBLER
- * @version 3.7
+ * @version 3.8
  */
 @Stateless
 @TransactionManagement(TransactionManagementType.CONTAINER)
@@ -2303,13 +2309,13 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
 
             if (tobeUpdatedCompetition == null) {
                 tobeUpdatedCompetition =
-                    createSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), multiRoundEndDate, endDate);
+                    createSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), null, multiRoundEndDate, endDate);
                 competition.getProjectHeader().setProjectStatus(ProjectStatus.ACTIVE);
             } else {
                 competition.setProjectHeaderReason("User Update");
                 competition.getProjectHeader().setProjectStatus(ProjectStatus.ACTIVE);
                 tobeUpdatedCompetition =
-                    updateSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), multiRoundEndDate, endDate);
+                    updateSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), null, multiRoundEndDate, endDate);
             }
 
             Project contest = tobeUpdatedCompetition.getProjectHeader();
@@ -3098,7 +3104,7 @@ private boolean isStudio(SoftwareCompetition contest) {
      */
     public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId) throws ContestServiceException, PermissionServiceException {
-        return createSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null);
+        return createSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null, null);
     }
 
 	/**
@@ -3166,6 +3172,27 @@ private void checkContestBillingAccount(long billingAccountId, long directProjec
      */
     public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
+        return createSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null, null);
+    }
+
+    /**
+     * <p>
+     * Creates a new <code>SoftwareCompetition</code> in the persistence.
+     * </p>
+     *
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param contest the <code>SoftwareCompetition</code> to create as a contest
+     * @param tcDirectProjectId the TC direct project id. a <code>long</code> providing the ID of a client the new
+     *            competition belongs to.
+     * @param regEndDate the registration end date
+     * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
+     * @param endDate the end date for submission phase. Can be null if to use default.
+     * @return the created <code>SoftwareCompetition</code> as a contest
+     * @throws IllegalArgumentException if the input argument is invalid.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     */
+    public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
+            long tcDirectProjectId, Date regEndDate, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
         logger.debug("createSoftwareContest with information : [tcSubject = " + tcSubject.getUserId() + ", tcDirectProjectId ="
                 + tcDirectProjectId + ", multiRoundEndDate = " + multiRoundEndDate + "]");
 
@@ -3232,7 +3259,7 @@ public SoftwareCompetition createSoftwareContest(TCSubject tcSubject, SoftwareCo
 
             //create project now
             FullProjectData projectData = projectServices.createProjectWithTemplate(contest.getProjectHeader(),
-                        contest.getProjectPhases(), contest.getProjectResources(), multiRoundEndDate, endDate,
+                        contest.getProjectPhases(), contest.getProjectResources(), regEndDate, multiRoundEndDate, endDate,
                         String.valueOf(tcSubject.getUserId()));
 
             if (contest.getProjectHeader().getProjectCategory().getId() == ProjectCategory.DEVELOPMENT.getId()) {
@@ -4343,7 +4370,7 @@ public List<SoftwareCompetition> batchUpdateDraftSoftwareContests(TCSubject tcSu
      */
     public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId) throws ContestServiceException, PermissionServiceException {
-        return updateSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null);
+        return updateSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null, null);
     }
 
     /**
@@ -4372,6 +4399,26 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
      */
     public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
             long tcDirectProjectId, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
+
+        return updateSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null, null);
+    }
+
+    /**
+     * <p>
+     * Updates a <code>SoftwareCompetition</code> in the persistence.
+     * </p>
+     * 
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param contest the <code>SoftwareCompetition</code> to update as a contest
+     * @param tcDirectProjectId the TC direct project id.
+     * @param regEndDate the registration end date
+     * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
+     * @param endDate the end date for submission phase. Can be null if to use default.
+     * @throws IllegalArgumentException if the input argument is invalid.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     */
+    public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
+            long tcDirectProjectId, Date regEndDate, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
         logger.debug("updateSoftwareContest");
 
         try {
@@ -4650,6 +4697,7 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
                         contest.getProjectPhases(),
                         updatedResources.toArray(
                                 new com.topcoder.management.resource.Resource[updatedResources.size()]),
+                        regEndDate,
                         multiRoundEndDate,
                         endDate,
                         String.valueOf(tcSubject.getUserId()));

services/project_services/src/java/main/com/topcoder/project/service/ProjectServices.java

@@ -218,6 +218,11 @@
  * <ul>
  *     <li>Added {@link #getAllProjectGroups()}</li>
  * </ul>
+ *
+ * Version 1.10 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
+ * <ul>
+ *     <li>Updated createProjectWithTemplate and updateProject methods to take an extra regEndDate argument</li>
+ * </ul>
  * </p>
  *
  * <p>
@@ -228,7 +233,7 @@
  *
  * @author argolite, moonli, pulky
  * @author fabrizyo, znyyddf, murphydog, waits, hohosky, isv, GreatKevin, TCSCODER
- * @version 1.9
+ * @version 1.10
  */
 public interface ProjectServices {
     /**
@@ -557,6 +562,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
      * @param projectResources
      *            the project's resources, can be null or empty, can't contain null values. Null is
      *            treated like empty.
+	 * @param regEndDate the registration end date
      * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
      * @param endDate the end date for submission phase.
      * @param operator
@@ -584,7 +590,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
      * @since 1.4.5
      */
     public FullProjectData updateProject(Project projectHeader, String projectHeaderReason,
-            com.topcoder.project.phases.Project projectPhases, Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator);
+            com.topcoder.project.phases.Project projectPhases, Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator);
 
     /**
      * <p>
@@ -731,6 +737,7 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
      * @param projectResources
      *            the project's resources, can be null or empty, can't contain null values. Null is
      *            treated like empty.
+	 * @param regEndDate the registration end date
      * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
      * @param endDate the end date for submission phase.
      * @param operator
@@ -752,7 +759,7 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
      * @since 1.4.4
      */
     public FullProjectData createProjectWithTemplate(Project projectHeader, com.topcoder.project.phases.Project projectPhases,
-            Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator);
+            Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator);
 
     /**
      * <p>

services/project_services/src/java/main/com/topcoder/project/service/ejb/ProjectServicesBean.java

@@ -252,10 +252,16 @@
  * <ul>
  *     <li>Added {@link #getAllProjectGroups()}</li>
  * </ul>
+ *
+ * <p>
+ * Version 1.10 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
+ * <ul>
+ *     <li>Updated createProjectWithTemplate and updateProject methods to take an extra regEndDate argument</li>
+ * </ul>
  * </p>
  *
  * @author fabrizyo, znyyddf, pulky, murphydog, waits, hohosky, isv, GreatKevin, TCSCODER
- * @version 1.9
+ * @version 1.10
  * @since 1.0
  */
 @Stateless
@@ -838,6 +844,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
      * @param projectResources
      *            the project's resources, can be null or empty, can't contain null values. Null is
      *            treated like empty.
+	 * @param regEndDate the registration end date
      * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
      * @param endDate the end date for submission phase.
      * @param operator
@@ -865,16 +872,16 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
      * @since 1.4.5
      */
     public FullProjectData updateProject(Project projectHeader, String projectHeaderReason,
-            com.topcoder.project.phases.Project projectPhases, Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator) {
+            com.topcoder.project.phases.Project projectPhases, Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator) {
         String method = "ProjectServicesBean#updateProject(Project projectHeader,"
             + " String projectHeaderReason, com.topcoder.project.phases.Project projectPhases,"
-            + " Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator) method.";
+            + " Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator) method.";
 
         Util.log(logger, Level.INFO, "Enters " + method);
 
         try {
             return getProjectServices().updateProject(projectHeader, projectHeaderReason, projectPhases,
-                    projectResources, multiRoundEndDate, endDate, operator);
+                    projectResources, regEndDate, multiRoundEndDate, endDate, operator);
         } catch (ProjectServicesException e) {
             Util.log(logger, Level.ERROR, "ProjectServicesException occurred in " + method);
             throw e;
@@ -1246,6 +1253,7 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
      * @param projectResources
      *            the project's resources, can be null or empty, can't contain null values. Null is
      *            treated like empty.
+	 * @param regEndDate the registration end date
      * @param multiRoundEndDate the end date for the multiround phase. No multiround if it's null.
      * @param endDate the end date for submission phase.
      * @param operator
@@ -1267,15 +1275,15 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
      * @since 1.4.5
      */
     public FullProjectData createProjectWithTemplate(Project projectHeader, com.topcoder.project.phases.Project projectPhases,
-            Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator) {
+            Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator) {
         String method = "ProjectServicesBean#createProjectWithTemplate(Project projectHeader, com.topcoder.project.phases.Project"
-            + " projectPhases, Resource[] projectResources, Date multiRoundEndDate, Date endDate, String operator) method.";
+            + " projectPhases, Resource[] projectResources, Date regEndDate, Date multiRoundEndDate, Date endDate, String operator) method.";
 
         Util.log(logger, Level.INFO, "Enters " + method);
 
         try {
             return getProjectServices().createProjectWithTemplate(projectHeader, projectPhases, projectResources,
-                    multiRoundEndDate, endDate, operator);
+                    regEndDate, multiRoundEndDate, endDate, operator);
         } catch (ProjectServicesException e) {
             Util.log(logger, Level.ERROR, "ProjectServicesException occurred in " + method);
             throw e;