update the search test

Relates #21
GSG-G9 · Feb 10, 2021 · 4693e12 · 4693e12
1 parent 6b4bc11
commit 4693e12
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/server/database/queries/kindergarten/getKindergartenSearch.js b/server/database/queries/kindergarten/getKindergartenSearch.js
@@ -6,14 +6,14 @@ const getKindergartenSearch = ({ q, minPrice, maxPrice, locationId }) => {
     'FROM kindergartens ' +
     'INNER JOIN locations ON locations.id = kindergartens.location_id ' +
     'INNER JOIN ' +
-    "(select COUNT(rating) AS rating_count , to_char(AVG(rating), '99.99') AS rating_average, kindergarten_id  FROM comments GROUP BY kindergarten_id ) " +
+    "(select COUNT(rating) AS rating_count , TRIM(to_char(AVG(rating),'9.99')) AS rating_average, kindergarten_id  FROM comments GROUP BY kindergarten_id ) " +
     'AS rating ON rating.kindergarten_id = kindergartens.id ' +
     'WHERE ';
 
   const values = [];
 
   if (q) {
-    text += `kindergarten_name like $${values.length + 1} AND `;
+    text += `kindergarten_name like TRIM($${values.length + 1}) AND `;
     values.push(q);
   }
 

diff --git a/test/search.test.js b/test/search.test.js
@@ -89,28 +89,30 @@ describe('search endPoint', () => {
         return done();
       }));
 
-  // test('Route /search?minPrice=500&maxPrice=1000, status 200, json header, data = testData', (done) => {
-  //   // still something TODO
-  //   const testData = {
-  //     id: 6,
-  //     kindergarten_name: 'روضة الزهراء النموذجية الخاصة',
-  //     cover_image:
-  //       'https://scontent.fgza2-1.fna.fbcdn.net/v/t1.0-9/551059_604585486228232_1415987366_n.jpg?_nc_cat=111&ccb=2&_nc_sid=e3f864&_nc_ohc=kEd6i519NhYAX8iivcY&_nc_ht=scontent.fgza2-1.fna&oh=aa8c6154da2c42b82c50adb9cfa5f5e6&oe=6045F3E5',
-  //     phone_number: '0599123456',
-  //     min_price: 500,
-  //     max_price: 1000,
-  //     location_sub: 'الشجاعية',
-  //   };
+  test('Route /search?minPrice=500&maxPrice=1000, status 200, json header, data = testData', (done) => {
+    // still something TODO
+    const testData = {
+      id: 6,
+      kindergarten_name: 'روضة الزهراء النموذجية الخاصة',
+      cover_image:
+        'https://scontent.fgza2-1.fna.fbcdn.net/v/t1.0-9/551059_604585486228232_1415987366_n.jpg?_nc_cat=111&ccb=2&_nc_sid=e3f864&_nc_ohc=kEd6i519NhYAX8iivcY&_nc_ht=scontent.fgza2-1.fna&oh=aa8c6154da2c42b82c50adb9cfa5f5e6&oe=6045F3E5',
+      phone_number: '0599123456',
+      min_price: 500,
+      max_price: 1000,
+      location_sub: 'الشجاعية',
+      rating_count: '1',
+      rating_average: '5.00',
+    };
 
-  //   return request(app)
-  //     .get('/api/v1/search?minPrice=500&maxPrice=1000')
-  //     .expect(200)
-  //     .expect('Content-Type', /json/)
-  //     .end((err, res) => {
-  //       if (err) return done(err);
-  //       const { data } = res.body;
-  //       expect(data[0]).toEqual(testData);
-  //       return done();
-  //     });
-  // });
+    return request(app)
+      .get('/api/v1/search?minPrice=500&maxPrice=1000')
+      .expect(200)
+      .expect('Content-Type', /json/)
+      .end((err, res) => {
+        if (err) return done(err);
+        const { data } = res.body;
+        expect(data[0]).toEqual(testData);
+        return done();
+      });
+  });
 });