revise logic for populating platforms and technologies

Author: skyhit

src/main/java/com/appirio/service/challengefeeder/api/challengelisting/ChallengeListingData.java

@@ -65,13 +65,6 @@ public class ChallengeListingData extends IdentifiableData {
     @Getter
     @Setter
     private List<String> technologies;
-    
-    /**
-     * The technologiesStr field
-     */
-    @Getter
-    @Setter
-    private String technologiesStr;
 
     /**
      * The status field
@@ -170,13 +163,6 @@ public class ChallengeListingData extends IdentifiableData {
     @Getter
     @Setter
     private List<String> platforms;
-    
-    /**
-     * The platformsStr field
-     */
-    @Getter
-    @Setter
-    private String platformsStr;
 
     /**
      * The numberOfCheckpointPrizes field

src/main/java/com/appirio/service/challengefeeder/dao/ChallengeFeederDAO.java

@@ -202,4 +202,22 @@ public interface ChallengeFeederDAO {
      */
     @SqlQueryFile("sql/challenge-feeder/get_challenge_pointsPrize.sql")
     List<PrizeData> getPointsPrize(@ApiQueryInput QueryParameter queryParameter);
+    
+    /**
+     * Get challenge technologies
+     *
+     * @param queryParameter the queryParameter to use
+     * @return the List<Map<String,Object>> result
+     */
+    @SqlQueryFile("sql/challenge-feeder/get_challenge_technologies.sql")
+    List<Map<String, Object>> getChallengeTechnologies(@ApiQueryInput QueryParameter queryParameter);
+    
+    /**
+     * Get challenge plagforms
+     *
+     * @param queryParameter the queryParameter to use
+     * @return the List<Map<String,Object>> result
+     */
+    @SqlQueryFile("sql/challenge-feeder/get_challenge_plagforms.sql")
+    List<Map<String, Object>> getChallengePlagforms(@ApiQueryInput QueryParameter queryParameter);
 }

src/main/java/com/appirio/service/challengefeeder/manager/ChallengeListingFeederManager.java

@@ -162,9 +162,31 @@ public void pushChallengeFeeder(ChallengeFeederParam param) throws SupplyExcepti
 
         List<Map<String, Object>> checkpointsSubmissions = this.challengeListingFeederDAO.getCheckpointsSubmissions(queryParameter);
         List<Map<String, Object>> groupIds = this.challengeFeederDAO.getGroupIds(queryParameter);
-        
         List<UserIdData> userIds = this.challengeListingFeederDAO.getChallengeUserIds(queryParameter);
         associateAllUserIds(challenges, userIds);
+        
+        List<Map<String, Object>> platforms = this.challengeFeederDAO.getChallengePlagforms(queryParameter);
+        for (Map<String, Object> item : platforms) {
+            for (ChallengeListingData data : challenges) {
+                if (data.getChallengeId().longValue() == Long.parseLong(item.get("challengeId").toString())) {
+                    if (data.getPlatforms() == null) {
+                        data.setPlatforms(new ArrayList<String>());
+                    }
+                    data.getPlatforms().add(item.get("name").toString());
+                }
+            }
+        }
+        List<Map<String, Object>> technoglies = this.challengeFeederDAO.getChallengeTechnologies(queryParameter);
+        for (Map<String, Object> item : technoglies) {
+            for (ChallengeListingData data : challenges) {
+                if (data.getChallengeId().longValue() == Long.parseLong(item.get("challengeId").toString())) {
+                    if (data.getTechnologies() == null) {
+                        data.setTechnologies(new ArrayList<String>());
+                    }
+                    data.getTechnologies().add(item.get("name").toString());
+                }
+            }
+        }
 
         // set other field
         for (ChallengeListingData data : challenges) {
@@ -188,17 +210,6 @@ public void pushChallengeFeeder(ChallengeFeederParam param) throws SupplyExcepti
                 }
             }
 
-            if (data.getPlatformsStr() != null && data.getPlatformsStr().trim().length() > 0) {
-                data.setPlatforms(Arrays.asList(data.getPlatformsStr().split(", ")));
-                
-            }
-            data.setPlatformsStr(null);
-            if (data.getTechnologiesStr() != null && data.getTechnologiesStr().trim().length() > 0) {
-                data.setTechnologies(Arrays.asList(data.getTechnologiesStr().split(", ")));
-                
-            }
-            data.setTechnologiesStr(null);
-            
             for (Map<String, Object> item : groupIds) {
                 if (item.get("challengeId").toString().equals(data.getId().toString())) {
                     if (data.getGroupIds() == null) {

src/main/resources/sql/challenge-feeder/get_challenge_plagforms.properties

@@ -0,0 +1,2 @@
+filter.challengeIds.template=pp.project_id in (<challengeIds>)
+filter.challengeIds.type=List

src/main/resources/sql/challenge-feeder/get_challenge_plagforms.sql

@@ -0,0 +1,6 @@
+select ppl.name as name, pp.project_id as challengeId
+from project_platform_lu ppl
+inner join project_platform pp
+on ppl.project_platform_id = pp.project_platform_id
+where {filter}
+order by ppl.name

src/main/resources/sql/challenge-feeder/get_challenge_technologies.properties

@@ -0,0 +1,2 @@
+filter.challengeIds.template=p.project_id in (<challengeIds>)
+filter.challengeIds.type=List

src/main/resources/sql/challenge-feeder/get_challenge_technologies.sql

@@ -0,0 +1,7 @@
+select tt.technology_name as name, p.project_id as challengeId
+from comp_technology ct
+left join technology_types tt on ct.technology_type_id = tt.technology_type_id
+left join project_info pi1 on pi1.value = ct.comp_vers_id and pi1.project_info_type_id = 1
+left join project p on p.project_id = pi1.project_id  
+where {filter}
+order by tt.technology_name

src/main/resources/sql/challenge-feeder/get_challenges_listing.sql

@@ -19,8 +19,6 @@ SELECT
          END AS track,
          pcl.description AS subTrack,
          pstatus.NAME AS status,
-         Technology_list(pi1.value) AS technologiesStr,
-         Platform_list(p.project_id) AS platformsStr,
          Nvl(pp1.actual_start_time, pp1.scheduled_start_time) AS registrationStartDate,
          Nvl(pp1.actual_end_time, pp1.scheduled_end_time) AS registrationEndDate,
          Nvl(pp2.actual_end_time, pp2.scheduled_end_time) AS submissionEndDate,
@@ -102,8 +100,6 @@ SELECT
   AND pp2.phase_type_id = 2
   INNER JOIN project_info pn ON pn.project_id = p.project_id
   AND pn.project_info_type_id = 6
-  INNER JOIN project_info pi1 ON pi1.project_id = p.project_id
-  AND pi1.project_info_type_id = 1
   LEFT JOIN TCS_CATALOG\:project_info AS forum_id_info ON forum_id_info.project_id = p.project_id
   AND forum_id_info.project_info_type_id = 4
   LEFT JOIN TCS_CATALOG\:project_info AS review_type_info ON review_type_info.project_id = p.project_id