ok

Author: test

local/run.sh

@@ -8,5 +8,6 @@ export DW_URL=jdbc:informix-sqli://$IP:2021/common_dw:INFORMIXSERVER=informixolt
 export TC_JWT_KEY=secret
 export GROUP_SERVICE_ENDPOINT="http://$IP:8080/v3/groups?memberId=%s&membershipType=User-Group"
 export PARENT_GROUP_SERVICE_ENDPOINT="http://$IP:8080/v3/groups/%s/getParentGroup?oneLevel=false"
+export ZOOKEEPER_HOSTS_LIST=$IP
 
 java -jar ../service/target/review-microservice-*.jar server ../service/src/main/resources/review-service.yaml

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

@@ -92,9 +92,14 @@
  * <li>always checks group permission for user eligibility when dealing with review opportunities and review application</li>
  * </ul>
  * </p>
+ * 
+ * <p>
+ * Version 1.7 - Topcoder Review Microservice: Add support for spec reviews for design challenges / Unit tests and README Fixes version 1.0
+ * - add the support for the design spec review
+ * </p>
  *
  * @author TCCoder
- * @version 1.6
+ * @version 1.7 
  */
 public class ReviewOpportunitiesManager {
     /**
@@ -125,6 +130,13 @@ public class ReviewOpportunitiesManager {
         CHALLENGE_TYPE_IDS.add(36);
         CHALLENGE_TYPE_IDS.add(38);
         CHALLENGE_TYPE_IDS.add(39);
+        
+        CHALLENGE_TYPE_IDS.add(17);
+        CHALLENGE_TYPE_IDS.add(18);
+        CHALLENGE_TYPE_IDS.add(21);
+        CHALLENGE_TYPE_IDS.add(22);
+        CHALLENGE_TYPE_IDS.add(30);
+        CHALLENGE_TYPE_IDS.add(32);
     }
 
     /**

service/src/main/resources/sql/review-opportunities/get-review-opportunities.sql

@@ -140,7 +140,7 @@ INNER JOIN review_application_role_resource_role_xref rarrrx ON rarrrx.review_ap
 INNER JOIN default_project_payment dpp ON dpp.resource_role_id = rarrrx.resource_role_id AND p.project_category_id = dpp.project_category_id
 LEFT JOIN project_spec pspec on pspec.project_id = p.project_id
 WHERE p.project_status_id = 1
-AND pcl.project_type_id IN (1,2)
+AND pcl.project_type_id IN (1,2,3)
 AND pcl.project_category_id != 29
 AND pcl.project_category_id != 37
 AND pp13.phase_status_id IN (2,3)

service/src/test/java/com/appirio/service/test/manager/ReviewOpportunitiesManagerTest.java

@@ -117,6 +117,10 @@ public class ReviewOpportunitiesManagerTest extends GenericDAOTest {
      * Manager being tested
      */
     private ReviewOpportunitiesManager manager;
+    
+    private ReviewOpportunitiesDTO designSpecDto = new ReviewOpportunitiesDTO(4L, 3, 30005531L, 0, TestHelper.toDate(
+            "2017-12-14 19:40:23.546"), TestHelper.toDate("2017-12-14 21:40:00.000"), 1, "Wireframes", 18,
+            "Spec Review", "wire frame", "1.0", 1L, 18L, 50.00, 0.0, 0.0, 1400.0, 0, "JavaScript", "Facebook, Google", "detailedRequirement3", "submission guidelines3");
 
     /**
      * Setup the jdbi instance and required data
@@ -136,8 +140,8 @@ public void before() throws Exception {
             "Beanstalk, Brivo Labs", "detailedRequirement2", "submission guidelines2");
         ReviewOpportunitiesDTO dto3 = new ReviewOpportunitiesDTO(3L, 3, 30005530L, 0, TestHelper.toDate(
             "2017-12-14 19:40:23.546"), TestHelper.toDate("2017-12-14 21:40:00.000"), 1, "Assembly Competition", 14,
-            "Spec Review", "Assembly1", "1.0", 1L, 18L, 50.00, 0.0, 0.0, 1400.0, 0, "JavaScript", "Facebook, Google", "detailedRequirement3", "submission guidelines3");
-
+            "Spec Review", "Assembly1", "1.0", 1L, 18L, 50.00, 0.0, 0.0, 1400.0, 0, "JavaScript", "Facebook, Google", "detailedRequirement3", "submission guidelines3");
+        
         data.add(dto1);
         data.add(dto2);
         data.add(dto3);
@@ -149,6 +153,8 @@ public void before() throws Exception {
             .asList(dto2));
         Mockito.when(dao.getReviewOpportunities(Mockito.argThat(new IdMatcher("challenge_type_id", 14)))).thenReturn(Arrays
             .asList(dto3));
+        Mockito.when(dao.getReviewOpportunities(Mockito.argThat(new IdMatcher("challenge_type_id", 18)))).thenReturn(Arrays
+                .asList(designSpecDto));
         // all challenge
         Mockito.when(dao.getReviewOpportunities(Mockito.argThat(new IdMatcher("challenge_type_id", 0)))).thenReturn(data);
 
@@ -175,7 +181,8 @@ public void before() throws Exception {
         Mockito.when(dao.getReviewApplicationRoleIds(Mockito.eq(132456L), Mockito.eq(3L), Mockito.argThat(new IdMatcher("reviewApplicationStatusId", 2)))).thenReturn(cancelIds);
 
 
-        Mockito.when(challengeDao.getChallenge(Mockito.eq(30005530L))).thenReturn(Mockito.mock(com.appirio.service.review.api.Challenge.class));
+        Mockito.when(challengeDao.getChallenge(Mockito.eq(30005530L))).thenReturn(Mockito.mock(com.appirio.service.review.api.Challenge.class));
+        Mockito.when(challengeDao.getChallenge(Mockito.eq(30005531L))).thenReturn(Mockito.mock(com.appirio.service.review.api.Challenge.class));
         Phase phase = new Phase(30005530L, 1L, "Spec Review", "Opened", TestHelper.toDate("2017-12-19 22:21:00.000"),
                 TestHelper.toDate("2017-12-20 22:21:00.000"), TestHelper.toDate("2017-12-19 22:21:00.000"), TestHelper.toDate("2017-12-20 22:21:00.000"));
         Mockito.when(dao.getChallengePhases(Mockito.argThat(new InQueryMatcher("challengeIds", new long[]{30005530L})))).thenReturn(Arrays.asList(phase));
@@ -204,10 +211,17 @@ public void before() throws Exception {
         groupPerm3.put("challenge_id", 30005530L);
         groupPerm3.put("challenge_group_ind", 0);
         groupPerm3.put("user_group_xref_found", null);
+        
+        Map<String, Object> groupPerm4 = new HashMap<String, Object>();
+        groupPerm4.put("challenge_id", 30005531L);
+        groupPerm4.put("challenge_group_ind", 0);
+        groupPerm4.put("user_group_xref_found", null);
 
         groupPerms.add(groupPerm1);
         groupPerms.add(groupPerm2);
         groupPerms.add(groupPerm3);
+        groupPerms.add(groupPerm4);
+        
         Mockito.when(dao.getChallengeAccessibilityAndGroups(Mockito.eq(123L), Mockito.argThat(new IdMatcher(
                 "challenge_type_id", 0)))).thenReturn(groupPerms);
         Mockito.when(dao.getChallengeAccessibilityAndGroups(Mockito.eq(456L), Mockito.argThat(new IdMatcher(
@@ -270,6 +284,33 @@ public void testGetReviewOpportunitiesByChallengeId() throws SupplyException {
         assertEquals("review application size is not equal", item.getApplications().size(), 1);
         assertEquals("review application handle is not equal", item.getApplications().get(0).getHandle(), "handle");
         assertEquals("review application handle is not equal", item.getApplications().get(0).getStatus(), "pending");
+    }
+    
+    /**
+     * Test ReviewOpportunitiesManager.getReviewOpportunities
+     *
+     * @throws SupplyException if any errror occurs
+     */
+    @Test
+    public void testGetReviewOpportunities_for_DesignChallenge_SpecReview() throws SupplyException {
+
+        List<ReviewOpportunityItem> items = manager.getReviewOpportunities(18, createQueryParam(""), createUser(USER_ID));
+        assertEquals("The spec review opportunities should be 1 size", items.size(), 1);
+        assertEquals("The challenge id should be equal", items.get(0).getChallengeId(), 30005531L);
+    }
+    
+    /**
+     * Test ReviewOpportunitiesManager.getReviewOpportunitiesByChallengeId
+     *
+     * @throws SupplyException if any errror occurs
+     */
+    @Test
+    public void testGetReviewOpportunities_by_challengeId_for_DesignChallenge_SpecReview() throws SupplyException {
+        data.add(this.designSpecDto);
+        Mockito.when(dao.getReviewOpportunities(Mockito.argThat(new IdMatcher("challenge_type_id", 0)))).thenReturn(data);
+        
+        ReviewOpportunityItem item = manager.getReviewOpportunitiesByChallengeId(createUser(USER_ID), 30005531L);
+        assertEquals("The challenge id should be equal", item.getChallengeId(), 30005531L);
     }
 
     /**
@@ -281,11 +322,11 @@ public void testGetReviewOpportunitiesByChallengeId() throws SupplyException {
     @Test
     public void testGetReviewOpportunitiesByChallengeId_challengeIdNotFound() throws SupplyException {
         try {
-            ReviewOpportunityItem item = manager.getReviewOpportunitiesByChallengeId(createUser(USER_ID), 30005531);
+            ReviewOpportunityItem item = manager.getReviewOpportunitiesByChallengeId(createUser(USER_ID), 30005599);
             fail("should not be here");
         } catch (SupplyException e) {
             assertEquals(HttpServletResponse.SC_NOT_FOUND, e.getStatusCode());
-            assertEquals("The challenge id does not exist:30005531", e.getMessage());
+            assertEquals("The challenge id does not exist:30005599", e.getMessage());
         }
     }
 

service/src/test/resources/expected-sql/review-opportunities/review-opportunities-all-query.sql

@@ -140,7 +140,7 @@ INNER JOIN review_application_role_resource_role_xref rarrrx ON rarrrx.review_ap
 INNER JOIN default_project_payment dpp ON dpp.resource_role_id = rarrrx.resource_role_id AND p.project_category_id = dpp.project_category_id
 LEFT JOIN project_spec pspec on pspec.project_id = p.project_id
 WHERE p.project_status_id = 1
-AND pcl.project_type_id IN (1,2)
+AND pcl.project_type_id IN (1,2,3)
 AND pcl.project_category_id != 29
 AND pcl.project_category_id != 37
 AND pp13.phase_status_id IN (2,3)

service/src/test/resources/expected-sql/review-opportunities/review-opportunities-challenge-id-query.sql

@@ -140,7 +140,7 @@ INNER JOIN review_application_role_resource_role_xref rarrrx ON rarrrx.review_ap
 INNER JOIN default_project_payment dpp ON dpp.resource_role_id = rarrrx.resource_role_id AND p.project_category_id = dpp.project_category_id
 LEFT JOIN project_spec pspec on pspec.project_id = p.project_id
 WHERE p.project_status_id = 1
-AND pcl.project_type_id IN (1,2)
+AND pcl.project_type_id IN (1,2,3)
 AND pcl.project_category_id != 29
 AND pcl.project_category_id != 37
 AND pp13.phase_status_id IN (2,3)

service/src/test/resources/expected-sql/review-opportunities/review-opportunities-type-query.sql

@@ -140,7 +140,7 @@ INNER JOIN review_application_role_resource_role_xref rarrrx ON rarrrx.review_ap
 INNER JOIN default_project_payment dpp ON dpp.resource_role_id = rarrrx.resource_role_id AND p.project_category_id = dpp.project_category_id
 LEFT JOIN project_spec pspec on pspec.project_id = p.project_id
 WHERE p.project_status_id = 1
-AND pcl.project_type_id IN (1,2)
+AND pcl.project_type_id IN (1,2,3)
 AND pcl.project_category_id != 29
 AND pcl.project_category_id != 37
 AND pp13.phase_status_id IN (2,3)