Merge pull request #162 from appirio-tech/dev

Tasks v1 and Review Scorecard Selection.  Also removes ASP features.

Author: ajefts

README.md

@@ -23,7 +23,6 @@ In this configuration, we'll run the direct app in a docker container locally bu
 2. Set the following environment variables:
 * TC_DEV_NAT_DIR : Local directory containing the pem file for accessing the dev NAT instance (used to create a tunnel to the dev informix instances)
 * TC_DIRECT_SRC_HOME : Local directory for the root direct-app directory
-* ASP_API_URL : Base URL for the ASP API (e.g., https://api.topcoder-dev.com)
 3. Run `docker-compose up` from the `docker` subdirectory containing the `docker-compose.yml` file
 
 

build-dependencies.xml

@@ -474,8 +474,6 @@
     <!-- slf4j -->
     <property name="slf4j.jar" value="${ext_libdir}/mime-util/slf4j-api-1.5.11.jar"/>
 
-    <property name="asp-client.jar" value="${ext_libdir}/aspclient/asp-client.jar"/>
-
 
     <!-- EJB/Persistence libraries -->
     <path id="ejb.libs">
@@ -626,10 +624,6 @@
         <pathelement location="${scorecard_management.jar}"/>
     </path>
 
-    <path id="aspclient.libs">
-        <fileset dir="${ext_libdir}/aspclient" includes="*.jar"/>
-    </path>
-
     <path id="component.3rdParty-dependencies">
         <path refid="struts.libs"/>
         <path refid="spring.libs"/>
@@ -661,7 +655,6 @@
         <pathelement location="${cxf.jar}"/>
 -->
         <pathelement location="${java-jwt-1.0.0.jar}"/>
-        <pathelement location="${asp-client.jar}"/>
     </path>
 
 </project>

build.xml

@@ -294,12 +294,6 @@
 <!--
         <copy file="${jsr311.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${cxf.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
--->
-        <copy file="${asp-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy todir="${ear_shared_libdir}" overwrite="true">
-            <fileset dir="${ext_libdir}/aspclient" includes="*.jar"/>
-        </copy>
-<!--
         <copy file="${aopalliance-1.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${geronimo-jaxws_2.2_spec-1.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${geronimo-annotation_1.0_spec-1.1.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

components/online_review_upload_services/src/java/main/com/cronos/onlinereview/services/uploads/UploadExternalServices.java

@@ -8,6 +8,7 @@
 
 import javax.activation.DataHandler;
 import java.rmi.RemoteException;
+import java.util.Set;
 
 /**
  * <p>
@@ -20,11 +21,17 @@
  * </p>
  *
  * <p>
+ *     Version 1.1.3 (TOPCODER DIRECT - IMPROVEMENT FOR PRE-REGISTER MEMBERS WHEN LAUNCHING CHALLENGES):
+ *     <ol>
+ *         <li>Added {@link #removeSubmitters(long, Set, String)} method</li>
+ *     </ol>
+ * </p>
+ * <p>
  * Thread safety: the implementations must be thread safe.
  * </p>
  *
  * @author fabrizyo, saarixx, cyberjag, TCSDEVELOPER
- * @version 1.1
+ * @version 1.1.3
  * @since 1.0
  */
 public interface UploadExternalServices {
@@ -204,4 +211,30 @@ long addSubmitter(long projectId, long userId)
      * @since 1.1.1
      */
     Resource addPrimaryScreener(long projectId, long userId) throws UploadServicesException, PhaseManagementException;
+
+    /**
+     * Remove all submitters for a given project
+     *
+     * @param projectId the project id
+     * @param operator  user whos added
+     * @return
+     * @throws InvalidProjectException
+     * @throws UploadServicesException
+     * @throws InvalidUserException
+     * @throws InvalidProjectPhaseException
+     * @since 1.1.2
+     */
+    Set<Long> removeAllSubmitters(long projectId, String operator) throws UploadServicesException;
+
+    /**
+     * Remove submitters from given project
+     *
+     * @param projectId the project id
+     * @param users set of user id
+     * @param operator user who is added it
+     * @return
+     * @throws UploadServicesException
+     * @since 1.1.3
+     */
+    Set<Long> removeSubmitters(long projectId, Set<Long> users, String operator)throws UploadServicesException;
 }

components/online_review_upload_services/src/java/main/com/cronos/onlinereview/services/uploads/UploadServices.java

@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2007-2010 TopCoder Inc., All Rights Reserved.
+ * Copyright (C) 2007-2016 TopCoder Inc., All Rights Reserved.
  */
 package com.cronos.onlinereview.services.uploads;
 
 import com.topcoder.management.phase.PhaseManagementException;
 import com.topcoder.management.resource.Resource;
 
+import java.util.Set;
+
 
 /**
  * <p>
@@ -27,8 +29,20 @@
  * Thread safety: the implementations must be thread safe.
  * </p>
  *
+ * <p>
+ *     Version 1.1.2 (Provide Way To Pre_register members When Launching Challenge)
+ *     <ol>
+ *         <li>Added {@link #removeAllSubmitters(long, String)} method</li>
+ *     </ol>
+ * </p>
+ * <p>
+ *     Version 1.1.3 (TOPCODER DIRECT - IMPROVEMENT FOR PRE-REGISTER MEMBERS WHEN LAUNCHING CHALLENGES):
+ *     <ol>
+ *         <li>Added {@link #removeSubmitters(long, Set, String)} method</li>
+ *     </ol>
+ * </p>
  * @author fabrizyo, saarixx, cyberjag, TCSDEVELOPER
- * @version 1.1.1
+ * @version 1.1.3
  * @since 1.0
  */
 public interface UploadServices {
@@ -37,7 +51,7 @@ public interface UploadServices {
      * <p>
      * Adds a new submission for an user in a particular project.
      * </p>
-     *
+     * <p/>
      * <p>
      * If the project allows multiple submissions for users, it will add the new submission and return. If multiple
      * submission are not allowed for the project firstly, it will add the new submission, secondly mark previous
@@ -47,9 +61,7 @@ public interface UploadServices {
      * @param projectId the project's id
      * @param userId    the user's id
      * @param filename  the file name to use
-     *
      * @return the id of the new submission
-     *
      * @throws InvalidProjectException      if the project does not exist
      * @throws InvalidProjectPhaseException if neither Submission or Screening phase are opened
      * @throws InvalidUserException         if the user does not exist or has not the submitter role
@@ -69,9 +81,7 @@ public interface UploadServices {
      * @param projectId the project's id
      * @param userId    the user's id
      * @param filename  the file name to use
-     *
      * @return the id of the created final fix submission.
-     *
      * @throws InvalidProjectException      if the project does not exist
      * @throws InvalidProjectPhaseException if Final Fix phase is not opened
      * @throws InvalidUserException         if the user does not exist or she/he is not winner submitter
@@ -91,9 +101,7 @@ public interface UploadServices {
      * @param projectId the project's id
      * @param userId    the user's id
      * @param filename  the file name to use
-     *
      * @return the id of the created test cases submission
-     *
      * @throws InvalidProjectException      if the project does not exist
      * @throws InvalidProjectPhaseException if Review phase is not opened
      * @throws InvalidUserException         if the user does not exist or has not the reviewer role
@@ -110,9 +118,7 @@ public interface UploadServices {
      * @param projectId the project's id
      * @param userId    the user's id.
      * @param filename  the file name to use.
-     *
      * @return the id of the new submission.
-     *
      * @throws InvalidProjectException      if the project doesn't exist.
      * @throws InvalidProjectPhaseException if Specification Submission phase is not opened.
      * @throws InvalidUserException         if the user doesn't exist or hasn't the Specification Submitter role.
@@ -131,26 +137,22 @@ public interface UploadServices {
      * @param submissionId       the submission's id
      * @param submissionStatusId the submission status id
      * @param operator           the operator which execute the operation
-     *
-     * @throws InvalidSubmissionException if the submission does not exist
-     * @throws InvalidSubmissionStatusException
-     *                                    if the submission status does not exist
-     * @throws PersistenceException       if some error occurs in persistence layer
-     * @throws IllegalArgumentException   if any id is &lt; 0 or if operator is null or trim to empty
+     * @throws InvalidSubmissionException       if the submission does not exist
+     * @throws InvalidSubmissionStatusException if the submission status does not exist
+     * @throws PersistenceException             if some error occurs in persistence layer
+     * @throws IllegalArgumentException         if any id is &lt; 0 or if operator is null or trim to empty
      * @since 1.0
      */
     void setSubmissionStatus(long submissionId, long submissionStatusId, String operator)
-         throws InvalidSubmissionException, InvalidSubmissionStatusException, PersistenceException;
+            throws InvalidSubmissionException, InvalidSubmissionStatusException, PersistenceException;
 
 
     /**
      * Adds the given user as a new submitter to the given project id.
      *
      * @param projectId the project to which the user needs to be added
      * @param userId    the user to be added
-     *
      * @return the added resource id
-     *
      * @throws InvalidProjectException      if the project id is unknown
      * @throws InvalidUserException         if the user id is unknown
      * @throws InvalidProjectPhaseException if the phase of the project is not Registration.
@@ -171,7 +173,7 @@ long addSubmitter(long projectId, long userId) throws InvalidProjectException,
      * @throws InvalidUserException         if the user id is unknown
      * @throws InvalidProjectPhaseException if the phase of the project is not Registration.
      * @throws UploadServicesException      if any error occurs from UploadServices
-     * @throws PhaseManagementException if an unexpected error occurs.
+     * @throws PhaseManagementException     if an unexpected error occurs.
      * @throws IllegalArgumentException     if any id is &lt; 0
      * @since 1.1.1
      */
@@ -187,9 +189,35 @@ long addSubmitter(long projectId, long userId) throws InvalidProjectException,
      * @throws InvalidUserException         if the user id is unknown
      * @throws InvalidProjectPhaseException if the phase of the project is not Registration.
      * @throws UploadServicesException      if any error occurs from UploadServices
-     * @throws PhaseManagementException if an unexpected error occurs.
+     * @throws PhaseManagementException     if an unexpected error occurs.
      * @throws IllegalArgumentException     if any id is &lt; 0
      * @since 1.1.1
      */
     Resource addPrimaryScreener(long projectId, long userId) throws UploadServicesException, PhaseManagementException;
-}
+
+    /**
+     * Remove all submitters for a given project
+     *
+     * @param projectId the project id
+     * @param operator  user whos added
+     * @return
+     * @throws InvalidProjectException
+     * @throws UploadServicesException
+     * @throws InvalidUserException
+     * @throws InvalidProjectPhaseException
+     * @since 1.1.2
+     */
+    Set<Long> removeAllSubmitters(long projectId, String operator) throws UploadServicesException;
+
+    /**
+     * Remove submitters from given project
+     *
+     * @param projectId the project id
+     * @param users set of user id
+     * @param operator user who is added it
+     * @return
+     * @throws UploadServicesException
+     * @since 1.1.3
+     */
+    Set<Long> removeSubmitters(long projectId, Set<Long> users, String operator)throws UploadServicesException;
+}

components/online_review_upload_services/src/java/main/com/cronos/onlinereview/services/uploads/impl/DefaultUploadExternalServices.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 TopCoder Inc., All Rights Reserved.
+ * Copyright (C) 2007-2016 TopCoder Inc., All Rights Reserved.
  */
 package com.cronos.onlinereview.services.uploads.impl;
 
@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.rmi.RemoteException;
 import java.text.MessageFormat;
+import java.util.Set;
 
 /**
  * <p>
@@ -68,12 +69,19 @@
  *   </ol>
  * </p>
  * <p>
+ *
+ * <p>
+ * Version 1.1.3 (TOPCODER DIRECT - IMPROVEMENT FOR PRE-REGISTER MEMBERS WHEN LAUNCHING CHALLENGES):
+ * <ul>
+ *     <li>Added {@link #removeSubmitters(long, Set, String)} method</li>
+ * </ul>
+ * </p>
  * Thread safe: The thread safety is completely relied to the uploadServices implementation because it's impossible
  * to change the other variables
  * </p>
  *
  * @author fabrizyo, saarixx, cyberjag, TCSDEVELOPER
- * @version 1.1.1
+ * @version 1.1.3
  * @since 1.0
  */
 public class DefaultUploadExternalServices implements UploadExternalServices {
@@ -574,4 +582,44 @@ private static void close(Closeable closeable) {
             // ignores exception
         }
     }
+
+    /**
+     * Remove all submitters for a given project
+     *
+     * @param projectId the project id
+     * @param operator  user whos added
+     * @return
+     * @throws InvalidProjectException
+     * @throws UploadServicesException
+     * @throws InvalidUserException
+     * @throws InvalidProjectPhaseException
+     * @since 1.1.2
+     */
+    public Set<Long> removeAllSubmitters(long projectId, String operator) throws UploadServicesException{
+        Helper.logFormat(LOG, Level.DEBUG, "Entered DefaultUploadExternalServices#removeAllSubmitters(long, string)");
+        try {
+            return uploadServices.removeAllSubmitters(projectId, operator);
+        } finally {
+            Helper.logFormat(LOG, Level.DEBUG, "Exited DefaultUploadExternalServices#removeAllSubmitters(long, string)");
+        }
+    }
+
+    /**
+     * Remove submitters from given project
+     *
+     * @param projectId the project id
+     * @param users set of user id
+     * @param operator user who is added it
+     * @return
+     * @throws UploadServicesException
+     * @since 1.1.3
+     */
+    public Set<Long> removeSubmitters(long projectId, Set<Long> users, String operator) throws UploadServicesException {
+        Helper.logFormat(LOG, Level.DEBUG, "Entered DefaultUploadExternalServices#removeSubmitters(long, Set, string)");
+        try{
+            return uploadServices.removeSubmitters(projectId, users, operator);
+        }finally {
+            Helper.logFormat(LOG, Level.DEBUG, "Exited DefaultUploadExternalServices#removeSubmitters(long, Set, string)");
+        }
+    }
 }