Merge f428d7a into b44d14e

andela · Mar 16, 2020 · 6adfef0 · 6adfef0
2 parents b44d14e + f428d7a
commit 6adfef0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/services/accommodation.service.js b/src/services/accommodation.service.js
@@ -45,12 +45,26 @@ class AccommodationService {
    * @returns {object} data
    */
   static findAllAccommodations() {
-    return Accommodation.findAll({ include: ['addOnServices', 'accommodationPictures', 'amenities',
-      { association: 'accommodationComments', include: { model: Users, attributes: ['firstName', 'lastName', 'profilePicture'] } },
-      {
-        association: 'rooms',
-        include: ['roomPictures']
+    return Accommodation.findAll({ include: ['addOnServices', {
+      association: 'accommodationPictures',
+      where: {
+        subjectType: 'accommodation'
       }
+    }, 'amenities',
+    { association: 'accommodationComments',
+      include: { model: Users, attributes: ['firstName', 'lastName', 'profilePicture'] },
+    },
+    {
+      association: 'rooms',
+      include: [
+        {
+          association: 'roomPictures',
+          where: {
+            subjectType: 'room'
+          }
+        }
+      ]
+    }
     ] });
   }
 

diff --git a/src/tests/fixtures/accommodation.fixture.js b/src/tests/fixtures/accommodation.fixture.js
@@ -88,7 +88,7 @@ export const newAccomodation = {
   locationId: faker.random.number({ min: 1, max: 9 }),
   rating: faker.random.number({ min: 1, max: 5 }),
   description: faker.lorem.sentence(),
-  accommodationPictures: [generateImage('Accommodation'), generateImage('Accommodation'), generateImage('Accommodation')],
+  accommodationPictures: [generateImage('accommodation'), generateImage('accommodation'), generateImage('accommodation')],
   addOnServices: [generateAddOn(), generateAddOn()],
   amenities: [generateAmenity(), generateAmenity()],
   rooms: [generateRoom(), generateRoom(), generateRoom()],
@@ -100,7 +100,7 @@ export const generateAccomodation = async () => {
     typeId: faker.random.number({ min: 1, max: 5 }),
     locationId: faker.random.number({ min: 1, max: 9 }),
     description: faker.lorem.sentence(),
-    accommodationPictures: [generateImage('Accommodation'), generateImage('Accommodation'), generateImage('Accommodation')],
+    accommodationPictures: [generateImage('accommodation'), generateImage('accommodation'), generateImage('accommodation')],
     addOnServices: [generateAddOn(), generateAddOn()],
     amenities: [generateAmenity(), generateAmenity()],
     rooms: [generateRoom2(), generateRoom2(), generateRoom2()],