Merge pull request #527 from Schpotsky/no-forum-for-task

no forum generation for private task

Author: ajefts

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

@@ -4059,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());
+            }
           }
         }
       }
@@ -5532,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();
@@ -5552,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);

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