Allow api to return empty name fields from database

sfbrigade · Oct 27, 2024 · abad3f7 · abad3f7
1 parent e647d34
commit abad3f7
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 14 deletions.
diff --git a/server/routes/api/v1/patients/list.js b/server/routes/api/v1/patients/list.js
@@ -58,36 +58,62 @@ export default async function (fastify) {
 
       const splitQuery = patient.trim().split(' ');
 
-      let whereClase = {};
+      let whereClause = {};
       if (splitQuery.length > 1) {
-        whereClase = {
+        whereClause = {
           AND: [
             {
-              firstName: {
-                contains: splitQuery[0].trim(),
-                mode: 'insensitive',
-              },
+              OR: [
+                {
+                  firstName: {
+                    contains: splitQuery[0].trim(),
+                    mode: 'insensitive',
+                  },
+                },
+                { firstName: null },
+              ],
             },
             {
-              lastName: { contains: splitQuery[1].trim(), mode: 'insensitive' },
+              OR: [
+                {
+                  lastName: {
+                    contains: splitQuery[1].trim(),
+                    mode: 'insensitive',
+                  },
+                },
+                { lastName: null },
+              ],
             },
           ],
         };
       } else {
-        whereClase = {
+        whereClause = {
           OR: [
             { firstName: { contains: patient.trim(), mode: 'insensitive' } },
             { lastName: { contains: patient.trim(), mode: 'insensitive' } },
             {
               AND: [
                 {
-                  firstName: {
-                    contains: patient.trim(),
-                    mode: 'insensitive',
-                  },
+                  OR: [
+                    {
+                      firstName: {
+                        contains: patient.trim(),
+                        mode: 'insensitive',
+                      },
+                    },
+                    { firstName: null },
+                  ],
                 },
                 {
-                  lastName: { contains: patient.trim(), mode: 'insensitive' },
+                  OR: [
+                    {
+                      lastName: {
+                        contains: patient.trim(),
+                        mode: 'insensitive',
+                      },
+                    },
+                    { lastName: null },
+                  ],
                 },
               ],
             },
@@ -99,7 +125,7 @@ export default async function (fastify) {
         page,
         perPage,
         orderBy: [{ firstName: 'asc' }, { lastName: 'asc' }],
-        where: whereClase,
+        where: whereClause,
         include: {
           createdBy: true,
           updatedBy: true,

diff --git a/server/test/routes/api/v1/patients.test.js b/server/test/routes/api/v1/patients.test.js
@@ -141,6 +141,33 @@ describe('/api/v1/patients', () => {
         '2022-10-05T00:00:00.000Z',
       );
     });
+
+    it('should return a patient even if it has null values', async (t) => {
+      const app = await build(t);
+      await t.loadFixtures();
+      const headers = await t.authenticate('[email protected]', 'test');
+      let reply = await app
+        .inject()
+        .post('/api/v1/patients')
+        .payload({
+          id: '0849219e-e2c6-409b-bea4-1a229c3df805',
+          firstName: '',
+          middleName: '',
+          lastName: '',
+          gender: 'MALE',
+          language: 'ENGLISH',
+          dateOfBirth: '1990-01-01',
+        })
+        .headers(headers);
+
+      reply = await app
+        .inject()
+        .get('/api/v1/patients?patient=')
+        .headers(headers);
+
+      assert.deepStrictEqual(reply.statusCode, StatusCodes.OK);
+      assert.deepStrictEqual(JSON.parse(reply.payload).length, 4);
+    });
   });
 
   describe('GET /generate', () => {