Cleanup code and fix unit testing

src/__tests__/incidents/hooks/useReportIncident.test.tsx

@@ -27,7 +27,9 @@ describe('useReportIncident', () => {
  date: subDays(new Date(), 3).toISOString(),
  department: 'some department',
  description: 'some description',
- } as Incident
+ reportedBy: 'some user',
+ reportByUserID: 'some id',
+ } as Incident
 
  const expectedIncident = {
  ...givenIncidentRequest,

src/incidents/hooks/useReportIncident.tsx

@@ -6,18 +6,15 @@ import IncidentRepository from '../../shared/db/IncidentRepository'
 import Incident from '../../shared/model/Incident'
 import validateIncident from '../util/validate-incident'
 
-
 const getIncidentCode = (): string => `I-${shortid.generate()}`
 
 export function reportIncident(incident: Incident): Promise<Incident> {
  const error = validateIncident(incident)
-
  if (isEmpty(error)) {
  const updatedIncident: Incident = {
  ...incident,
  code: getIncidentCode(),
  status: 'reported',
- //reportedBy: 'some user',
  reportedOn: new Date(Date.now()).toISOString(),
  }
  return IncidentRepository.save(updatedIncident)

src/incidents/report/ReportIncident.tsx

@@ -35,14 +35,14 @@ const ReportIncident = () => {
  useAddBreadcrumbs(breadcrumbs)
  const [incident, setIncident] = useState({
  reportedBy: user?.fullName, //user is read from redux store state.user and the fullName is used while showing details
+ reportByUserID: user?.id,
  date: new Date().toISOString(),
  department: '',
  category: '',
  categoryItem: '',
  description: '',
  patient: '',
- reportByUserID: user?.id,
- })
+ })
 
  const [error, setError] = useState<IncidentError | undefined>(undefined)
 

src/user/user-slice.ts

@@ -93,6 +93,7 @@ export const getCurrentSession = (username: string): AppThunk => async (dispatch
  id: user._id,
  givenName: (user as any).metadata.givenName,
  familyName: (user as any).metadata.familyName,
+ fullName: (user as any).metadata.fullName,
  },
  permissions: initialState.permissions,
  }),
@@ -109,6 +110,7 @@ export const login = (username: string, password: string): AppThunk => async (di
  id: user._id,
  givenName: (user as any).metadata.givenName,
  familyName: (user as any).metadata.familyName,
+ fullName: (user as any).metadata.fullName,
  },
  permissions: initialState.permissions,
  }),