fix registration end date while activating challenge (#280)

deedee · skyhit · commit a88b0e1eb500 · 2017-06-30T16:49:31.000+08:00
* fix registration end date while activating challenge
diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ContestServiceFacade.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ContestServiceFacade.java
@@ -272,8 +272,14 @@
  *     <li>Added new createSoftwareContest and updateSoftwareContest methods to take an extra regEndDate argument</li>
  * </ul>
  *
+ * Version 1.8.8: Fix end date for registration on activating challenge
+ * <ul>
+ *     <li>Added {@link #purchaseActivateContestAndStartSpecReview(TCSubject, SoftwareCompetition, TCPurhcaseOrderPaymentData, Date, Date, boolean)}</li>
+ *     <li>Added {@link #processContestPurchaseOrderSale(TCSubject, SoftwareCompetition, TCPurhcaseOrderPaymentData, Date, Date, Date)}</li>
+ * </ul>
+ *
  * @author pulky, murphydog, waits, BeBetter, hohosky, isv, lmmortal, Veve, GreatKevin, deedee, TCSASSEMBLER, TCSCODER
- * @version 1.8.7
+ * @version 1.8.8
  */
 public interface ContestServiceFacade {
 
@@ -415,6 +421,27 @@ public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tc
         SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData, Date multiRoundEndDate, Date endDate)
         throws ContestServiceException, PermissionServiceException;
 
+    /**
+     * <p>
+     * Processes the contest sale.
+     * </p>
+     *
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param competition data that recognizes a contest.
+     * @param paymentData payment information (credit card/po details) that need to be processed.
+     * @param multiRoundEndDate the end date for registration phase.
+     * @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 a <code>SoftwareContestPaymentResult</code> result of the payment processing.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     * @since Module Contest Service Software Contest Sales Assembly
+     * @since 1.8.8
+     */
+    public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tcSubject,
+                                                                        SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData,
+                                                                        Date regEndDate, Date multiRoundEndDate, Date endDate)
+            throws ContestServiceException, PermissionServiceException;
+
     /**
      * <p>
      * Processes the contest sale, activate the contest and start the specification review of the contest.
@@ -437,6 +464,29 @@ public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TC
         Date multiRoundEndDate, Date endDate, boolean startSpecReviewNow)
         throws ContestServiceException, PermissionServiceException, SpecificationReviewServiceException;
 
+    /**
+     * <p>
+     * Processes the contest sale, activate the contest and start the specification review of the contest.
+     * </p>
+     *
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param competition data that recognizes a contest.
+     * @param paymentData payment information (TCSubject tcSubject,credit card/po details) that need to be processed.
+     * @param regEndDate the end date for registration phase.
+     * @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.
+     * @param startSpecReviewNow the flag whether to start spec review now.
+     * @return a <code>PaymentResult</code> result of the payment processing.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     * @throws PermissionServiceException if there is error when assigning permission to user.
+     * @throws SpecificationReviewServiceException if fail to start the spec review of the contest.
+     * @since 1.8.8
+     */
+    public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TCSubject tcSubject,
+                                                                                  SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData, Date regEndDate,
+                                                                                  Date multiRoundEndDate, Date endDate, boolean startSpecReviewNow) throws ContestServiceException,
+            PermissionServiceException, SpecificationReviewServiceException;
+
     /**
      * <p>
      * Returns a list containing all active <code>Categories</code>.
diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
@@ -899,9 +899,17 @@
  *     <li>Added {@link #projectPaymentConfigFile}</li>
  *     <li>Added {@link #MANUAL_PAYMENT}</li>
  * </ul>
+ *
+ * Version 3.10: Fix end date for registration on activating challenge
+ * <ul>
+ *     <li>Added {@link #purchaseActivateContestAndStartSpecReview(TCSubject, SoftwareCompetition, TCPurhcaseOrderPaymentData, Date, Date, boolean)}</li>
+ *     <li>Added {@link #processContestPurchaseOrderSale(TCSubject, SoftwareCompetition, TCPurhcaseOrderPaymentData, Date, Date, Date)}</li>
+ *     <li>Updated {@link #processContestSaleInternal(TCSubject, SoftwareCompetition, PaymentData, Date, Date, Date)}</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.9
+ * @version 3.10
  */
 @Stateless
 @TransactionManagement(TransactionManagementType.CONTAINER)
@@ -2170,7 +2178,7 @@ public SoftwareContestPaymentResult processContestCreditCardSale(TCSubject tcSub
             SoftwareCompetition competition, CreditCardPaymentData paymentData) throws ContestServiceException, PermissionServiceException {
         logger.debug("processContestCreditCardSale");
 
-        return processContestSaleInternal(tcSubject, competition, paymentData, null, null);
+        return processContestSaleInternal(tcSubject, competition, paymentData, null, null, null);
     }
 
     /**
@@ -2194,7 +2202,7 @@ public SoftwareContestPaymentResult processContestCreditCardSale(TCSubject tcSub
             SoftwareCompetition competition, CreditCardPaymentData paymentData, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
         logger.debug("processContestCreditCardSale");
 
-        return processContestSaleInternal(tcSubject, competition, paymentData, multiRoundEndDate, endDate);
+        return processContestSaleInternal(tcSubject, competition, paymentData, null, multiRoundEndDate, endDate);
     }
 
     /**
@@ -2216,7 +2224,7 @@ public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tc
             SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData) throws ContestServiceException, PermissionServiceException {
         logger.debug("processPurchaseOrderSale");
 
-        return processContestSaleInternal(tcSubject, competition, paymentData, null, null);
+        return processContestSaleInternal(tcSubject, competition, paymentData, null, null, null);
     }
 
     /**
@@ -2240,9 +2248,33 @@ public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tc
             SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
         logger.debug("processPurchaseOrderSale");
 
-        return processContestSaleInternal(tcSubject, competition, paymentData, multiRoundEndDate, endDate);
+        return processContestSaleInternal(tcSubject, competition, paymentData, null, multiRoundEndDate, endDate);
     }
 
+    /**
+     * <p>
+     * Processes the contest sale.
+     * </p>
+     *
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param competition data that recognizes a contest.
+     * @param paymentData payment information (credit card/po details) that need to be processed.
+     * @param multiRoundEndDate the end date for registration phase.
+     * @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 a <code>SoftwareContestPaymentResult</code> result of the payment processing.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     * @since Module Contest Service Software Contest Sales Assembly
+     * @since 3.10
+     */
+    public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tcSubject,
+                                                                        SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData,
+                                                                        Date regEndDate, Date multiRoundEndDate, Date endDate)
+            throws ContestServiceException, PermissionServiceException {
+        logger.debug("processPurchaseOrderSale");
+
+        return processContestSaleInternal(tcSubject, competition, paymentData, regEndDate, multiRoundEndDate, endDate);
+    }
 
     /**
      * <p>
@@ -2262,13 +2294,38 @@ public SoftwareContestPaymentResult processContestPurchaseOrderSale(TCSubject tc
      * @since 1.8.5
      */
     public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TCSubject tcSubject,
-            SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData,
+                                                                                  SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData,
+                                                                                  Date multiRoundEndDate, Date endDate, boolean startSpecReviewNow) throws ContestServiceException,
+            PermissionServiceException, SpecificationReviewServiceException {
+        return purchaseActivateContestAndStartSpecReview(tcSubject, competition, paymentData, null, multiRoundEndDate, endDate, startSpecReviewNow);
+    }
+
+    /**
+     * <p>
+     * Processes the contest sale, activate the contest and start the specification review of the contest.
+     * </p>
+     *
+     * @param tcSubject TCSubject instance contains the login security info for the current user
+     * @param competition data that recognizes a contest.
+     * @param paymentData payment information (TCSubject tcSubject,credit card/po details) that need to be processed.
+     * @param regEndDate the end date for registration phase.
+     * @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.
+     * @param startSpecReviewNow the flag whether to start spec review now.
+     * @return a <code>PaymentResult</code> result of the payment processing.
+     * @throws ContestServiceException if an error occurs when interacting with the service layer.
+     * @throws PermissionServiceException if there is error when assigning permission to user.
+     * @throws SpecificationReviewServiceException if fail to start the spec review of the contest.
+     * @since 3.10
+     */
+    public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TCSubject tcSubject,
+            SoftwareCompetition competition, TCPurhcaseOrderPaymentData paymentData, Date regEndDate,
             Date multiRoundEndDate, Date endDate, boolean startSpecReviewNow) throws ContestServiceException,
             PermissionServiceException, SpecificationReviewServiceException {
 
         // purchase the contest and activate it
         final SoftwareContestPaymentResult softwareContestPaymentResult =
-                processContestSaleInternal(tcSubject, competition, paymentData, multiRoundEndDate, endDate);
+                processContestSaleInternal(tcSubject, competition, paymentData, regEndDate, multiRoundEndDate, endDate);
 
         // check if the contest has specification review phase
         final Set<com.topcoder.project.phases.Phase> allPhases =
@@ -2320,6 +2377,7 @@ public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TC
      * @param tcSubject TCSubject instance contains the login security info for the current user
      * @param competition data that recognizes a contest.
      * @param paymentData payment information (credit card/po details) that need to be processed.
+     * @param regEndDate the end date for registration phase.
      * @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 a <code>SoftwareContestPaymentResult</code> result of the payment processing.
@@ -2328,7 +2386,7 @@ public SoftwareContestPaymentResult purchaseActivateContestAndStartSpecReview(TC
      * @since BUGR-1682 changed return value
      */
     private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubject,
-            SoftwareCompetition competition, PaymentData paymentData, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
+            SoftwareCompetition competition, PaymentData paymentData, Date regEndDate, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
         logger.info("SoftwareCompetition: " + competition);
         logger.info("PaymentData: " + paymentData);
         logger.info("tcSubject: " + tcSubject.getUserId());
@@ -2364,13 +2422,13 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
 
             if (tobeUpdatedCompetition == null) {
                 tobeUpdatedCompetition =
-                    createSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), null, multiRoundEndDate, endDate);
+                    createSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), regEndDate, multiRoundEndDate, endDate);
                 competition.getProjectHeader().setProjectStatus(ProjectStatus.ACTIVE);
             } else {
                 competition.setProjectHeaderReason("User Update");
                 competition.getProjectHeader().setProjectStatus(ProjectStatus.ACTIVE);
                 tobeUpdatedCompetition =
-                    updateSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), null, multiRoundEndDate, endDate);
+                    updateSoftwareContest(tcSubject, competition, competition.getProjectHeader().getTcDirectProjectId(), regEndDate, multiRoundEndDate, endDate);
             }
 
             Project contest = tobeUpdatedCompetition.getProjectHeader();
diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/SaveDraftContestAction.java
@@ -1672,7 +1672,7 @@ private SoftwareCompetition activateSoftwareCompetition(SoftwareCompetition soft
         if (getSpecReviewStartMode() == null || !(getSpecReviewStartMode().equals(START_MODE_NOW) || getSpecReviewStartMode().equals(START_MODE_LATER))) {
             result = getContestServiceFacade().processContestPurchaseOrderSale(
                     getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition),
-                    checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime());
+                    regEndDate, checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime());
         } else {
             boolean startSpecReviewNow = false;
 
@@ -1681,7 +1681,7 @@ private SoftwareCompetition activateSoftwareCompetition(SoftwareCompetition soft
             }
 
             result = getContestServiceFacade().purchaseActivateContestAndStartSpecReview(
-                    getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition),
+                    getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition), regEndDate,
                     checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime(), startSpecReviewNow);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1672,7 +1672,7 @@ private SoftwareCompetition activateSoftwareCompetition(SoftwareCompetition soft`
`1672`	`1672`	`if (getSpecReviewStartMode() == null \|\| !(getSpecReviewStartMode().equals(START_MODE_NOW) \|\| getSpecReviewStartMode().equals(START_MODE_LATER))) {`
`1673`	`1673`	`result = getContestServiceFacade().processContestPurchaseOrderSale(`
`1674`	`1674`	`getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition),`
`1675`		`- checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime());`
	`1675`	`+ regEndDate, checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime());`
`1676`	`1676`	`} else {`
`1677`	`1677`	`boolean startSpecReviewNow = false;`
`1678`	`1678`
`@@ -1681,7 +1681,7 @@ private SoftwareCompetition activateSoftwareCompetition(SoftwareCompetition soft`
`1681`	`1681`	`}`
`1682`	`1682`
`1683`	`1683`	`result = getContestServiceFacade().purchaseActivateContestAndStartSpecReview(`
`1684`		`- getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition),`
	`1684`	`+ getCurrentUser(), softwareCompetition, getPaymentData(softwareCompetition), regEndDate,`
`1685`	`1685`	`checkpointDate, endDate == null ? null : endDate.toGregorianCalendar().getTime(), startSpecReviewNow);`
`1686`	`1686`	`}`
`1687`	`1687`