tests: Added e2e testing for vaccination endpoints

Author: OscarS05

api/src/modules/vaccination/vaccination.controllers.js

@@ -12,7 +12,7 @@ const getAllVaccination = async (req, res, next) => {
       query,
     );
 
-    res.status(200).json({ vaccinations, sucess: true });
+    res.status(200).json({ vaccinations });
   } catch (error) {
     next(error);
   }
@@ -38,7 +38,7 @@ const createVaccination = async (req, res, next) => {
     res.status(201).json({
       message: 'Vaccination was successfully created',
       success: true,
-      newVaccination: formattedVaccinationData,
+      vaccination: formattedVaccinationData,
     });
   } catch (error) {
     next(error);
@@ -56,8 +56,7 @@ const updateVaccination = async (req, res, next) => {
       vaccinationId,
       vaccinationData,
     );
-    if (!updatedVaccination?.id)
-      throw Boom.badRequest('Update animal operation returns null');
+
     const formattedVaccinationData = await vaccinationService.getVaccination(
       userId,
       updatedVaccination.id,
@@ -66,7 +65,7 @@ const updateVaccination = async (req, res, next) => {
     res.status(200).json({
       message: 'Vaccination was successfully updated',
       success: true,
-      updatedVaccination: formattedVaccinationData,
+      vaccination: formattedVaccinationData,
     });
   } catch (error) {
     next(error);
@@ -78,17 +77,15 @@ const deleteVaccination = async (req, res, next) => {
     const { vaccinationId } = req.params;
     const userId = req.user.sub;
 
-    const deletedVaccination = await vaccinationService.deleteVaccination(
+    const affectedRows = await vaccinationService.deleteVaccination(
       userId,
       vaccinationId,
     );
-    if (deletedVaccination === 0)
-      throw Boom.badRequest('Delete animal operation returns 0 rows affected');
 
     res.status(200).json({
       message: 'Vaccination was successfully deleted',
       success: true,
-      deletedVaccination,
+      affectedRows,
     });
   } catch (error) {
     next(error);

api/src/modules/vaccination/vaccination.routes.js

@@ -8,6 +8,8 @@ const { animalIdSchema } = require('../animal/animal.schemas');
 const {
   bodyVaccinationSchema,
   vaccinationIdSchema,
+  querySchema,
+  bodyToUpdateVaccinationSchema,
 } = require('./vaccination.schemas');
 
 const vaccinationControllers = require('./vaccination.controllers');
@@ -60,6 +62,7 @@ const vaccinationControllers = require('./vaccination.controllers');
 routes.get(
   '/vaccination',
   validateSession,
+  validatorHandler(querySchema, 'query'),
   vaccinationControllers.getAllVaccination,
 );
 
@@ -169,7 +172,7 @@ routes.patch(
   '/vaccination/:vaccinationId',
   validateSession,
   validatorHandler(vaccinationIdSchema, 'params'),
-  validatorHandler(bodyVaccinationSchema, 'body'),
+  validatorHandler(bodyToUpdateVaccinationSchema, 'body'),
   vaccinationControllers.updateVaccination,
 );
 

api/src/modules/vaccination/vaccination.schemas.js

@@ -12,13 +12,25 @@ const vaccinationIdSchema = Joi.object({
   vaccinationId: id.required(),
 });
 
+const querySchema = Joi.object({
+  vaccine: vaccine.optional(),
+  animalId: id.optional(),
+});
+
 const bodyVaccinationSchema = Joi.object({
   vaccine: vaccine.required(),
   description: description.optional(),
 });
 
+const bodyToUpdateVaccinationSchema = Joi.object({
+  vaccine: vaccine.optional(),
+  description: description.optional(),
+});
+
 module.exports = {
   vaccinationSchema,
   vaccinationIdSchema,
   bodyVaccinationSchema,
+  querySchema,
+  bodyToUpdateVaccinationSchema,
 };

api/src/modules/vaccination/vaccination.service.js

@@ -10,7 +10,9 @@ const formatVaccination = (vaccination) => {
     id: vaccination.id,
     vaccine: vaccination.vaccine,
     description: vaccination.description || null,
-    animal: vaccination.animal ? vaccination.animal.code : null,
+    animal: vaccination.animal
+      ? { id: vaccination.animal.id, code: vaccination.animal.code }
+      : null,
     registeredAt:
       vaccination.registeredAt.toISOString().split('T')[0] ||
       vaccination.registeredAt,

api/src/store/db/seeders/04-vaccination.js

@@ -8,6 +8,7 @@ module.exports = {
     }
 
     return queryInterface.bulkInsert(VACCINATION_TABLE, [
+      // User 1
       // animal1
       {
         id: 'daa915c2-192d-43b5-930d-88596673c6e0',
@@ -43,6 +44,8 @@ module.exports = {
         animal_id: 'e9ea0cea-62de-47be-b17a-4f6609e945a4',
         registered_at: '2025-04-23T23:40:07.036Z',
       },
+
+      // User 2
     ]);
   },
 

tests/e2e/deworming.e2e.js

@@ -142,9 +142,13 @@ describe('tests for user endpoints', () => {
   });
 
   describe('POST /animals/{animalId}/deworming', () => {
-    const inputBody = {
-      dewormer: 'ivermectin 5%',
-    };
+    let inputBody = null;
+
+    beforeEach(() => {
+      inputBody = {
+        dewormer: 'ivermectin 5%',
+      };
+    });
 
     test('It should return a new deworming without description.', async () => {
       const { statusCode, body } = await api
@@ -188,7 +192,7 @@ describe('tests for user endpoints', () => {
       inputBody.register = new Date();
 
       const { statusCode, body } = await api
-        .post(`/api/v1/animals`)
+        .post(`/api/v1/animals/${animalsUsr2[0].id}/deworming`)
         .set('Cookie', `accessToken=${accessTokenUser1}`)
         .send(inputBody);
 
@@ -200,12 +204,12 @@ describe('tests for user endpoints', () => {
       delete inputBody.dewormer;
 
       const { statusCode, body } = await api
-        .post(`/api/v1/animals`)
+        .post(`/api/v1/animals/${animalsUsr2[0].id}/deworming`)
         .set('Cookie', `accessToken=${accessTokenUser1}`)
         .send(inputBody);
 
       expect(statusCode).toBe(400);
-      expect(body.message).toMatch(/is required/);
+      expect(body.message).toMatch(/was not provided|is required/);
     });
   });