feat: made mentors visibly reusable and implemented automatic clean up of unused mentor users

Author: alexander-schefe

packages/backend/seeds/users.json

@@ -20,14 +20,14 @@
     "companyId": "expGermany",
     "course": "Trainee Course",
     "createdAt": "2019-08-01T11:25:18.000Z",
-    "email": "trainee@exampleCompany.com",
+    "email": "traineeZwei@exampleCompany.com",
     "firstName": "Trainee",
-    "lastName": "Traineeson",
+    "lastName": "Zwei",
     "language": "de",
     "startDate": "2022-08-01T22:00:00.000Z",
     "endDate": "2027-07-31T22:00:00.000Z",
     "theme": "light",
-    "token": "123",
+    "token": "1234",
     "type": "Trainee",
     "trainerId": "456"
   },
@@ -36,14 +36,14 @@
     "companyId": "expGermany",
     "course": "Trainee Course",
     "createdAt": "2019-08-01T11:25:18.000Z",
-    "email": "trainee@exampleCompany.com",
+    "email": "traineeDrei@exampleCompany.com",
     "firstName": "Trainee",
-    "lastName": "Traineeson",
+    "lastName": "Drei",
     "language": "de",
     "startDate": "2022-08-01T22:00:00.000Z",
     "endDate": "2027-07-31T22:00:00.000Z",
     "theme": "light",
-    "token": "123",
+    "token": "12345",
     "type": "Trainee",
     "trainerId": "456"
   },

packages/backend/src/resolvers/admin.resolver.ts

@@ -16,6 +16,7 @@ import { parseISODateString } from '../utils/date'
 import { t } from '../i18n'
 import { deleteMentor, generateMentor, validateMentor } from '../services/mentor.service'
 import { allMentors, mentorById } from '../repositories/mentor.repo'
+import { papersByMentor } from '../repositories/paper.repo'
 
 export const adminResolver: GqlResolvers<AdminContext> = {
   Admin: {},
@@ -29,6 +30,11 @@ export const adminResolver: GqlResolvers<AdminContext> = {
 
       await Promise.all(
         users.map(async (user) => {
+          if (isMentor(user)) {
+            const papers = await papersByMentor(user.id)
+            if (!papers || papers.filter((paper) => paper.status !== 'Archived').length === 0) await deleteMentor(user)
+          }
+
           if (!user.deleteAt) {
             return
           }

packages/components/src/paper-form.tsx

@@ -74,14 +74,14 @@ export const CreateBriefingLayout: React.FC<CreateBriefingLayoutProps> = ({
 
         <StyledFormGridItem>{emptyFieldTrainee}</StyledFormGridItem>
 
-        <StyledFormGridItem>{firstNameMentorInput}</StyledFormGridItem>
-
-        <StyledFormGridItem>{lastNameMentorInput}</StyledFormGridItem>
-
         <StyledFormGridItem>{emailMentorInput}</StyledFormGridItem>
 
         <StyledFormGridItem>{emptyFieldMentor}</StyledFormGridItem>
 
+        <StyledFormGridItem>{firstNameMentorInput}</StyledFormGridItem>
+
+        <StyledFormGridItem>{lastNameMentorInput}</StyledFormGridItem>
+
         <StyledFormGridItem>{customerInput}</StyledFormGridItem>
 
         <StyledFormGridDateItem>

packages/frontend/src/components/paper-create-form.tsx

@@ -1,11 +1,11 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { Input, Text, TextProps, DefaultTheme, Spacer, StyledSelect } from '@lara/components'
 
 import strings from '../locales/localization'
 import { PrimaryButton } from './button'
 import { useValidationHelper } from '../helper/validation-helper'
-import { Trainer } from '../graphql'
+import { Trainer, useUserEmailPageMutation } from '../graphql'
 import { CreateBriefingLayout } from '@lara/components/lib/paper-form'
 
 interface CreateBriefingFormProps {
@@ -36,14 +36,18 @@ const inputLabelProps: TextProps = {
 
 export const PaperCreateForm: React.FC<CreateBriefingFormProps> = ({ trainer, submit, blurSubmit }) => {
   const { validateEmail } = useValidationHelper()
+  const [getUserByEmail] = useUserEmailPageMutation()
+  const [nameInputDisabled, setNameInputDisabled] = useState(false)
 
   const {
     register,
+    setValue,
     handleSubmit,
     formState: { errors },
   } = useForm<CreateBriefingFormData>()
 
   const onSubmit = handleSubmit((formdata) => {
+    console.log('HELLO')
     setUpdating(true)
     submit(formdata).then(() => {
       setUpdating(false)
@@ -77,6 +81,40 @@ export const PaperCreateForm: React.FC<CreateBriefingFormProps> = ({ trainer, su
             </StyledSelect>
           </>
         }
+        emailMentorInput={
+          <>
+            <Text color={getFontColor(errors.emailMentor)} {...inputLabelProps}>
+              {strings.paper.createBriefing.emailMentor}
+            </Text>
+            <Input
+              type="email"
+              {...register('emailMentor', {
+                required: true,
+                validate: validateEmail,
+              })}
+              disabled={updating}
+              error={Boolean(errors.emailMentor)}
+              onBlur={async (e) => {
+                if (e.target.value.trim() === '') {
+                  setNameInputDisabled(false)
+                  return
+                }
+                await getUserByEmail({
+                  variables: {
+                    email: e.target.value,
+                  },
+                }).then((response) => {
+                  if (response.data?.getUserByEmail) {
+                    setValue('firstNameMentor', response.data.getUserByEmail.firstName, { shouldValidate: true })
+                    setValue('lastNameMentor', response.data.getUserByEmail.lastName, { shouldValidate: true })
+                    setNameInputDisabled(true)
+                  } else setNameInputDisabled(false)
+                })
+                if (blurSubmit) onSubmit()
+              }}
+            />
+          </>
+        }
         firstNameMentorInput={
           <>
             <Text color={getFontColor(errors.firstNameMentor)} {...inputLabelProps}>
@@ -86,7 +124,7 @@ export const PaperCreateForm: React.FC<CreateBriefingFormProps> = ({ trainer, su
               {...register('firstNameMentor', {
                 required: strings.validation.required,
               })}
-              disabled={updating}
+              disabled={nameInputDisabled}
               error={Boolean(errors.firstNameMentor)}
               onBlur={blurSubmit ? onSubmit : undefined}
             />
@@ -102,29 +140,12 @@ export const PaperCreateForm: React.FC<CreateBriefingFormProps> = ({ trainer, su
               {...register('lastNameMentor', {
                 required: strings.validation.required,
               })}
-              disabled={updating}
+              disabled={nameInputDisabled}
               error={Boolean(errors.lastNameMentor)}
               onBlur={blurSubmit ? onSubmit : undefined}
             />
           </>
         }
-        emailMentorInput={
-          <>
-            <Text color={getFontColor(errors.emailMentor)} {...inputLabelProps}>
-              {strings.paper.createBriefing.emailMentor}
-            </Text>
-            <Input
-              type="email"
-              {...register('emailMentor', {
-                required: true,
-                validate: validateEmail,
-              })}
-              disabled={updating}
-              error={Boolean(errors.emailMentor)}
-              onBlur={blurSubmit ? onSubmit : undefined}
-            />
-          </>
-        }
         emptyFieldMentor={<></>}
         customerInput={
           <>