Merge pull request #146 from appirio-tech/migrate-groups-api

Migrate V5 groups api

Author: LieutenantRoger

.circleci/config.yml

@@ -94,8 +94,7 @@ workflows:
             branches:
               only: 
                 - dev
-                - feature/jira-plat-130
-                - dev-ecs
+
       - "build-prod":
           context : org-global
           filters:

.gitignore

@@ -1,5 +1,4 @@
 .classpath
-.project
 service/dependency-reduced-pom.xml
 service/run-config/*/target
 service/target
@@ -10,3 +9,4 @@ service/log
 *.iml
 /target/
 .settings
+.project

.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1650210132504</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

service/.gitignore

@@ -1 +1,2 @@
 /target/
+.idea

service/src/main/java/com/appirio/service/resourcefactory/ReviewOpportunitiesFactory.java

@@ -5,7 +5,6 @@
 import com.appirio.service.review.manager.ReviewOpportunitiesManager;
 import com.appirio.service.review.resources.ReviewOpportunitiesResource;
 import com.appirio.service.review.util.GroupServiceClient;
-import com.appirio.service.review.util.ParentGroupServiceClient;
 import com.appirio.service.supply.resources.ResourceFactory;
 import com.appirio.supply.DAOFactory;
 import com.appirio.supply.SupplyException;
@@ -49,8 +48,12 @@
  *     </ul>
  * </p>
  *
+ * <p>
+ *     Version 1.6 (Topcoder Review Service - Migrate Groups API to V5)
+ * </p>
+ *
  * @author TCCoder
- * @version 1.5
+ * @version 1.6
  *
  */
 public class ReviewOpportunitiesFactory implements ResourceFactory<ReviewOpportunitiesResource> {
@@ -60,20 +63,13 @@ public class ReviewOpportunitiesFactory implements ResourceFactory<ReviewOpportu
      */
     private final GroupServiceClient groupServiceClient;
 
-    /**
-     * The parent group service client
-     */
-    private final ParentGroupServiceClient parentGroupServiceClient;
-
     /**
      * Simple constructor to initialize ReviewOpportunitiesFactory
      *
      * @param groupServiceClient the groupServiceClient to use
-     * @param parentGroupServiceClient the parent groupServiceClient to use
      */
-    public ReviewOpportunitiesFactory(GroupServiceClient groupServiceClient, ParentGroupServiceClient parentGroupServiceClient) {
+    public ReviewOpportunitiesFactory(GroupServiceClient groupServiceClient) {
         this.groupServiceClient = groupServiceClient;
-        this.parentGroupServiceClient = parentGroupServiceClient;
     }
 
     /**
@@ -86,7 +82,7 @@ public ReviewOpportunitiesResource getResourceInstance() throws SupplyException
         final ReviewOpportunitiesDAO dao = DAOFactory.getInstance().createDAO(ReviewOpportunitiesDAO.class);
         final ChallengeDAO challengeDao = DAOFactory.getInstance().createDAO(ChallengeDAO.class);
         final ReviewOpportunitiesManager reviewOpportunitiesManager =
-                new ReviewOpportunitiesManager(dao, challengeDao, this.groupServiceClient, this.parentGroupServiceClient);
+                new ReviewOpportunitiesManager(dao, challengeDao, this.groupServiceClient);
         return new ReviewOpportunitiesResource(reviewOpportunitiesManager);
     }
 }

service/src/main/java/com/appirio/service/review/ReviewServiceApplication.java

@@ -17,7 +17,6 @@
 import com.appirio.service.resourcefactory.ScorecardFactory;
 import com.appirio.service.resourcefactory.ScorecardQuestionFactory;
 import com.appirio.service.review.util.GroupServiceClient;
-import com.appirio.service.review.util.ParentGroupServiceClient;
 import com.appirio.service.supply.resources.SupplyDatasourceFactory;
 
 import com.appirio.tech.core.api.v3.dropwizard.APIApplication;
@@ -52,9 +51,13 @@
  *     </ul>
  * </p>
  *
+ * <p>
+ *     Version 1.4 (Topcoder Review Service - Migrate Groups API to V5)
+ * </p>
+ *
  *
  * @author TCDEVELOPER, TCSCODER
- * @version 1.3
+ * @version 1.4
  */
 public class ReviewServiceApplication extends BaseApplication<ReviewServiceConfiguration> {
     /**
@@ -138,7 +141,6 @@ public String getName() {
 	protected void prepare(ReviewServiceConfiguration config, Environment env) throws Exception {
 		configDatabases(config, config.getDatabases(), env);
 		config.getGroupServiceClientConfig().setEndpoint(getConfigValueFromEnv(ENV_VAR_PATTERN, config.getGroupServiceClientConfig().getEndpoint()));
-		config.getParentGroupServiceClientConfig().setEndpoint(getConfigValueFromEnv(ENV_VAR_PATTERN, config.getParentGroupServiceClientConfig().getEndpoint()));
     }
 
 	/**
@@ -156,8 +158,6 @@ protected void logServiceSpecificConfigs(ReviewServiceConfiguration config) {
         }
         logger.info("\tGroup Service Client Configuration ");
         logger.info("\t\tGroup Service Client Endpoint : " + config.getGroupServiceClientConfig().getEndpoint());
-        logger.info("\tParent Group Service Client Configuration ");
-        logger.info("\t\tParent Group Service Client Endpoint : " + config.getParentGroupServiceClientConfig().getEndpoint());
         logger.info("\r\n");
     }
 
@@ -179,8 +179,7 @@ protected void registerResources(ReviewServiceConfiguration config, Environment
 		env.jersey().register(new ScorecardQuestionFactory(config, env).getResourceInstance());
 
 		GroupServiceClient groupServiceClient = new GroupServiceClient(ClientBuilder.newClient(), config.getGroupServiceClientConfig(), config.getM2mAuthConfiguration());
-		ParentGroupServiceClient parentGroupServiceClient = new ParentGroupServiceClient(ClientBuilder.newClient(), config.getParentGroupServiceClientConfig(), config.getM2mAuthConfiguration());
-		env.jersey().register(new ReviewOpportunitiesFactory(groupServiceClient, parentGroupServiceClient).getResourceInstance());
+		env.jersey().register(new ReviewOpportunitiesFactory(groupServiceClient).getResourceInstance());
 	}
 
 	/**

service/src/main/java/com/appirio/service/review/ReviewServiceConfiguration.java

@@ -28,8 +28,12 @@
  *     </ul>
  * </p>
  *
+ * <p>
+ *     Version 1.3 (Topcoder Review Service - Migrate Groups API to V5)
+ * </p>
+ *
  * @author TCDEVELOPER, TCSCODER
- * @version 1.2
+ * @version 1.3
  *
  */
 public class ReviewServiceConfiguration extends BaseAppConfiguration {
@@ -58,14 +62,6 @@ public class ReviewServiceConfiguration extends BaseAppConfiguration {
     @JsonProperty("groupServiceClient")
     private final BaseClientConfiguration groupServiceClientConfig = new BaseClientConfiguration();
 
-    /**
-     * The parent group service client configuration
-     */
-    @Valid
-    @NotNull
-    @JsonProperty("parentGroupServiceClient")
-    private final BaseClientConfiguration parentGroupServiceClientConfig = new BaseClientConfiguration();
-
     /**
      * Get the data source factory
      *
@@ -85,15 +81,6 @@ public BaseClientConfiguration getGroupServiceClientConfig() {
         return this.groupServiceClientConfig;
     }
 
-    /**
-     * Return the sub group service client configuration
-     *
-     * @return the sub group service client configuration
-     */
-    public BaseClientConfiguration getParentGroupServiceClientConfig() {
-        return parentGroupServiceClientConfig;
-    }
-
     /**
      * Get m2m auth configuration
      *

service/src/main/java/com/appirio/service/review/manager/ReviewOpportunitiesManager.java

@@ -9,7 +9,6 @@
 import com.appirio.service.review.dao.ChallengeDAO;
 import com.appirio.service.review.dao.ReviewOpportunitiesDAO;
 import com.appirio.service.review.util.GroupServiceClient;
-import com.appirio.service.review.util.ParentGroupServiceClient;
 import com.appirio.supply.SupplyException;
 import com.appirio.tech.core.api.v3.TCID;
 import com.appirio.tech.core.api.v3.request.FieldSelector;
@@ -98,8 +97,12 @@
  * - add the support for the design spec review
  * </p>
  *
+ * <p>
+ *     Version 1.8 (Topcoder Review Service - Migrate Groups API to V5)
+ * </p>
+ *
  * @author TCCoder
- * @version 1.7 
+ * @version 1.8
  */
 public class ReviewOpportunitiesManager {
     /**
@@ -242,11 +245,6 @@ public class ReviewOpportunitiesManager {
      */
     private final GroupServiceClient groupServiceClient;
 
-    /**
-     * The parent group service client
-     */
-    private final ParentGroupServiceClient parentGroupServiceClient;
-
     private final ChallengeDAO challengeDao;
 
     /**
@@ -255,15 +253,13 @@ public class ReviewOpportunitiesManager {
      * @param reviewOpportunitiesDAO the reviewOpportunitiesDAO to use
      * @param challengeDao the challengeDao to use
      * @param groupServiceClient the groupServiceClient to use
-     * @param parentGroupServiceClient the parent groupServiceClient to use
      * @throws SupplyException if any error occurs
      */
     public ReviewOpportunitiesManager(ReviewOpportunitiesDAO reviewOpportunitiesDAO, ChallengeDAO challengeDao,
-        GroupServiceClient groupServiceClient, ParentGroupServiceClient parentGroupServiceClient) throws SupplyException {
+        GroupServiceClient groupServiceClient) throws SupplyException {
         this.reviewOpportunitiesDAO = reviewOpportunitiesDAO;
         this.challengeDao = challengeDao;
         this.groupServiceClient = groupServiceClient;
-        this.parentGroupServiceClient = parentGroupServiceClient;
     }
 
     /**
@@ -846,15 +842,7 @@ private Map<Long, Set<Long>> checkUserChallengeEligibility(AuthUser authUser, Li
     private Set<Long> getAllGroupIds(long userId) throws SupplyException {
         try {
             Set<Long> groupIds = groupServiceClient.getGroups(userId);
-
-            // get parent groups
-            Set<Long> allGroupIds = new HashSet<>(groupIds);
-            for (Long groupId : groupIds) {
-                Set<Long> parentGroupIds = parentGroupServiceClient.getGroups(groupId);
-                allGroupIds.addAll(parentGroupIds);
-            }
-
-            return allGroupIds;
+            return groupIds;
         } catch (Exception e) {
             throw new SupplyException(e);
         }

service/src/main/java/com/appirio/service/review/util/GroupServiceClient.java

@@ -76,18 +76,10 @@ public Set<Long> getGroups(long userId) throws Exception {
             throw new SupplyException("Unable to get groups from the API, the returned status code is: " + response.getStatusInfo().getStatusCode());
         }
 
-        JsonNode apiResponse = response.readEntity(JsonNode.class);
-        JsonNode result = apiResponse.path("result");
-        if (result.path("status").asInt() != HttpStatus.OK_200) {
-            LOGGER.error("Unable to get groups: {}", apiResponse);
-
-            throw new SupplyException("Unable to get groups from the API, the error is: " + result.path("content").asText());
-        }
-
-        JsonNode groups = result.path("content");
+        JsonNode result = response.readEntity(JsonNode.class);
         Set<Long> groupIds = new HashSet<Long>();
-        for (JsonNode group : groups) {
-            groupIds.add(group.path("id").asLong());
+        for (JsonNode group : result) {
+            groupIds.add(group.asLong());
         }
 
         return groupIds;