Merge pull request #119 from appirio-tech/dev

ThomasKranitsas · web-flow · commit 3a415680d70d · 2018-09-05T22:30:06.000+03:00
Add submissionGuidelines and fix issue with completed review opps
diff --git a/service/src/main/java/com/appirio/service/review/api/ReviewOpportunitiesDTO.java b/service/src/main/java/com/appirio/service/review/api/ReviewOpportunitiesDTO.java
@@ -21,7 +21,7 @@
  *   </li>
  * </ul>
  * </p>
- * 
+ *
  * <p>
  * Version 1.2 (Topcoder - Create Review Opportunity Details Endpoint v1.0)
  * <ul>
@@ -183,11 +183,18 @@ public class ReviewOpportunitiesDTO {
     @Getter
     @Setter
     private String challengePlatforms;
-    
+
     /**
      * The detailed requirements attribute.
      */
     @Getter
     @Setter
     private String detailedRequirements;
-}
+
+    /**
+     * The submission guidelines attribute.
+     */
+    @Getter
+    @Setter
+    private String finalSubmissionGuidelines;
+}
diff --git a/service/src/main/java/com/appirio/service/review/manager/ReviewOpportunitiesManager.java b/service/src/main/java/com/appirio/service/review/manager/ReviewOpportunitiesManager.java
@@ -265,7 +265,7 @@ public List<ReviewOpportunityItem> getReviewOpportunities(int challengeTypeId, Q
 
         if (challengeTypeId == 0) {
             // challengeTypeId is not provided in query string
-            queryParameter.setFilter(new FilterParameter(""));
+            queryParameter.setFilter(new FilterParameter("availablePositions=0"));
         } else {
             // if challengeTypeId is in query string
             // double check if its value is valid
@@ -274,7 +274,7 @@ public List<ReviewOpportunityItem> getReviewOpportunities(int challengeTypeId, Q
                     HttpServletResponse.SC_NOT_FOUND);
             }
 
-            queryParameter.setFilter(new FilterParameter("challenge_type_id=" + String.valueOf(challengeTypeId)));
+            queryParameter.setFilter(new FilterParameter("challenge_type_id=" + String.valueOf(challengeTypeId) + "&availablePositions=0"));
         }
 
         List<ReviewOpportunitiesDTO> revOpportunities = this.reviewOpportunitiesDAO.getReviewOpportunities(
@@ -815,6 +815,7 @@ private ReviewOpportunityItem convertReviewOpportunitiesDTO(ReviewOpportunitiesD
 
         if (returnDetailedRequirements) {
             challenge.put("detailedRequirements", dto.getDetailedRequirements());
+            challenge.put("finalSubmissionGuidelines", dto.getFinalSubmissionGuidelines());
         }
         item.setChallenge(challenge);
 
diff --git a/service/src/main/resources/sql/review-opportunities/get-review-opportunities.properties b/service/src/main/resources/sql/review-opportunities/get-review-opportunities.properties
@@ -2,4 +2,7 @@ filter.challenge_type_id.template=challenge_type_id = :challenge_type_id
 filter.challenge_type_id.type=Long
 
 filter.challengeIds.template=challenge_id in (<challengeIds>)
-filter.challengeIds.type=List
+filter.challengeIds.type=List
+
+filter.availablePositions.template=number_of_review_positions_available > :availablePositions
+filter.availablePositions.type=Long
diff --git a/service/src/main/resources/sql/review-opportunities/get-review-opportunities.sql b/service/src/main/resources/sql/review-opportunities/get-review-opportunities.sql
@@ -20,7 +20,8 @@ base_coefficient AS baseCoefficient,
 incremental_coefficient AS incrementalCoefficient,
 prize AS prize,
 submission_count AS submissionCount,
-detailed_requirements_text as detailedRequirements
+detailed_requirements_text as detailedRequirements,
+final_submission_guidelines_text as finalSubmissionGuidelines
 FROM (
 SELECT
   ra.review_auction_id
@@ -62,6 +63,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=1
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -122,6 +124,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=2
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -187,6 +190,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=3
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -211,4 +215,4 @@ AND pp18.phase_status_id IN (1,2)
 AND not exists (SELECT 1 FROM project_phase pp12 WHERE pp12.project_id=p.project_id AND pp12.phase_type_id=12)
 AND dpp.resource_role_id = 21
 )
-WHERE {filter} and number_of_review_positions_available > 0;
+WHERE {filter};
diff --git a/service/src/test/java/com/appirio/service/test/dao/ReviewOpportunitiesDAOTest.java b/service/src/test/java/com/appirio/service/test/dao/ReviewOpportunitiesDAOTest.java
@@ -56,10 +56,10 @@ public void before() throws SupplyException {
 
         ReviewOpportunitiesDTO dto1 = new ReviewOpportunitiesDTO(1L, 5, 30005520L, 0, TestHelper.toDate("2017-12-17 22:21:00.000"),
             TestHelper.toDate("2017-12-19 22:21:00.000"), 2, "Code", 39, "Contest Review", "Code1", "1.0", 9L, 4L, 0.00, 0.13,
-            0.05, 350.0, 0, "Java, JavaScript", "NodeJS, Other", "detailed requirement1");
+            0.05, 350.0, 0, "Java, JavaScript", "NodeJS, Other", "detailed requirement1", "submission guidelines1");
         ReviewOpportunitiesDTO dto2 = new ReviewOpportunitiesDTO(2L, 4, 30005521L, 0, TestHelper.toDate("2017-12-12 22:32:02.583"),
             TestHelper.toDate("2017-12-13 22:32:00.0"), 1, "First2Finish", 38, "Iterative Review", "F2FRev", "1.0", 8L, 21L, 0.00,
-            0.02, 0.04, 800.0, 0, "ActionScript, Active Directory", "Beanstalk, Brivo Labs", "detailed requirement1");
+            0.02, 0.04, 800.0, 0, "ActionScript, Active Directory", "Beanstalk, Brivo Labs", "detailed requirement1", "submission guidelines1");
 
         reviewOpportunitiesDTOs.add(dto1);
         reviewOpportunitiesDTOs.add(dto2);
diff --git a/service/src/test/java/com/appirio/service/test/manager/ReviewOpportunitiesManagerTest.java b/service/src/test/java/com/appirio/service/test/manager/ReviewOpportunitiesManagerTest.java
@@ -120,14 +120,14 @@ public void before() throws SupplyException {
         // prepare some review opportunities data
         ReviewOpportunitiesDTO dto1 = new ReviewOpportunitiesDTO(1L, 5, 30005520L, 0, TestHelper.toDate(
             "2017-12-17 22:21:00.000"), TestHelper.toDate("2017-12-19 22:21:00.000"), 2, "Code", 39, "Contest Review",
-            "Code1", "1.0", 9L, 4L, 0.00, 0.13, 0.05, 350.0, 0, "Java, JavaScript", "NodeJS, Other", "detailedRequirement1");
+            "Code1", "1.0", 9L, 4L, 0.00, 0.13, 0.05, 350.0, 0, "Java, JavaScript", "NodeJS, Other", "detailedRequirement1", "submission guidelines1");
         ReviewOpportunitiesDTO dto2 = new ReviewOpportunitiesDTO(2L, 4, 30005521L, 0, TestHelper.toDate(
             "2017-12-12 22:32:02.583"), TestHelper.toDate("2017-12-13 22:32:00.0"), 1, "First2Finish", 38,
             "Iterative Review", "F2FRev", "1.0", 8L, 21L, 0.00, 0.02, 0.04, 800.0, 0, "ActionScript, Active Directory",
-            "Beanstalk, Brivo Labs", "detailedRequirement2");
+            "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");
+            "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);
@@ -179,7 +179,7 @@ public void before() throws SupplyException {
         Map<String, Object> ct = new HashMap<>();
         ct.put("ct", new BigDecimal(1));
         Mockito.when(dao.allowToReviewChallenge(Mockito.anyLong(), Mockito.anyLong())).thenReturn(ct);
-        
+
         // prepare some group permissions
         List<Map<String, Object>> groupPerms = new ArrayList<Map<String, Object>>();
         Map<String, Object> groupPerm1 = new HashMap<String, Object>();
diff --git a/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-all-query.sql b/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-all-query.sql
@@ -20,7 +20,8 @@ base_coefficient AS baseCoefficient,
 incremental_coefficient AS incrementalCoefficient,
 prize AS prize,
 submission_count AS submissionCount,
-detailed_requirements_text as detailedRequirements
+detailed_requirements_text as detailedRequirements,
+final_submission_guidelines_text as finalSubmissionGuidelines
 FROM (
 SELECT
   ra.review_auction_id
@@ -62,6 +63,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=1
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -122,6 +124,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=2
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -187,6 +190,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=3
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -211,4 +215,4 @@ AND pp18.phase_status_id IN (1,2)
 AND not exists (SELECT 1 FROM project_phase pp12 WHERE pp12.project_id=p.project_id AND pp12.phase_type_id=12)
 AND dpp.resource_role_id = 21
 )
-WHERE 1=1 and number_of_review_positions_available > 0;
+WHERE 1=1;
diff --git a/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-challenge-id-query.sql b/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-challenge-id-query.sql
@@ -20,7 +20,8 @@ base_coefficient AS baseCoefficient,
 incremental_coefficient AS incrementalCoefficient,
 prize AS prize,
 submission_count AS submissionCount,
-detailed_requirements_text as detailedRequirements
+detailed_requirements_text as detailedRequirements,
+final_submission_guidelines_text as finalSubmissionGuidelines
 FROM (
 SELECT
   ra.review_auction_id
@@ -62,6 +63,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=1
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -122,6 +124,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=2
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -187,6 +190,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=3
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -211,4 +215,4 @@ AND pp18.phase_status_id IN (1,2)
 AND not exists (SELECT 1 FROM project_phase pp12 WHERE pp12.project_id=p.project_id AND pp12.phase_type_id=12)
 AND dpp.resource_role_id = 21
 )
-WHERE 1=1 and challenge_id in (30005520,30005521) and number_of_review_positions_available > 0;
+WHERE 1=1 and challenge_id in (30005520,30005521);
diff --git a/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-type-query.sql b/service/src/test/resources/expected-sql/review-opportunities/review-opportunities-type-query.sql
@@ -20,7 +20,8 @@ base_coefficient AS baseCoefficient,
 incremental_coefficient AS incrementalCoefficient,
 prize AS prize,
 submission_count AS submissionCount,
-detailed_requirements_text as detailedRequirements
+detailed_requirements_text as detailedRequirements,
+final_submission_guidelines_text as finalSubmissionGuidelines
 FROM (
 SELECT
   ra.review_auction_id
@@ -62,6 +63,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=1
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -122,6 +124,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=2
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -187,6 +190,7 @@ SELECT
           AND s.submission_status_id IN (1,2,3,4,6,7) AND s.submission_type_id = 1 AND up.project_id = p.project_id AND up.upload_type_id = 1)
   END AS submission_count
 , pspec.detailed_requirements_text
+, pspec.final_submission_guidelines_text
 FROM review_auction ra
 INNER JOIN review_auction_type_lu ratl ON ratl.review_auction_type_id=ra.review_auction_type_id AND ratl.review_auction_category_id=3
 INNER JOIN project p ON p.project_id=ra.project_id
@@ -211,4 +215,4 @@ AND pp18.phase_status_id IN (1,2)
 AND not exists (SELECT 1 FROM project_phase pp12 WHERE pp12.project_id=p.project_id AND pp12.phase_type_id=12)
 AND dpp.resource_role_id = 21
 )
-WHERE 1=1 and challenge_type_id = :challenge_type_id and number_of_review_positions_available > 0;
+WHERE 1=1 and challenge_type_id = :challenge_type_id;
diff --git a/swagger.yaml b/swagger.yaml
@@ -1103,6 +1103,9 @@ definitions:
           detailedRequirements:
             type: string
             description: the details requirement of the challenge
+          finalSubmissionGuidelines:
+            type: string
+            description: the submission deliverables of the challenge
           groupIds:
             description: The group ids of the challenge
             type: array

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public List<ReviewOpportunityItem> getReviewOpportunities(int challengeTypeId, Q`
`265`	`265`
`266`	`266`	`if (challengeTypeId == 0) {`
`267`	`267`	`// challengeTypeId is not provided in query string`
`268`		`- queryParameter.setFilter(new FilterParameter(""));`
	`268`	`+ queryParameter.setFilter(new FilterParameter("availablePositions=0"));`
`269`	`269`	`} else {`
`270`	`270`	`// if challengeTypeId is in query string`
`271`	`271`	`// double check if its value is valid`
`@@ -274,7 +274,7 @@ public List<ReviewOpportunityItem> getReviewOpportunities(int challengeTypeId, Q`
`274`	`274`	`HttpServletResponse.SC_NOT_FOUND);`
`275`	`275`	`}`
`276`	`276`
`277`		`- queryParameter.setFilter(new FilterParameter("challenge_type_id=" + String.valueOf(challengeTypeId)));`
	`277`	`+ queryParameter.setFilter(new FilterParameter("challenge_type_id=" + String.valueOf(challengeTypeId) + "&availablePositions=0"));`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`List<ReviewOpportunitiesDTO> revOpportunities = this.reviewOpportunitiesDAO.getReviewOpportunities(`
`@@ -815,6 +815,7 @@ private ReviewOpportunityItem convertReviewOpportunitiesDTO(ReviewOpportunitiesD`
`815`	`815`
`816`	`816`	`if (returnDetailedRequirements) {`
`817`	`817`	`challenge.put("detailedRequirements", dto.getDetailedRequirements());`
	`818`	`+ challenge.put("finalSubmissionGuidelines", dto.getFinalSubmissionGuidelines());`
`818`	`819`	`}`
`819`	`820`	`item.setChallenge(challenge);`
`820`	`821`