challenge 1

daprieto1 · Mar 17, 2020 · a1c1616 · a1c1616
1 parent 726d698
commit a1c1616
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/daos/impl/redis/site_dao_redis_impl.js b/src/daos/impl/redis/site_dao_redis_impl.js
@@ -95,9 +95,18 @@ const findById = async (id) => {
  */
 /* eslint-disable arrow-body-style */
 const findAll = async () => {
-  // START CHALLENGE #1
-  return [];
-  // END CHALLENGE #1
+  var result = [];
+  const client = redis.getClient();
+
+  const siteIDsKey = keyGenerator.getSiteIDsKey();
+  const siteHashKeys = await client.smembersAsync(siteIDsKey);
+
+  for (let siteHashKey of siteHashKeys) {    
+    const siteHash = await client.hgetallAsync(siteHashKey);    
+    result.push(siteHash === null ? siteHash : remap(siteHash));
+  }
+
+  return result;
 };
 /* eslint-enable */
 

diff --git a/tests/site_dao_redis_impl.test.js b/tests/site_dao_redis_impl.test.js
@@ -150,8 +150,7 @@ test(`${testSuiteName}: findById with missing site`, async () => {
   expect(site).toBe(null);
 });
 
-// This test is for Challenge #1.
-test.skip(`${testSuiteName}: findAll with multiple sites`, async () => {
+test(`${testSuiteName}: findAll with multiple sites`, async () => {
   const sites = [{
     id: 1,
     capacity: 4.5,
@@ -203,8 +202,7 @@ test.skip(`${testSuiteName}: findAll with multiple sites`, async () => {
   expect(sitesFromRedis).toEqual(expect.arrayContaining(sites));
 });
 
-// This test is for Challenge #1.
-test.skip(`${testSuiteName}: findAll with empty sites`, async () => {
+test(`${testSuiteName}: findAll with empty sites`, async () => {
   const sites = await redisSiteDAO.findAll();
   expect(sites).toEqual([]);
 });