streams challenges

daprieto1 · Apr 2, 2020 · 72199d5 · 72199d5
1 parent 81a012e
commit 72199d5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/daos/impl/redis/feed_dao_redis_impl.js b/src/daos/impl/redis/feed_dao_redis_impl.js
@@ -125,6 +125,11 @@ const insert = async (meterReading) => {
   const pipeline = client.batch();
 
   // START Challenge #6
+  const globalFeedKey = keyGenerator.getGlobalFeedKey();
+  const feedKey = keyGenerator.getFeedKey(meterReading.siteId);
+  pipeline.xaddAsync(globalFeedKey, '*', ...fields);
+  pipeline.xaddAsync(feedKey, '*', ...fields);
+
   // END Challenge #6
 
   await pipeline.execAsync();

diff --git a/src/daos/impl/redis/site_geo_dao_redis_impl.js b/src/daos/impl/redis/site_geo_dao_redis_impl.js
@@ -122,7 +122,7 @@ const findAll = async () => {
   const resultSites = await pipeline.execAsync();
 
   for (const site of resultSites) {
-    if (site) {      
+    if (site) {
       sites.push(remap(site));
     }
   }
@@ -177,10 +177,6 @@ const findByGeo = async (lat, lng, radius, radiusUnit) => {
  * @returns {Promise} - a Promise, resolving to an array of site objects.
  */
 const findByGeoWithExcessCapacity = async (lat, lng, radius, radiusUnit) => {
-  /* eslint-disable no-unreachable */
-  // Challenge #5, remove the next line...
-  return [];
-
   const client = redis.getClient();
 
   // Create a pipeline to send multiple commands in one round trip.
@@ -202,8 +198,10 @@ const findByGeoWithExcessCapacity = async (lat, lng, radius, radiusUnit) => {
   // Create a key for a temporary sorted set containing sites that fell
   // within the radius and their current capacities.
   const sitesInRadiusCapacitySortedSetKey = keyGenerator.getTemporaryKey();
+  const capacityRankingKey = keyGenerator.getCapacityRankingKey();
 
   // START Challenge #5
+  setOperationsPipeline.zinterstoreAsync(sitesInRadiusCapacitySortedSetKey, 2, sitesInRadiusSortedSetKey, capacityRankingKey, 'WEIGHTS', 0, 1);
   // END Challenge #5
 
   // Expire the temporary sorted sets after 30 seconds, so that we

diff --git a/tests/feed_dao_redis_impl.test.js b/tests/feed_dao_redis_impl.test.js
@@ -84,19 +84,19 @@ const insertAndReadBackFromStream = async (siteId) => {
 };
 
 // This test is for Challenge #6.
-test.skip(`${testSuiteName}: insert and read back from global stream`, async () => {
+test(`${testSuiteName}: insert and read back from global stream`, async () => {
   await insertAndReadBackFromStream();
 });
 
 // This test is for Challenge #6.
-test.skip(`${testSuiteName}: read stream for site that does not exist`, async () => {
+test(`${testSuiteName}: read stream for site that does not exist`, async () => {
   const meterReadings = await redisFeedDAO.getRecentForSite(-1, 100);
 
   expect(meterReadings.length).toBe(0);
 });
 
 // This test is for Challenge #6.
-test.skip(`${testSuiteName}: insert and read back from site specific stream`, async () => {
+test(`${testSuiteName}: insert and read back from site specific stream`, async () => {
   await insertAndReadBackFromStream(998);
 });
 

diff --git a/tests/site_geo_dao_redis_impl.test.js b/tests/site_geo_dao_redis_impl.test.js
@@ -270,7 +270,7 @@ test(`${testSuiteName}: findByGeo no results`, async () => {
 });
 
 // This test is for Challenge #5.
-test.skip(`${testSuiteName}: findByGeoWithExcessCapacity`, async () => {
+test(`${testSuiteName}: findByGeoWithExcessCapacity`, async () => {
   const site1 = {
     id: 1,
     capacity: 4.5,