fix(appointmentrepository.ts): add escapeStringRegex to appointment srch

Added escapeStringRegexp to AppointmentRepository.ts to escape regex chars in appointment search feild in patient info area. fix HospitalRun#2029
JDarke · May 1, 2020 · f4dccc8 · f4dccc8
1 parent e94dfe5
commit f4dccc8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/__tests__/clients/db/AppointmentRepository.test.ts b/src/__tests__/clients/db/AppointmentRepository.test.ts
@@ -1,5 +1,5 @@
 import AppointmentRepository from 'clients/db/AppointmentRepository'
-import { appointments } from 'config/pouchdb'
+import { appointments, patients } from 'config/pouchdb'
 import Appointment from 'model/Appointment'
 
 const uuidV4Regex = /^[A-F\d]{8}-[A-F\d]{4}-4[A-F\d]{3}-[89AB][A-F\d]{3}-[A-F\d]{12}$/i
@@ -24,6 +24,21 @@ describe('Appointment Repository', () => {
     })
   })
 
+  describe('searchPatientAppointments', () => {
+    it('should escape all special chars from search text', async () => {
+      await patients.put({ _id: 'id2222' })
+      await appointments.put({ _id: 'id3333', patientId: 'id2222', location: 'id-]?}(){*[$+.^\\' })
+
+      const result = await AppointmentRepository.searchPatientAppointments(
+        'id2222',
+        'id-]?}(){*[$+.^\\',
+      )
+
+      expect(result).toHaveLength(1)
+      expect(result[0].id).toEqual('id3333')
+    })
+  })
+
   describe('save', () => {
     it('should create an id that is a uuid', async () => {
       const newAppointment = await AppointmentRepository.save({

diff --git a/src/clients/db/AppointmentRepository.ts b/src/clients/db/AppointmentRepository.ts
@@ -1,3 +1,4 @@
+import escapeStringRegexp from 'escape-string-regexp'
 import Appointment from 'model/Appointment'
 import { appointments } from 'config/pouchdb'
 import Repository from './Repository'
@@ -9,6 +10,7 @@ export class AppointmentRepository extends Repository<Appointment> {
 
   // Fuzzy search for patient appointments. Used for patient appointment search bar
   async searchPatientAppointments(patientId: string, text: string): Promise<Appointment[]> {
+    const escapedString = escapeStringRegexp(text)
     return super.search({
       selector: {
         $and: [
@@ -19,17 +21,17 @@ export class AppointmentRepository extends Repository<Appointment> {
             $or: [
               {
                 location: {
-                  $regex: RegExp(text, 'i'),
+                  $regex: RegExp(escapedString, 'i'),
                 },
               },
               {
                 reason: {
-                  $regex: RegExp(text, 'i'),
+                  $regex: RegExp(escapedString, 'i'),
                 },
               },
               {
                 type: {
-                  $regex: RegExp(text, 'i'),
+                  $regex: RegExp(escapedString, 'i'),
                 },
               },
             ],