Fixing relationship data parse method. UT fixed

src/constants/allowedFields.json

@@ -38,7 +38,8 @@
       "hairColors",
       "hasHeterochromia",
       "eyeColors",
-      "passedAway"
+      "passedAway",
+      "events"
     ]
   }
 }

src/db/models/pet.model.js

@@ -73,7 +73,6 @@ const petSchema = new Schema({
   },
   events: {
     type: [Schema.Types.ObjectId],
-    required: true,
     ref: 'Event'
   }
 })

src/functions/parsers.js

@@ -61,10 +61,24 @@ export const parseErrorMsg = {
   noIdeaCode: code => `No idea dude, the code ${code} has not been mapped so far`
 }
 
-export const findByIds = async ({ model, ids, findOne = false, parser = '_id name' }) => {
-  return findOne
+export const findByIds = async ({
+  model,
+  ids,
+  findOne = false,
+  parser = '_id name',
+  parseId = false
+}) => {
+  const findedData = findOne
     ? await model.findOne({ _id: ids }, parser)
     : await model.find().where('_id').in(ids).select(parser)
+
+  if (parseId) {
+    return findOne
+      ? { id: findedData._id, name: findedData.name }
+      : findedData.map(({ _id, name }) => ({ id: _id, name }))
+  } else {
+    return findedData
+  }
 }
 
 export const parseUniqueArray = (list, callback) =>

src/graphql/resolvers/Mutations.js

@@ -162,9 +162,10 @@ const Mutations = {
     try {
       const parsedNewEvent = new Event(eventInfo)
       await parsedNewEvent.save()
+      const { events } = await Pet.findById(eventInfo.associatedPets[0])
       await Pet.findOneAndUpdate(
         { _id: eventInfo.associatedPets[0] },
-        { events: [parsedNewEvent._id] }
+        { events: [...events, parsedNewEvent._id] }
       )
 
       return parsedNewEvent.toJSON()

src/graphql/resolvers/Queries.js

@@ -55,7 +55,12 @@ const Queries = {
     }
 
     const petTypeInfo = Promise.allSettled(
-      petPopulation.map(pet => new Promise(resolve => resolve(findByIds(PetType, pet.petType))))
+      petPopulation.map(
+        pet =>
+          new Promise(resolve =>
+            resolve(findByIds({ model: PetType, ids: pet.petType, parseId: true }))
+          )
+      )
     )
     const petTypeList = (await petTypeInfo).map(data => data.value[0].name)
     const parsedPetTypeList = parseUniqueArray(petTypeList, info => ({

src/graphql/resolvers/Relationships.js

@@ -22,17 +22,20 @@ const Relationships = {
       await findByIds({
         model: PetType,
         ids: petType,
-        findOne: true
+        findOne: true,
+        parseId: true
       }),
     hairColors: async ({ hairColors }) =>
       await findByIds({
         model: Color,
-        ids: hairColors
+        ids: hairColors,
+        parseId: true
       }),
     eyeColors: async ({ eyeColors }) =>
       await findByIds({
         model: Color,
-        ids: eyeColors
+        ids: eyeColors,
+        parseId: true
       }),
     events: async ({ events }) =>
       await findByIds({

src/graphql/resolvers/mocks/Mutations.mocks.json

@@ -27,7 +27,8 @@
       { "field": "weight", "value": 150 },
       { "field": "gender", "value": "masculine" },
       { "field": "hasHeterochromia", "value": true },
-      { "field": "passedAway", "value": false }
+      { "field": "passedAway", "value": false },
+      { "field": "events", "value": [] }
     ]
   }
 }

src/graphql/resolvers/tests/Mutations.test.js

@@ -350,7 +350,8 @@ describe('[Mutations]', () => {
         const nameToUpdate = 'modifiedTest'
         const modifiedPet = {
           ...petInfo,
-          name: nameToUpdate
+          name: nameToUpdate,
+          events: []
         }
 
         await Mutations.updatePet(null, { petInfo: modifiedPet }, { loggedUser })
@@ -405,7 +406,8 @@ describe('[Mutations]', () => {
             ...updateFields.pet
               .map(({ field, value }) => ({ [field]: value }))
               .reduce((finalObj, currentProp) => ({ ...finalObj, ...currentProp }), {}),
-            id: secondPet._id
+            id: secondPet._id,
+            events: []
           }
 
           await Mutations.updatePet(null, { petInfo: updatedSecondPet }, { loggedUser })