tests: Added unit test for deworming service

Author: OscarS05

api/app.js

@@ -34,6 +34,8 @@ const createApp = () => {
   app.use(ormErrorHandler);
   app.use(boomErrorHandler);
   app.use(errorHandler);
+
+  return app;
 };
 
 module.exports = createApp;

api/src/modules/deworming/deworming.controllers.js

@@ -4,15 +4,10 @@ const dewormingService = require('./deworming.service');
 
 const getAllDeworming = async (req, res, next) => {
   try {
-    const { dewormer, animalId } = req.query;
+    const { query } = req;
     const userId = req.user.sub;
 
-    const filters = {
-      ...(dewormer && { dewormer }),
-      ...(animalId && { animalId }),
-    };
-
-    const deworming = await dewormingService.getAllDeworming(userId, filters);
+    const deworming = await dewormingService.getAllDeworming(userId, query);
 
     res.status(200).json({ deworming, sucess: true });
   } catch (error) {

api/src/modules/deworming/deworming.service.js

@@ -1,4 +1,5 @@
 const Boom = require('@hapi/boom');
+const { Op } = require('sequelize');
 const { v4: uuidv4 } = require('uuid');
 
 const dewormingRepository = require('./deworming.repository');
@@ -9,49 +10,84 @@ const formatDeworming = (dewormer) => {
     id: dewormer.id,
     dewormer: dewormer.dewormer,
     description: dewormer.description || null,
-    animalId: dewormer.animal ? dewormer.animal.code : null,
+    animal: dewormer.animal ? dewormer.animal.code : null,
     registeredAt:
       dewormer.registeredAt.toISOString().split('T')[0] ||
       dewormer.registeredAt,
   };
 };
 
-const getAllDeworming = async (userId, filters) => {
+const buildFilters = (query) => {
+  const { dewormer, animalId } = query;
+
+  return {
+    ...(dewormer && { dewormer: { [Op.iLike]: `%${dewormer}%` } }),
+    ...(animalId && { animalId }),
+  };
+};
+
+const getAllDeworming = async (userId, query) => {
+  if (!query || typeof query !== 'object') {
+    throw Boom.badRequest('query was not provided');
+  }
+
+  const filters = buildFilters(query);
+
   const deworming = await dewormingRepository.findAllDewormings(
     userId,
     filters,
   );
 
+  if (deworming?.length === 0) return [];
+
   return deworming.map((d) => formatDeworming(d));
 };
 
 const getDeworming = async (userId, dewormingId) => {
+  if (!userId) throw Boom.badRequest('userId was not provided');
+  if (!dewormingId) throw Boom.badRequest('dewormingId was not provided');
+
   const deworming = await dewormingRepository.findOne(userId, dewormingId);
   if (!deworming?.id) throw Boom.notFound('Deworming does not exist');
+
   return formatDeworming(deworming);
 };
 
 const createDeworming = async (userId, dewormingData) => {
+  if (!userId) throw Boom.badRequest('userId was not provided');
+  if (!dewormingData?.dewormer || !dewormingData?.animalId) {
+    throw Boom.badRequest('dewormer was not provided');
+  }
+
   const animal = await animalRepository.findOne(userId, dewormingData.animalId);
-  if (!animal?.id)
+  if (!animal?.id) {
     throw Boom.notFound('Animal does not exist or does not belong to the user');
+  }
 
   const deworming = {
     id: uuidv4(),
     dewormer: dewormingData.dewormer,
-    description: dewormingData.description || null,
+    description: dewormingData?.description || null,
     animalId: dewormingData.animalId,
     registeredAt:
       dewormingData.registeredAt || new Date().toISOString().split('T')[0],
   };
 
   const newdeworming = await dewormingRepository.create(deworming);
-  if (!newdeworming?.id)
+  if (!newdeworming?.id) {
     throw Boom.badRequest('Something went wrong creating the deworming');
+  }
+
   return newdeworming;
 };
 
 const updateDeworming = async (userId, dewormingId, dewormingData) => {
+  if (!userId) throw Boom.badRequest('userId was not provided');
+  if (!dewormingId) throw Boom.badRequest('dewormingId was not provided');
+  if (!dewormingData?.dewormer && !dewormingData.description) {
+    throw Boom.badRequest('dewormingData was not provided');
+  }
+
   const deworming = await dewormingRepository.findOne(userId, dewormingId);
   if (!deworming?.id) throw Boom.conflict('deworming does not exists');
 
@@ -73,10 +109,19 @@ const updateDeworming = async (userId, dewormingId, dewormingData) => {
 };
 
 const deleteDeworming = async (userId, dewormingId) => {
+  if (!userId) throw Boom.badRequest('userId was not provided');
+  if (!dewormingId) throw Boom.badRequest('dewormingId was not provided');
+
   const deworming = await dewormingRepository.findOne(userId, dewormingId);
   if (!deworming?.id) throw Boom.conflict('deworming does not exists');
 
-  return dewormingRepository.destroy(dewormingId);
+  const affectedRows = await dewormingRepository.destroy(dewormingId);
+
+  if (affectedRows === 0) {
+    throw Boom.badRequest('Something went wrong deleting the deworming');
+  }
+
+  return affectedRows;
 };
 
 module.exports = {

api/src/modules/user/user.schemas.js

@@ -6,7 +6,7 @@ const email = Joi.string().email();
 const password = Joi.string()
   .min(8)
   .max(128)
-  .pattern('^[a-zA-Z0-9!@#$%^&*()_+\\-=\\[\\]{};\'":|,.<>\\/?]+$');
+  .pattern(/^[a-zA-Z0-9!@#$%^&*()_+\-=:|,.<>\\/?]+$/);
 
 const userEmailSchema = Joi.object({
   email: email.required(),

api/src/store/db/sequelize.js

@@ -5,7 +5,7 @@ const setupModels = require('./models/index');
 
 const options = {
   dialect: 'postgres',
-  logging: config.isProd ? false : console.info,
+  logging: config.isProd ? false : (msg) => console.info(msg),
 };
 
 if (config.isProd) {

tests/unit/animal-service.test.js

@@ -13,7 +13,13 @@ const {
 } = require('../../api/src/modules/animal/animal.service');
 const animalRepository = require('../../api/src/modules/animal/animal.repository');
 
-const { animal1, animal2, animal3 } = require('./utils/fake-data');
+const {
+  animal1,
+  animal2,
+  animal3,
+  user2,
+  animal4,
+} = require('./utils/fake-data');
 
 jest.mock('../../api/src/modules/animal/animal.repository', () => ({
   findAllAnimals: jest.fn(),
@@ -146,6 +152,23 @@ describe('Animal service', () => {
       result.forEach((animal) => expect(animal.breed).toEqual('Angus'));
     });
 
+    test('It should return an animal filtered by user2', async () => {
+      query = {
+        userId: user2().id,
+      };
+      animalRepository.findAllAnimals.mockResolvedValue([animal4()]);
+
+      const result = await getAllAnimals(query);
+
+      expect(animalRepository.findAllAnimals).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userId: query.userId,
+        }),
+      );
+      expect(result.length).toBe(1);
+      expect(result[0].code).toBe(animal4().code);
+    });
+
     afterEach(() => {
       jest.clearAllMocks();
     });