Programming Challenge redislabs-training#5

Author: ThiernoAmirouDiallo

src/main/java/com/redislabs/university/RU102J/dao/SiteGeoDaoRedisImpl.java

@@ -5,7 +5,7 @@
 import com.redislabs.university.RU102J.api.Site;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -74,41 +74,39 @@ public Set<Site> findByGeo( GeoQuery query ) {
 
 	// Challenge #5
 	private Set<Site> findSitesByGeoWithCapacity( GeoQuery query ) {
-		return Collections.emptySet();
+		//return Collections.emptySet();
+		//}
+		//	Comment out the above, and uncomment what 's below private Set<Site> findSitesByGeoWithCapacity (GeoQuery query){
+		Set<Site> results = new HashSet<>();
+		Coordinate coord = query.getCoordinate();
+		Double radius = query.getRadius();
+		GeoUnit radiusUnit = query.getRadiusUnit();
+
+		try ( Jedis jedis = jedisPool.getResource() ) {
+			// START Challenge #5
+			List<GeoRadiusResponse> radiusResponses = jedis.georadius( RedisSchema.getSiteGeoKey(), coord.getLng(), coord.getLat(), radius, radiusUnit );
+			// END Challenge #5
+
+			Set<Site> sites = radiusResponses.stream().map( response -> jedis.hgetAll( response.getMemberByString() ) ).filter( Objects::nonNull ).map( Site::new ).collect( Collectors.toSet() );
+
+			// START Challenge #5
+			Pipeline pipeline = jedis.pipelined();
+			Map<Long, Response<Double>> scores = new HashMap<>( sites.size() );
+			sites.forEach( site -> {
+				scores.put( site.getId(), pipeline.zscore( RedisSchema.getCapacityRankingKey(), String.valueOf( site.getId() ) ) );
+			} );
+			pipeline.sync();
+			// END Challenge #5
+
+			for ( Site site : sites ) {
+				if ( scores.get( site.getId() ).get() >= capacityThreshold ) {
+					results.add( site );
+				}
+			}
+		}
+
+		return results;
 	}
-	// Comment out the above, and uncomment what's below
-	//    private Set<Site> findSitesByGeoWithCapacity(GeoQuery query) {
-	//        Set<Site> results = new HashSet<>();
-	//        Coordinate coord = query.getCoordinate();
-	//        Double radius = query.getRadius();
-	//        GeoUnit radiusUnit = query.getRadiusUnit();
-	//
-	//         try (Jedis jedis = jedisPool.getResource()) {
-	//             // START Challenge #5
-	//             // TODO: Challenge #5: Get the sites matching the geo query, store them
-	//             // in List<GeoRadiusResponse> radiusResponses;
-	//             // END Challenge #5
-	//
-	//             Set<Site> sites = radiusResponses.stream()
-	//                     .map(response -> jedis.hgetAll(response.getMemberByString()))
-	//                     .filter(Objects::nonNull)
-	//                     .map(Site::new).collect(Collectors.toSet());
-	//
-	//             // START Challenge #5
-	//             Pipeline pipeline = jedis.pipelined();
-	//             Map<Long, Response<Double>> scores = new HashMap<>(sites.size());
-	//             // TODO: Challenge #5: Add the code that populates the scores HashMap...
-	//             // END Challenge #5
-	//
-	//             for (Site site : sites) {
-	//                 if (scores.get(site.getId()).get() >= capacityThreshold) {
-	//                     results.add(site);
-	//                 }
-	//             }
-	//         }
-	//
-	//         return results;
-	//    }
 
 	private Set<Site> findSitesByGeo( GeoQuery query ) {
 		Coordinate coord = query.getCoordinate();