graphql: Added graphql support for deworming

Author: OscarS05

api/src/graphql/resolvers.js

@@ -10,17 +10,23 @@ const {
   query: animalQueries,
   mutation: animalMutation,
 } = require('./resolvers/animal/index');
+const {
+  query: dewormingQueries,
+  mutation: dewormingMutation,
+} = require('./resolvers/deworming/index');
 
 const resolvers = {
   Query: {
     hello: () => 'Hello world!',
 
     ...userQueries,
     ...animalQueries,
+    ...dewormingQueries,
   },
   Mutation: {
     ...userMutations,
     ...animalMutation,
+    ...dewormingMutation,
   },
 
   NameType,

api/src/graphql/resolvers/deworming/deworming.resolvers.js

@@ -0,0 +1,48 @@
+const {
+  getAllDeworming,
+  getDeworming,
+  createDeworming,
+  updateDeworming,
+  deleteDeworming,
+} = require('../../../modules/deworming/deworming.service');
+const {
+  validateGraphQLSession,
+} = require('../../../middlewares/authentication');
+
+const getAll = async (_, { query = {} }, context) => {
+  const user = await validateGraphQLSession(context.req);
+
+  return getAllDeworming(user.id, query);
+};
+
+const getById = async (_, { id: dewormingId }, context) => {
+  const user = await validateGraphQLSession(context.req);
+
+  return getDeworming(user.id, dewormingId);
+};
+
+const create = async (_, { input }, context) => {
+  const user = await validateGraphQLSession(context.req);
+
+  return createDeworming(user.id, input);
+};
+
+const update = async (_, { id: dewormingId, changes }, context) => {
+  const user = await validateGraphQLSession(context.req);
+
+  return updateDeworming(user.id, dewormingId, changes);
+};
+
+const destroy = async (_, { id: dewormingId }, context) => {
+  const user = await validateGraphQLSession(context.req);
+
+  return deleteDeworming(user.id, dewormingId);
+};
+
+module.exports = {
+  getAll,
+  getById,
+  create,
+  update,
+  destroy,
+};

api/src/graphql/resolvers/deworming/index.js

@@ -0,0 +1,20 @@
+const {
+  getAll: getAllDewormings,
+  getById: getDewormingById,
+  create: createDeworming,
+  update: updateDeworming,
+  destroy: deleteDeworming,
+} = require('./deworming.resolvers');
+
+const query = {
+  dewormings: getAllDewormings,
+  deworming: getDewormingById,
+};
+
+const mutation = {
+  createDeworming,
+  updateDeworming,
+  deleteDeworming,
+};
+
+module.exports = { query, mutation };

api/src/graphql/schemas/animal.schema.graphql

@@ -23,6 +23,11 @@ type Animal {
   registeredAt: Date!
 }
 
+type AnimalSummaryResponse {
+  id: UUID!
+  code: String!
+}
+
 input AnimalFilter {
   animalId: ID
   code: String

api/src/graphql/schemas/deworming.schema.graphql

@@ -0,0 +1,36 @@
+type Query {
+  dewormings(query: queryDeworming): [Deworming!]!
+  deworming(id: UUID!): Deworming!
+}
+
+type Mutation {
+  createDeworming(input: CreateDeworming!): Deworming!
+  updateDeworming(id: UUID!, changes: UpdateDeworming!): Deworming!
+  deleteDeworming(id: UUID!): Int!
+}
+
+type Deworming {
+  id: UUID!
+  dewormer: String!
+  description: String
+  animal: AnimalSummaryResponse!
+  registeredAt: Date!
+}
+
+input queryDeworming {
+  animalId: UUID
+  dewormer: String
+  limit: Int
+  offset: Int
+}
+
+input CreateDeworming {
+  dewormer: String!
+  description: String
+  animalId: UUID!
+}
+
+input UpdateDeworming {
+  dewormer: String
+  description: String
+}

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

@@ -1,5 +1,3 @@
-const Boom = require('@hapi/boom');
-
 const dewormingService = require('./deworming.service');
 
 const getAllDeworming = async (req, res, next) => {
@@ -26,18 +24,9 @@ const createDeworming = async (req, res, next) => {
       animalId,
     });
 
-    if (!newDeworming?.id) {
-      throw Boom.badRequest('Create animal operation returns null');
-    }
-
-    const formattedDewormingData = await dewormingService.getDeworming(
-      userId,
-      newDeworming.id,
-    );
-
     res.status(201).json({
       message: 'Deworming was successfully created',
-      deworming: formattedDewormingData,
+      deworming: newDeworming,
     });
   } catch (error) {
     next(error);
@@ -55,17 +44,10 @@ const updateDeworming = async (req, res, next) => {
       dewormingId,
       dewormingData,
     );
-    if (!updatedDeworming?.id)
-      throw Boom.badRequest('Update animal operation returns null');
-
-    const formattedDewormingData = await dewormingService.getDeworming(
-      userId,
-      updatedDeworming.id,
-    );
 
     res.status(200).json({
       message: 'Deworming was successfully updated',
-      deworming: formattedDewormingData,
+      deworming: updatedDeworming,
     });
   } catch (error) {
     next(error);

api/src/modules/deworming/deworming.repository.js

@@ -1,8 +1,10 @@
 const sequelize = require('../../store/db/sequelize');
 
-const findAllDewormings = async (userId, filters) => {
+const findAllDewormings = async (userId, { where, limit, offset }) => {
   return sequelize.models.Deworming.findAll({
-    where: filters,
+    where,
+    limit,
+    offset,
     include: [
       {
         model: sequelize.models.Animal,

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

@@ -20,12 +20,18 @@ const formatDeworming = (dewormer) => {
 };
 
 const buildFilters = (query) => {
-  const { dewormer, animalId } = query;
+  const { dewormer, animalId, limit = 10, offset = 0 } = query;
 
-  return {
+  const where = {
     ...(dewormer && { dewormer: { [Op.iLike]: `%${dewormer}%` } }),
     ...(animalId && { animalId }),
   };
+
+  return {
+    where,
+    limit: limit ?? parseInt(limit, 10),
+    offset: offset ?? parseInt(offset, 10),
+  };
 };
 
 const getAllDeworming = async (userId, query) => {
@@ -80,7 +86,7 @@ const createDeworming = async (userId, dewormingData) => {
     throw Boom.badRequest('Something went wrong creating the deworming');
   }
 
-  return newdeworming;
+  return getDeworming(userId, newdeworming.id);
 };
 
 const updateDeworming = async (userId, dewormingId, dewormingData) => {
@@ -110,7 +116,7 @@ const updateDeworming = async (userId, dewormingId, dewormingData) => {
   if (updatedRows === 0) {
     throw Boom.badRequest('Something went wrong creating the deworming');
   }
-  return updatedDeworming;
+  return getDeworming(userId, updatedDeworming.id);
 };
 
 const deleteDeworming = async (userId, dewormingId) => {

tests/unit/deworming-service.test.js

@@ -98,7 +98,7 @@ describe('Deworming service', () => {
       expect(dewormingRepository.findAllDewormings).toHaveBeenCalledTimes(1);
       expect(dewormingRepository.findAllDewormings).toHaveBeenCalledWith(
         userId,
-        { animalId: query.animalId },
+        { where: { animalId: query.animalId }, limit: 10, offset: 0 },
       );
     });
 
@@ -193,6 +193,10 @@ describe('Deworming service', () => {
         id: fakeUuid,
       });
       animalRepository.findOne.mockResolvedValue(animal1());
+      dewormingRepository.findOne.mockResolvedValueOnce({
+        ...dbReponse,
+        id: fakeUuid,
+      });
 
       const result = await createDeworming(userId, dewormingData);
 
@@ -272,8 +276,9 @@ describe('Deworming service', () => {
     });
 
     test('It should return an updated deworming', async () => {
-      dewormingRepository.findOne.mockResolvedValue(deworming1());
+      dewormingRepository.findOne.mockResolvedValueOnce(deworming1());
       dewormingRepository.update.mockResolvedValue([1, [dbReponse]]);
+      dewormingRepository.findOne.mockResolvedValueOnce(dbReponse);
 
       const result = await updateDeworming(userId, dewormingId, dewormingData);