Merge pull request #525 from appirio-tech/dev

Fix for adding user to task when group is assigned

Author: mtwomey

conf/ApplicationServer.properties

@@ -45,4 +45,6 @@ SSO_HASH_SECRET = @ApplicationServer.SSO_HASH_SECRET@
 SSO_DOMAIN = @ApplicationServer.SSO_DOMAIN@
 
 JWT_V3_COOKIE_KEY = @ApplicationServer.JWT_V3_COOKIE_KEY@
-JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
+JWT_COOKIE_KEY = @ApplicationServer.JWT_COOKIE_KEY@
+
+TOPCODER_CONNECT_URL=@TopcoderConnectUrl@

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

@@ -2354,6 +2354,22 @@ private XMLGregorianCalendar getXMLGregorianCalendar(Date date) {
     }
   }
 
+  /**
+   * <p>
+   * Adds the specified number of minutes to the given date and returns the result.
+   * </p>
+   * 
+   * @param date The Date to which to add the given minutes amount
+   * @param minutes The number of minutes to add to the given date (Can be negative)
+   * @return The resulting date = input date + number of minutes
+   */
+  private Date addMinutesToDate(Date date, int minutes) {
+    Calendar cal = Calendar.getInstance();
+    cal.setTime(date);
+    cal.add(Calendar.MINUTE, minutes);
+    return cal.getTime();
+  }
+
   /**
    * <p>
    * Processes the contest sale.
@@ -4043,13 +4059,18 @@ else if (isDevContest) {
         if (useExistingAsset && assetDTO.getForum() != null) {
           forumId = assetDTO.getForum().getJiveCategoryId();
         } else {
-          if (!isStudio(contest)) {
-            // software contest
-            forumId = createForum(tcSubject, assetDTO, tcSubject.getUserId(),
-                contest.getProjectHeader().getProjectCategory().getId());
+          if(isPrivateProject(contest)) { // no forum to be created for private tasks
+            logger.debug("Skip forum creation for private task: "+assetDTO.getName());
+            forumId = -1;
           } else {
-            // studio contest
-            forumId = createStudioForum(assetDTO.getName(), tcSubject.getUserId());
+            if (!isStudio(contest)) {
+              // software contest
+              forumId = createForum(tcSubject, assetDTO, tcSubject.getUserId(),
+                  contest.getProjectHeader().getProjectCategory().getId());
+            } else {
+              // studio contest
+              forumId = createStudioForum(assetDTO.getName(), tcSubject.getUserId());
+            }
           }
         }
       }
@@ -5516,8 +5537,9 @@ public Set<Long> updatePreRegister(TCSubject tcSubject, SoftwareCompetition cont
 
       removedUsers = uploadExternalServices.removeSubmitters(contest.getId(), removedUsers,
           String.valueOf(tcSubject.getUserId()));
-      // remove forum
-      if (createForum) {
+      // remove forum user permissions for public projects.
+      // private tasks do not have forums created
+      if (createForum && !isPrivateProject(contest)) {
         try {
           forumId = contest.getAssetDTO().getForum().getJiveCategoryId();
           forum = getSoftwareForums();
@@ -5536,7 +5558,7 @@ public Set<Long> updatePreRegister(TCSubject tcSubject, SoftwareCompetition cont
       for (Long member : preRegisterMembers) {
         try {
           this.addSubmitter(tcSubject, contest.getId(), member);
-          if (createForum) {
+          if (createForum && !isPrivateProject(contest)) {
             forum.assignRole(member, userRoleId);
           }
           addedUsers.add(member);
@@ -9862,25 +9884,30 @@ public void closeSoftwareContest(TCSubject tcSubject, long projectId, long winne
       DataHandler dataHandler = new DataHandler(new FileDataSource(mockSubmissionFilePath + mockSubmissionFileName));
       long submissionId = uploadSubmission(winnerId, contest.getId(), mockSubmissionFileName, dataHandler);
 
-      // close submission and review phase
+      Date currentDate = new Date();
+      // subtract one minute from the current date
+      // this will be used to set the registration start/end dates
+      Date oneMinuteEarlier = addMinutesToDate(currentDate, -1);
+
+      // close registration, submission and review phases
       com.topcoder.project.phases.Phase submissionPhase = null;
       com.topcoder.project.phases.Phase reviewPhase = null;
       for (com.topcoder.project.phases.Phase phase : phases) {
         if (PROJECT_SUBMISSION_PHASE_NAME.equals(phase.getPhaseType().getName())) {
           if (phaseNeedToUpdate && !phaseHasClosed) {
             // submission is scheduled
-            phase.setActualStartDate(new Date());
-            phase.setActualEndDate(new Date());
+            phase.setActualStartDate(currentDate);
+            phase.setActualEndDate(currentDate);
           } else if (!phaseNeedToUpdate) {
             // phase already open
-            phase.setActualEndDate(new Date());
+            phase.setActualEndDate(currentDate);
           }
           phase.setPhaseStatus(PhaseStatus.CLOSED);
           submissionPhase = phase;
         } else if (PROJECT_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName())
             || PROJECT_ITERATIVE_REVIEW_PHASE_NAME.equals(phase.getPhaseType().getName())) {
           if (phase.getPhaseStatus().getId() == PhaseStatus.SCHEDULED.getId()) {
-            phase.setActualStartDate(new Date());
+            phase.setActualStartDate(currentDate);
             phase.setScheduledEndDate(null);
             phase.setScheduledStartDate(phase.calcStartDate());
             phase.setScheduledEndDate(phase.calcEndDate());
@@ -9890,6 +9917,21 @@ public void closeSoftwareContest(TCSubject tcSubject, long projectId, long winne
             // skiping closed iterative review
             reviewPhase = phase;
           }
+        } else if (PROJECT_REGISTRATION_PHASE_NAME.equals(phase.getPhaseType().getName())) {
+          if (phase.getActualStartDate() != null) {
+            // The registration phase is already started, we only need to set the end date if not set already
+            // The actual end date is set to one minute earlier than the submission phase
+            // This will ensure that the phases are shown in the correct order in Online Review
+            if(phase.getActualEndDate() == null ) {
+              phase.setActualEndDate(oneMinuteEarlier);
+            }
+          } else {
+            // The registration phase is not opened yet (start date is in the future)
+            phase.setActualStartDate(oneMinuteEarlier);
+            phase.setActualEndDate(oneMinuteEarlier);
+          }
+          // Set the registration status to closed
+          phase.setPhaseStatus(PhaseStatus.CLOSED);
         }
       }
       projectPhases.setPhases(new HashSet<com.topcoder.project.phases.Phase>(Arrays.asList(phases)));

src/java/main/com/topcoder/direct/services/configs/ServerConfiguration.java

@@ -58,4 +58,9 @@ public class ServerConfiguration extends ApplicationServer {
     public static String JWT_V3_COOKIE_KEY = bundle.getProperty("JWT_V3_COOKIE_KEY", "v3jwt");
 
     public static String JWT_COOKIE_KEY = bundle.getProperty("JWT_COOKIE_KEY", "tcjwt");
+
+    /**
+     * The Topcoder Connect URL
+     */
+    public static String TOPCODER_CONNECT_URL = bundle.getProperty("TOPCODER_CONNECT_URL", "https://connect.topcoder.com");
 }

src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java

@@ -232,7 +232,7 @@ private List<GroupMember> getGroupMemberByGid(String gid) throws Exception {
                 }
 
                 jsonNode = objectMapper.readTree(entity.getContent());
-                List<GroupMember> groupMembers = objectMapper.readValue(jsonNode.path("result"),
+                List<GroupMember> groupMembers = objectMapper.readValue(jsonNode,
                         new TypeReference<List<GroupMember>>(){});
                 for (GroupMember groupMember : groupMembers) {
                     result.add(groupMember);

src/web/WEB-INF/includes/launch/contestSelection.jsp

@@ -133,9 +133,11 @@
                 </s:iterator>
               </select>
           </div>
+          <!-- Removing ability to create Direct Project
           <div class="addNew addNewBilling">
               <a href="javascript:;" class="button6" id="addNewProject"><span class="left"><span class="right">ADD NEW</span></span></a>
           </div>
+          -->
       </div>
 
       <!-- MM Type -->

src/web/WEB-INF/includes/newHeader.jsp

@@ -25,15 +25,17 @@
   -
   - Version 1.7 (TOPCODER - REMOVE TASKS TAB IN DIRECT APP)
   - - Remove tasks tab
-  -
-  - Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0)
-  - remove the vm related things
+  -
+  - Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0)
+  - remove the vm related things
   -
   - Description: The new cockpit header and navigation.
 --%>
 <%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
+<c:set var="TCConnectURL" value="<%=ServerConfiguration.TOPCODER_CONNECT_URL%>"/>
+
 <!-- topcoder maintenance module -->
 <div id="topcoder-maintenance-notification">
     <div class="content">
@@ -132,7 +134,7 @@
 
         <ul>
             <li>
-                <a class="first" href="<s:url action="createNewProject" namespace="/"/>">Start New</a>
+                <a class="first" href="${TCConnectURL}" target="_blank">Start New</a>
             </li>
             <s:if test="%{#session.currentSelectDirectProjectID > 0 && sessionData.currentProjectContext.name != null}">
                 <input type="hidden" name="topNavCurrentProjectId" value="<s:property value='%{#session.currentSelectDirectProjectID}'/>"/>
@@ -422,7 +424,7 @@
         <c:if test="${requestScope.CURRENT_TAB eq 'enterprise' and !requestScope.NO_ENTERPRISE_DASHBOARD_TOP}">
             <div class="topBtns" id="enterpriseDashboardTop">
                 <a href="${ctx}/copilot/launchCopilotContest" class="copilot" title="Finds a TopCoder Copilot for your project">Get a Copilot</a>
-                <a href="<s:url action="createNewProject" namespace="/"/>" class="start" title="Starts a new project">Start a Project</a>
+                <a href="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start a Project</a>
                 <a href="${ctx}/launch/home" class="launch" title="Launch a new challenge for your project">Launch Challenge</a>
             </div>
         </c:if>

src/web/WEB-INF/includes/right.jsp

@@ -32,16 +32,18 @@
   - the data via ajax.
   -
 --%>
+<%@ page import="com.topcoder.direct.services.configs.ServerConfiguration" %>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
+<c:set var="TCConnectURL" value="<%=ServerConfiguration.TOPCODER_CONNECT_URL%>"/>
+
 <div id="area2" class="dashboardPage"><!-- the right column -->
 
     <div class="newSidebar">
         <div class="topBtns">
             <a href="${ctx}/copilot/launchCopilotContest" class="copilot"
                title="Finds a TopCoder Copilot for your project">Get a Copilot</a>
-            <a href="<s:url action="createNewProject" namespace="/"/>" class="start" title="Starts a new project">Start
-            a Project</a>
+               <a href="${TCConnectURL}" target="_blank" class="start" title="Starts a new project">Start a Project</a>
             <a href="${ctx}/launch/home" class="launch" title="Launch a new challenge for your project">Launch
                 Challenge</a>
         </div>

token.properties.docker

@@ -105,7 +105,7 @@
 @payFlowPartner@=PayPal
 @payFlowVendor@=tcTestAccount2
 @payFlowPassword@=password123
-@createForum@=false
+@createForum@=true
 
 @userBeanProviderUrl@=jnp://localhost:1199
 @projectBeanProviderUrl@=jnp://localhost:1199
@@ -322,7 +322,7 @@
 @DOMAIN_AUTH0@ = sma.auth0.com
 @CLIENT_ID_AUTH0@ =
 @CLIENT_SECRET_AUTH0@ =
-@JWT_V3_SECRET@ =
+@JWT_V3_SECRET@ = secret
 @REG_SERVER_NAME@= tc.cloud.topcoder.com
 @LDAP_AUTH0_CONNECTION_NAME@=vm-ldap-connection
 @JWT_VALID_ISSUERS@ = https://api.topcoder.com, https://sma.auth0.com, https://newtc.auth0.com, https://topcoder-newauth.auth0.com/
@@ -337,16 +337,19 @@
 @ApplicationServer.JWT_COOKIE_KEY@=tcjwt_vm
 @ApplicationServer.JWT_V3_COOKIE_KEY@=v3jwt
 
-@memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_suggest/
+@memberSearchApiUrl@=http://cockpit.cloud.topcoder.com:8443/v3/members/_suggest/
 @groupMemberSearchApiUrl@=https://cockpit.cloud.topcoder.com/direct/group/member?handle=
-@groupMemberApiUrl@=http://tc-api.cloud.topcoder.com:8080/v3/groups/%d/members
+@groupMemberApiUrl@=http://192.168.1.3:4000/v5/groups/%s/members
 @directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
 @authorizationUrl@=https://api.topcoder-dev.com/v3/authorizations
-@userGroupsApiEndpoint@=http://tc-api.cloud.topcoder.com:3000/api/v5/groups
+@userGroupsApiEndpoint@=http://192.168.1.3:4000/v5/groups
 
 @aws_s3_bucket@=topcoder-dev-submissions
 @aws_s3_access_key@=
 @aws_s3_secret_key@=
 
 @trialBillingId@ =
-@defaultGroupIdForTrial@ =
+@defaultGroupIdForTrial@ =
+
+# The Topcoder Connect Url to which the projects creation will redirect
+@TopcoderConnectUrl@=https://connect.topcoder-dev.com

token.properties.example

@@ -397,4 +397,7 @@
 @authorizationUrl@=http://api.topcoder-dev.com/v3/authorizations
 @userGroupsApiEndpoint@=http://172.18.0.1:8080/v3/groups
 @trialBillingId@ = 3
-@defaultGroupIdForTrial@ = 12347
+@defaultGroupIdForTrial@ = 12347
+
+# The Topcoder Connect Url to which the projects creation will redirect
+@TopcoderConnectUrl@=https://connect.topcoder.com