improve group selection

Author: deedee

conf/web/WEB-INF/applicationContext.xml

@@ -425,6 +425,7 @@
     <bean id="saveDraftContestAction"
           class="com.topcoder.direct.services.view.action.contest.launch.SaveDraftContestAction"
           parent="contestAction" scope="prototype">
+        <property name="userGroupsApiEndpoint" value="@userGroupsApiEndpoint@"/>
     </bean>
 
     <bean id="documentUploadAction" class="com.topcoder.direct.services.view.action.contest.launch.DocumentUploadAction"

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

@@ -3,16 +3,10 @@
  */
 package com.topcoder.direct.services.view.action.contest.launch;
 
-import java.net.URI;
-import java.util.*;
-
 import com.topcoder.clients.model.Project;
 import com.topcoder.clients.model.ProjectContestFee;
 import com.topcoder.clients.model.ProjectContestFeePercentage;
-import com.topcoder.direct.services.configs.AlgorithmSubtypeContestFee;
 import com.topcoder.direct.services.configs.ConfigUtils;
-import com.topcoder.direct.services.configs.ContestFee;
-import com.topcoder.direct.services.configs.StudioSubtypeContestFee;
 import com.topcoder.direct.services.project.metadata.entities.dao.DirectProjectAccess;
 import com.topcoder.direct.services.project.milestone.model.Milestone;
 import com.topcoder.direct.services.project.milestone.model.MilestoneStatus;
@@ -21,28 +15,20 @@
 import com.topcoder.direct.services.view.dto.IdNamePair;
 import com.topcoder.direct.services.view.dto.contest.ContestCopilotDTO;
 import com.topcoder.direct.services.view.dto.contest.ProblemDTO;
-import com.topcoder.direct.services.view.dto.contest.TypedContestBriefDTO;
 import com.topcoder.direct.services.view.dto.contest.ReviewScorecardDTO;
+import com.topcoder.direct.services.view.dto.contest.TypedContestBriefDTO;
 import com.topcoder.direct.services.view.util.AuthorizationProvider;
 import com.topcoder.direct.services.view.util.DataProvider;
 import com.topcoder.direct.services.view.util.DirectUtils;
-import com.topcoder.direct.services.view.util.JwtTokenUpdater;
 import com.topcoder.direct.services.view.util.challenge.CostCalculationService;
+import com.topcoder.management.project.ProjectGroup;
 import com.topcoder.security.TCSubject;
 import com.topcoder.service.facade.contest.ContestServiceException;
 import com.topcoder.service.facade.project.DAOFault;
-import com.topcoder.util.log.Level;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
-import com.topcoder.management.project.ProjectGroup;
+
+import java.util.*;
 
 /**
  * <p>
@@ -137,15 +123,10 @@ public class CommonAction extends BaseContestFeeAction {
 
     private long categoryId;
 
-    private String userGroupsApiEndpoint;
-
     /**
-     * The jackson object mapping which is used to deserialize json return from API to domain model.
+     * Endpoint to group of a user
      */
-    protected static final ObjectMapper objectMapper;
-    static {
-        objectMapper = new ObjectMapper();
-    }
+    private String userGroupsApiEndpoint;
 
     /**
      * <p>
@@ -577,40 +558,8 @@ public void setCategoryId(long categoryId) {
     public String getGroups()  {
         try {
             TCSubject tcSubject = DirectUtils.getTCSubjectFromSession();
-            URIBuilder uri = new URIBuilder(userGroupsApiEndpoint);
-
-            if (!DirectUtils.isCockpitAdmin(tcSubject) && !DirectUtils.isTcStaff(tcSubject)) {
-                uri.setParameter("memberId", String.valueOf(tcSubject.getUserId()));
-            }
-
-            DefaultHttpClient httpClient = new DefaultHttpClient();
-
-            HttpGet getRequest = new HttpGet(uri.build());
-            getLogger().log(Level.INFO, "Getting Group with thi uri: " + uri.build().toString());
-
-            String v3Token = new JwtTokenUpdater().check().getToken();
-
-            getRequest.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + v3Token);
-
-            getRequest.addHeader(HttpHeaders.ACCEPT, "application/json");
-            HttpResponse httpResponse = httpClient.execute(getRequest);
-
-            HttpEntity entity = httpResponse.getEntity();
-
-            if (httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-                throw new Exception("Unable to get groups from the API:" + httpResponse.getStatusLine().getReasonPhrase());
-            }
-
-            JsonNode result = objectMapper.readTree(entity.getContent());
-            JsonNode groups = result.path("result").path("content");
-            Set<Map<String, String>> groupResults = new HashSet<Map<String, String>>();
-            for (JsonNode group : groups) {
-                Map<String,String> gr = new HashMap<String, String>();
-                gr.put("id", group.get("id").asText());
-                gr.put("name", group.get("name").asText());
-                groupResults.add(gr);
-            }
-            setResult(groupResults);
+            Set<ProjectGroup> projectGroups = DirectUtils.getGroups(tcSubject, userGroupsApiEndpoint);
+            setResult(projectGroups);
         } catch (Throwable e) {
             if (getModel() != null) {
                 setResult(e);

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

@@ -742,6 +742,11 @@ public class SaveDraftContestAction extends ContestAction {
      */
     private Double customCopilotFee;
 
+    /**
+     * Endpoint to group of a user
+     */
+    private String userGroupsApiEndpoint;
+
     /**
      * <p>
      * Creates a <code>SaveDraftContestAction</code> instance.
@@ -1066,25 +1071,15 @@ public boolean evaluate(Object object) {
             populateSoftwareCompetition(softwareCompetition);
         }
 
-        //set groups
-        List<ProjectGroup> groupsList = new ArrayList<ProjectGroup>();
-        //read-only group we need to set it with current group
-        if (!DirectUtils.isRole(getCurrentUser(), ADMIN_ROLE) && !DirectUtils.isRole(getCurrentUser(), TC_STAFF_ROLE) && projectId > 0) {
-            groupsList = getContestServiceFacadeWithISE().getGroupForContest(projectId, false);
-            groups = null;
-        }
+        //do backend validation for groups here
+        List<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
         if (groups != null && groups.size() > 0) {
-            // get the TCSubject from session
-            ProjectGroup[] allProjectGroups = getContestServiceFacade().getAllProjectGroups(DirectStrutsActionsHelper.getTCSubjectFromSession());
             for (String groupId : groups) {
-                for (ProjectGroup projectGroup : allProjectGroups) {
-                    if (Long.valueOf(groupId).equals(projectGroup.getId())) {
-                        groupsList.add(projectGroup);
-                    }
-                }
+                projectGroups.add(new ProjectGroup(Long.valueOf(groupId), ""));
             }
         }
-        softwareCompetition.getProjectHeader().setGroups(groupsList);
+
+        softwareCompetition.getProjectHeader().setGroups(projectGroups);
 
         // remove the thurgood information if needed
         if(softwareCompetition.getProjectHeader().getProperties().containsKey(THURGOOD_PLATFORM_KEY)) {
@@ -2565,6 +2560,14 @@ public void setPreRegisterUsers(String preRegisterUsers) {
         this.preRegisterUsers = preRegisterUsers;
     }
 
+    public String getUserGroupsApiEndpoint() {
+        return userGroupsApiEndpoint;
+    }
+
+    public void setUserGroupsApiEndpoint(String userGroupsApiEndpoint) {
+        this.userGroupsApiEndpoint = userGroupsApiEndpoint;
+    }
+
     /**
      * Pre-Register users to a given project
      *

src/java/main/com/topcoder/direct/services/view/util/DirectUtils.java

@@ -16,18 +16,9 @@
 import com.topcoder.direct.services.project.metadata.entities.dao.DirectProjectMetadata;
 import com.topcoder.direct.services.view.action.AbstractAction;
 import com.topcoder.direct.services.view.action.BaseDirectStrutsAction;
-import com.topcoder.direct.services.view.dto.contest.TermOfUse;
 import com.topcoder.direct.services.view.action.specreview.ViewSpecificationReviewActionResultData;
 import com.topcoder.direct.services.view.dto.IdNamePair;
-import com.topcoder.direct.services.view.dto.contest.BaseContestCommonDTO;
-import com.topcoder.direct.services.view.dto.contest.ContestBriefDTO;
-import com.topcoder.direct.services.view.dto.contest.ContestDashboardDTO;
-import com.topcoder.direct.services.view.dto.contest.ContestRoundType;
-import com.topcoder.direct.services.view.dto.contest.ContestStatsDTO;
-import com.topcoder.direct.services.view.dto.contest.ContestStatus;
-import com.topcoder.direct.services.view.dto.contest.PhasedContestDTO;
-import com.topcoder.direct.services.view.dto.contest.ProjectPhaseDTO;
-import com.topcoder.direct.services.view.dto.contest.ProjectPhaseType;
+import com.topcoder.direct.services.view.dto.contest.*;
 import com.topcoder.direct.services.view.dto.cost.CostDTO;
 import com.topcoder.direct.services.view.dto.project.ProjectBriefDTO;
 import com.topcoder.direct.services.view.interceptor.SecurityGroupsAccessInterceptor;
@@ -73,15 +64,26 @@
 import com.topcoder.shared.util.DBMS;
 import com.topcoder.shared.util.dwload.CacheClearer;
 import com.topcoder.web.common.CachedDataAccess;
+import com.topcoder.web.common.cache.CacheClient;
+import com.topcoder.web.common.cache.CacheClientFactory;
 import com.topcoder.web.common.cache.MaxAge;
 import eu.medsea.mimeutil.MimeType;
 import eu.medsea.mimeutil.MimeUtil;
 import org.apache.axis.encoding.Base64;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.log4j.Logger;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.util.TokenHelper;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -95,38 +97,15 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.channels.FileLock;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
+import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@@ -952,6 +931,14 @@ public final class DirectUtils {
     private static final String QUERY_GET_SECURITY_GROUP_FROM_ID = "SELECT group_id, description FROM security_groups " +
             " WHERE group_id in (";
 
+    /**
+     * The jackson object mapping which is used to deserialize json return from API to domain model.
+     */
+    protected static final ObjectMapper objectMapper;
+    static {
+        objectMapper = new ObjectMapper();
+    }
+
     /**
      * <p>
      * Default Constructor.
@@ -3832,4 +3819,76 @@ public static List<ProjectGroup> getGroupIdAndName(List<ProjectGroup> projectGro
             DatabaseUtils.close(con);
         }
     }
+
+    /**
+     * Get group from group API.
+     *
+     * @param tcSubject tcSubject of user
+     * @param endpoint endpoint url
+     * @return set of group
+     * @throws Exception
+     */
+    public static Set<ProjectGroup> getGroupsFromApi(TCSubject tcSubject, String endpoint) throws Exception {
+        URIBuilder uri = new URIBuilder(endpoint);
+
+        if (!DirectUtils.isCockpitAdmin(tcSubject) && !DirectUtils.isTcStaff(tcSubject)) {
+            uri.setParameter("memberId", String.valueOf(tcSubject.getUserId()));
+        }
+
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+
+        HttpGet getRequest = new HttpGet(uri.build());
+        logger.info("Getting Group with thi uri: " + uri.build().toString());
+
+        String v3Token = new JwtTokenUpdater().check().getToken();
+
+        getRequest.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + v3Token);
+
+        getRequest.addHeader(HttpHeaders.ACCEPT, "application/json");
+        HttpResponse httpResponse = httpClient.execute(getRequest);
+
+        HttpEntity entity = httpResponse.getEntity();
+
+        if (httpResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+            throw new Exception("Unable to get groups from the API:" + httpResponse.getStatusLine().getReasonPhrase());
+        }
+
+        JsonNode result = objectMapper.readTree(entity.getContent());
+        JsonNode groups = result.path("result").path("content");
+        Set<ProjectGroup> groupResults = new HashSet<ProjectGroup>();
+        for (JsonNode group : groups) {
+            ProjectGroup pg = new ProjectGroup(group.get("id").asLong(), group.get("name").asText());
+            groupResults.add(pg);
+        }
+        return groupResults;
+    }
+
+    /**
+     * Get groups. Get from cache first if none then get from api
+     *
+     * @param tcSubject tcSubject of user
+     * @param endpoint endpoint url
+     * @return set of groupfor user
+     * @throws Exception
+     */
+    public static Set<ProjectGroup> getGroups(TCSubject tcSubject, String endpoint) throws Exception {
+        CacheClient cc = null;
+        Set<ProjectGroup> projectGroups = null;
+        SortedCacheAddress cacheAddress = new SortedCacheAddress(tcSubject.getUserId());
+        try {
+            cc = CacheClientFactory.create();
+            projectGroups = (Set<ProjectGroup>) cc.get(cacheAddress);
+        } catch (Exception e) {
+            logger.info("Can't get group for user " + tcSubject.getUserId() + " from cache");
+        }
+        if (projectGroups == null) {
+            projectGroups = DirectUtils.getGroupsFromApi(tcSubject, endpoint);
+            try {
+                cc.set(cacheAddress, projectGroups, MaxAge.HOUR);
+            } catch (Exception e) {
+                logger.error("Failed to put user group into cache ", e);
+            }
+        }
+        return projectGroups;
+    }
 }