Merge pull request #1559 from digitalfabrik/1381-comparison-applicant…

…-contact

1381: Make name comparison more robust

administration/@types/normalize-strings.d.ts

@@ -0,0 +1,3 @@
+declare module 'normalize-strings' {
+  export default function normalize(str: string, customCharmap?: Record<string, string>): string
+}

administration/package.json

@@ -23,6 +23,7 @@
     "date-fns": "^2.30.0",
     "graphql": "^16.8.1",
     "localforage": "^1.10.0",
+    "normalize-strings": "^1.1.1",
     "notistack": "^3.0.1",
     "pdf-lib": "^1.17.1",
     "react": "^18.2.0",

administration/src/mui-modules/application/forms/OrganizationForm.tsx

@@ -1,6 +1,7 @@
 import { Alert, Typography, styled } from '@mui/material'
 
 import { OrganizationInput } from '../../../generated/graphql'
+import { normalizeName } from '../../../util/normalizeString'
 import { useUpdateStateCallback } from '../hooks/useUpdateStateCallback'
 import CheckboxForm from '../primitive-inputs/CheckboxForm'
 import EmailForm from '../primitive-inputs/EmailForm'
@@ -98,7 +99,7 @@ const OrganizationForm: Form<State, Options, ValidatedInput, AdditionalProps> =
       <Typography>
         Bitte geben Sie hier die Daten der Person an, die ihr ehrenamtliches Engagement bestätigen kann.
       </Typography>
-      {applicantName === state.contactName.shortText && (
+      {normalizeName(applicantName) === normalizeName(state.contactName.shortText) && (
         <WarningContactPersonSamePerson severity='warning'>
           Die Kontaktperson der Organisation und die antragsstellende Person scheinen identisch zu sein. Bitte beachten
           Sie, dass Anträge auf dieser Grundlage nicht bewilligt werden können.

administration/src/util/__tests__/normalizeString.test.ts

@@ -0,0 +1,19 @@
+import normalizeString, { normalizeName } from '../normalizeString'
+
+describe('normalizeString', () => {
+  it('should normalize search string', () => {
+    expect(normalizeString('Donauwörth')).toBe('donauworth')
+    expect(normalizeString('äöUEJJ')).toBe('aouejj')
+  })
+
+  it('should trim whitespaces', () => {
+    expect(normalizeString('   test  ')).toBe('test')
+  })
+})
+
+describe('normalizeName', () => {
+  it('should normalize search string', () => {
+    expect(normalizeName('Dr. Hans-Peter Müller Lüdenscheid  ')).toBe('drhanspetermullerludenscheid')
+    expect(normalizeName('Dr. Hans Peter Müller Lüdenscheid')).toBe('drhanspetermullerludenscheid')
+  })
+})

administration/src/util/normalizeString.ts

@@ -0,0 +1,6 @@
+import normalizeStrings from 'normalize-strings'
+
+const normalizeString = (str: string): string => normalizeStrings(str).toLowerCase().trim()
+export const normalizeName = (name: string) => normalizeString(name).replaceAll(/[^a-zA-Z0-9]/g, '')
+
+export default normalizeString

administration/tsconfig.json

@@ -19,6 +19,7 @@
     "types": ["node", "jest"]
   },
   "include": [
+    "@types",
     "src",
     "scripts",
     "jest.config.ts",