(SP: ) Adjust names for finished quizzes

src/constants/request.ts

@@ -126,12 +126,12 @@ export const URLs = {
     patch: '/quizzes/:id',
     delete: '/quizzes/:id'
   },
-  finishedQuizzes: {
-    add: '/finished-quizzes',
-    patch: '/finished-quizzes/:id',
-    get: '/finished-quizzes',
-    getById: '/finished-quizzes/:id',
-    getByQuizId: '/finished-quizzes/:cooperationId/:quizId'
+  attempts: {
+    add: '/quizzes/attempts',
+    patch: '/quizzes/attempts/:id',
+    get: '/quizzes/attempts',
+    getById: '/quizzes/attempts/:id',
+    getByQuizId: '/quizzes/attempts/:cooperationId/:quizId'
   },
   attachments: {
     post: '/attachments'

src/containers/quiz/quiz-header/QuizHeader.tsx

@@ -2,7 +2,7 @@ import Box from '@mui/material/Box'
 
 import {
   ActiveQuizInfo,
-  FinishedQuizInfo,
+  AttemptInfo,
   TutorQuizInfo
 } from '~/containers/quiz/quiz-info/QuizInfo'
 import TitleWithDescription from '~/components/title-with-description/TitleWithDescription'
@@ -51,7 +51,7 @@ const QuizHeader: React.FC<QuizHeaderProps> = ({
 
     if (type === 'finished') {
       return (
-        <FinishedQuizInfo
+        <AttemptInfo
           createdAt={createdAt}
           points={points}
           totalPoints={totalPoints}

src/containers/quiz/quiz-info/QuizInfo.tsx

@@ -69,14 +69,14 @@ const ActiveQuizInfo: React.FC<ActiveQuizInfoProps> = ({
   )
 }
 
-type FinishedQuizInfoProps = {
+type AttemptInfoProps = {
   points: number
   totalPoints: number
   createdAt: string
   updatedAt: string
 }
 
-const FinishedQuizInfo: React.FC<FinishedQuizInfoProps> = ({
+const AttemptInfo: React.FC<AttemptInfoProps> = ({
   points,
   totalPoints,
   createdAt,
@@ -254,4 +254,4 @@ const StartViewQuizInfo: React.FC<StartViewQuizInfoProps> = ({
   )
 }
 
-export { ActiveQuizInfo, FinishedQuizInfo, TutorQuizInfo, StartViewQuizInfo }
+export { ActiveQuizInfo, AttemptInfo, TutorQuizInfo, StartViewQuizInfo }

src/pages/quiz-attempts/QuizAttempts.tsx

@@ -49,13 +49,13 @@ const QuizAttemptsPage: React.FC = () => {
 
   const isTimeLimitNeeded = (timeLimit as string) != 'No limit'
 
-  const getFinishedQuizzes = useCallback(() => {
-    return ResourceService.getFinishedQuizzesByQuizId(cooperationId, quizId)
+  const getAttempts = useCallback(() => {
+    return ResourceService.getAttemptByQuizId(cooperationId, quizId)
   }, [cooperationId, quizId])
 
-  const { data: finishedQuizzes = [] } = useQuery({
-    queryKey: ['finished-quizzes', cooperationId, quizId],
-    queryFn: getFinishedQuizzes,
+  const { data: attempts = [] } = useQuery({
+    queryKey: ['attempts', cooperationId, quizId],
+    queryFn: getAttempts,
     options: {
       staleTime: ONE_HOUR
     }
@@ -88,8 +88,8 @@ const QuizAttemptsPage: React.FC = () => {
   }
 
   const attemptsList =
-    finishedQuizzes.length !== 0 ? (
-      finishedQuizzes.map((item) => {
+    attempts.length !== 0 ? (
+      attempts.map((item) => {
         return (
           <Box key={item._id} sx={styles.attemptWrapper}>
             <QuizInfoSection
@@ -126,7 +126,7 @@ const QuizAttemptsPage: React.FC = () => {
         onStart={isTimeLimitNeeded ? openModal : handleStart}
         questionsAmount={items.length}
         timeLimit={timeLimit}
-        usedAttempts={finishedQuizzes.length}
+        usedAttempts={attempts.length}
       />
       <Divider sx={styles.divider} />
       {attemptsList}

src/pages/quiz-review/QuizReview.tsx

@@ -1,14 +1,14 @@
 import { useParams } from 'react-router-dom'
 import PageWrapper from '~/components/page-wrapper/PageWrapper'
 import { styles } from '~/pages/quiz-review/QuizReview.styles'
-import { FinishedQuiz } from '~/pages/quiz/QuizVariants'
+import { Attempt } from '~/pages/quiz/QuizVariants'
 
 const QuizReview: React.FC = () => {
   const { attemptId = '' } = useParams()
 
   return (
     <PageWrapper sx={styles.quizzesWrapper}>
-      <FinishedQuiz finishedQuizId={attemptId} />
+      <Attempt attemptId={attemptId} />
     </PageWrapper>
   )
 }

src/pages/quiz/QuizVariants.tsx

@@ -42,7 +42,7 @@ const ActiveQuiz: React.FC = () => {
   const { t } = useTranslation()
 
   const [isOpen, setIsOpen] = useState(false)
-  const [finishedQuizId, setFinishedQuizId] = useState('')
+  const [attemptId, setAttemptId] = useState('')
 
   const { handleInputChange, handleNonInputValueChange, data } = useForm<
     Record<string, string | string[]>
@@ -97,8 +97,8 @@ const ActiveQuiz: React.FC = () => {
     })
   }, [data, items])
 
-  const addFinishedQuiz = useCallback(() => {
-    return ResourceService.addFinishedQuiz({
+  const addAttempt = useCallback(() => {
+    return ResourceService.addAttempt({
       cooperation: cooperationId,
       quiz: quizId,
       grade,
@@ -108,14 +108,14 @@ const ActiveQuiz: React.FC = () => {
 
   const { handleErrorAlert, handleAlert } = useSnackbarAlert()
 
-  const { mutateAsync: createFinishedQuiz } = useMutation({
-    mutationFn: addFinishedQuiz,
-    queryKey: ['finished-quizzes'],
+  const { mutateAsync: createAttempt } = useMutation({
+    mutationFn: addAttempt,
+    queryKey: ['attempts'],
     onError: handleErrorAlert
   })
 
-  const editFinishedQuiz = useCallback(() => {
-    return ResourceService.editFinishedQuiz(finishedQuizId, {
+  const editAttempt = useCallback(() => {
+    return ResourceService.editAttempt(attemptId, {
       grade,
       results: items.map(({ text, answers, _id }) => {
         return {
@@ -130,11 +130,11 @@ const ActiveQuiz: React.FC = () => {
         }
       })
     })
-  }, [data, finishedQuizId, grade, items])
+  }, [data, attemptId, grade, items])
 
-  const { mutate: updateFinishedQuiz } = useMutation({
-    mutationFn: editFinishedQuiz,
-    queryKey: ['finished-quizzes'],
+  const { mutate: updateAttempt } = useMutation({
+    mutationFn: editAttempt,
+    queryKey: ['attempts'],
     onError: handleErrorAlert
   })
 
@@ -146,7 +146,7 @@ const ActiveQuiz: React.FC = () => {
       handleInputChange={handleInputChange}
       handleNonInputValueChange={handleNonInputChange}
       isEditable
-      onNextButtonClick={updateFinishedQuiz}
+      onNextButtonClick={updateAttempt}
       questions={items}
       sx={styles.selectableQuestionQuizWrapper}
     />
@@ -165,7 +165,7 @@ const ActiveQuiz: React.FC = () => {
   }, [])
 
   const handleFinish = useCallback(() => {
-    updateFinishedQuiz()
+    updateAttempt()
     setIsOpen(false)
 
     handleAlert({
@@ -177,7 +177,7 @@ const ActiveQuiz: React.FC = () => {
       navigate(
         getFullUrl({
           pathname: authRoutes.cooperationQuizReview.route,
-          parameters: { id: cooperationId, quizId, attemptId: finishedQuizId }
+          parameters: { id: cooperationId, quizId, attemptId: attemptId }
         })
       )
     } else {
@@ -187,22 +187,22 @@ const ActiveQuiz: React.FC = () => {
     scoredResponses,
     cooperationId,
     quizId,
-    finishedQuizId,
+    attemptId,
     handleAlert,
     navigate,
-    updateFinishedQuiz
+    updateAttempt
   ])
 
   const questionsAnswered = Object.keys(data).length
 
   useEffect(() => {
-    const postFinishedQuiz = async () => {
-      const finishedQuiz = await createFinishedQuiz()
-      setFinishedQuizId(finishedQuiz?._id)
+    const postAttempt = async () => {
+      const attempt = await createAttempt()
+      setAttemptId(attempt?._id)
     }
 
-    void postFinishedQuiz()
-  }, [createFinishedQuiz])
+    void postAttempt()
+  }, [createAttempt])
 
   if (isLoading || !quiz) {
     return <Loader pageLoad />
@@ -241,16 +241,16 @@ const ActiveQuiz: React.FC = () => {
   )
 }
 
-type FinishedQuizProps = {
-  finishedQuizId: string
+type AttemptProps = {
+  attemptId: string
 }
 
-const FinishedQuiz: React.FC<FinishedQuizProps> = ({ finishedQuizId }) => {
+const Attempt: React.FC<AttemptProps> = ({ attemptId }) => {
   const { quizId = '' } = useParams()
 
-  const getFinishedQuiz = useCallback(() => {
-    return ResourceService.getFinishedQuiz(finishedQuizId)
-  }, [finishedQuizId])
+  const getAttempt = useCallback(() => {
+    return ResourceService.getAttempt(attemptId)
+  }, [attemptId])
 
   const { handleInputChange, handleNonInputValueChange } = useForm<
     Record<string, string | string[]>
@@ -262,9 +262,9 @@ const FinishedQuiz: React.FC<FinishedQuizProps> = ({ finishedQuizId }) => {
     handleNonInputValueChange(key, value)
   }
 
-  const { data: finishedQuiz, isLoading: isFinishedQuizLoading } = useQuery({
-    queryKey: ['finished-quizzes', finishedQuizId],
-    queryFn: getFinishedQuiz
+  const { data: attempt, isLoading: isAttemptLoading } = useQuery({
+    queryKey: ['attempts', attemptId],
+    queryFn: getAttempt
   })
 
   const { quiz, isLoading: isQuizLoading } = useQuizQuery(quizId)
@@ -280,7 +280,7 @@ const FinishedQuiz: React.FC<FinishedQuizProps> = ({ finishedQuizId }) => {
 
   const mappedResults = useMemo(() => {
     const result: Record<string, string | string[]> = {}
-    finishedQuiz?.results?.forEach(({ question, answers }) => {
+    attempt?.results?.forEach(({ question, answers }) => {
       const quizQuestion = quiz?.items.find((item) => item.text === question)
       const quizQuestionId = quizQuestion?._id
 
@@ -294,7 +294,7 @@ const FinishedQuiz: React.FC<FinishedQuizProps> = ({ finishedQuizId }) => {
     })
 
     return result
-  }, [finishedQuiz?.results, quiz?.items])
+  }, [attempt?.results, quiz?.items])
 
   const questionsBlock = isStepper ? (
     <SelectableQuestionQuizView
@@ -319,21 +319,21 @@ const FinishedQuiz: React.FC<FinishedQuizProps> = ({ finishedQuizId }) => {
     />
   )
 
-  if (isFinishedQuizLoading || !finishedQuiz || isQuizLoading) {
+  if (isAttemptLoading || !attempt || isQuizLoading) {
     return <Loader pageLoad />
   }
 
   return (
     <PageWrapper sx={styles.quizzesWrapper}>
       <Box component={ComponentEnum.Form} sx={styles.quizzesWrapper}>
         <QuizHeader
-          createdAt={finishedQuiz.createdAt}
+          createdAt={attempt.createdAt}
           description={description}
           points={items.length}
           title={title}
-          totalPoints={finishedQuiz.results?.length}
+          totalPoints={attempt.results?.length}
           type='finished'
-          updatedAt={finishedQuiz.updatedAt}
+          updatedAt={attempt.updatedAt}
         />
         <Divider sx={styles.divider} />
         {questionsBlock}
@@ -405,4 +405,4 @@ const TutorQuiz: React.FC = () => {
   )
 }
 
-export { ActiveQuiz, FinishedQuiz, TutorQuiz }
+export { ActiveQuiz, Attempt, TutorQuiz }

src/services/resource-service.ts

@@ -20,13 +20,13 @@ import {
   CreateCategoriesParams,
   UpdateQuestionParams,
   CreateQuizParams,
-  type CreateFinishedQuizParams,
-  type UpdateFinishedQuizParams,
+  type CreateAttemptParams,
+  type UpdateAttemptParams,
   Quiz,
   UpdateQuizParams,
   ApiMethodEnum,
   GetQuestion,
-  type FinishedQuiz,
+  type Attempt,
   type FinishedAttempts
 } from '~/types'
 import { createUrlPath } from '~/utils/helper-functions'
@@ -132,37 +132,37 @@ export const ResourceService = {
       })
     })
   },
-  addFinishedQuiz: async (data: CreateFinishedQuizParams) => {
-    return baseService.request<FinishedQuiz>({
+  addAttempt: async (data: CreateAttemptParams) => {
+    return baseService.request<Attempt>({
       method: 'POST',
-      url: URLs.finishedQuizzes.add,
+      url: URLs.attempts.add,
       data
     })
   },
-  editFinishedQuiz: (id: string, data: UpdateFinishedQuizParams) => {
+  editAttempt: (id: string, data: UpdateAttemptParams) => {
     return baseService.request<void>({
       method: 'PATCH',
       url: getFullUrl({
-        pathname: URLs.finishedQuizzes.patch,
+        pathname: URLs.attempts.patch,
         parameters: { id }
       }),
       data
     })
   },
-  getFinishedQuiz: async (id: string) => {
-    return baseService.request<FinishedQuiz>({
+  getAttempt: async (id: string) => {
+    return baseService.request<Attempt>({
       method: 'GET',
       url: getFullUrl({
-        pathname: URLs.finishedQuizzes.getById,
+        pathname: URLs.attempts.getById,
         parameters: { id }
       })
     })
   },
-  getFinishedQuizzesByQuizId: (cooperationId: string, quizId: string) => {
+  getAttemptByQuizId: (cooperationId: string, quizId: string) => {
     return baseService.request<FinishedAttempts>({
       method: 'GET',
       url: getFullUrl({
-        pathname: URLs.finishedQuizzes.getByQuizId,
+        pathname: URLs.attempts.getByQuizId,
         parameters: { cooperationId, quizId }
       })
     })

src/types/attempt/attempt.index.ts

@@ -0,0 +1 @@
+export * from './types/attempt.types'