Adds Challenge redislabs-training#5 solution and enables tests.

GearLaunch · May 30, 2020 · c2780ea · c2780ea
1 parent 6e39cc0
commit c2780ea
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 36 deletions.
diff --git a/src/main/java/com/redislabs/university/RU102J/dao/SiteGeoDaoRedisImpl.java b/src/main/java/com/redislabs/university/RU102J/dao/SiteGeoDaoRedisImpl.java
@@ -53,42 +53,51 @@ public Set<Site> findByGeo(GeoQuery query) {
     }
 
     // Challenge #5
-     private Set<Site> findSitesByGeoWithCapacity(GeoQuery query) {
-         return Collections.emptySet();
-     }
+    // private Set<Site> findSitesByGeoWithCapacity(GeoQuery query) {
+    //     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
-//             // 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> 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;
+            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());
+            // TODO: Challenge #5: Add the code that populates the scores HashMap...
+            for (Site site : sites) {
+                Response<Double> score = pipeline.zscore(RedisSchema.getCapacityRankingKey(),
+                    String.valueOf(site.getId()));
+                scores.put(site.getId(), score);
+            }
+            pipeline.sync();
+            // 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();

diff --git a/src/test/java/com/redislabs/university/RU102J/dao/SiteGeoDaoRedisImplTest.java b/src/test/java/com/redislabs/university/RU102J/dao/SiteGeoDaoRedisImplTest.java
@@ -125,7 +125,6 @@ public void findByGeo() {
     }
 
     // Challenge #5
-    @Ignore
     @Test
     public void findByGeoWithExcessCapacity() {
         SiteGeoDao siteDao = new SiteGeoDaoRedisImpl(jedisPool);
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,6 @@ public void findByGeo() { @@
         }
         // Challenge #5
-        @Ignore
         @Test
         public void findByGeoWithExcessCapacity() {
             SiteGeoDao siteDao = new SiteGeoDaoRedisImpl(jedisPool);
@@ Expand Down @@