added function to set cached algorithm

jest.setup.ts

@@ -350,24 +350,20 @@ const mockDataServices: MockDataServices = {
     ])
   ),
   fetchStudentLpLeAlg: jest.fn(() =>
-    Promise.resolve(
-        {
-          algorithm_id: 1,
-          id: 1,
-          short_name: 'studentTest',
-          student_id: 1,
-          topic_id: 1
-        }
-    )
+    Promise.resolve({
+      algorithm_id: 1,
+      id: 1,
+      short_name: 'studentTest',
+      student_id: 1,
+      topic_id: 1
+    })
   ),
   fetchTeacherLpLeAlg: jest.fn(() =>
-    Promise.resolve(
-        {
-          algorithm_id: 1,
-          short_name: 'teacherTest',
-          topic_id: 1
-        }
-    )
+    Promise.resolve({
+      algorithm_id: 1,
+      short_name: 'teacherTest',
+      topic_id: 1
+    })
   ),
   postStudentLpLeAlg: jest.fn(() =>
     Promise.resolve({

src/common/hooks/University/University.hooks.tsx

@@ -1,7 +1,7 @@
 import log from 'loglevel'
-import { usePersistedStore } from '@store'
+import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useState, useEffect, useMemo } from 'react'
+import { usePersistedStore } from '@store'
 
 export type UniversityHookReturn = {
   readonly university: string

src/common/utils/index.ts

@@ -1,4 +1,5 @@
 import { HaskiTheme } from './Theme/HaskiTheme'
 import { Theme } from './Theme/Theme'
 import { reportWebVitals, sendToAnalytics } from './Webvitals/Webvitals'
+
 export { reportWebVitals, sendToAnalytics, Theme, HaskiTheme }

src/components/AlgorithmSettingsModal/AlgorithmSettingsModal.hooks.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useContext } from 'react'
 import { SnackbarContext, postStudentLpLeAlg, postTeacherLpLeAlg } from '@services'
-import { usePersistedStore } from '@store'
+import { usePersistedStore, useStore } from '@store'
 
 /**
  *
@@ -25,6 +25,8 @@ export type useAlgorithmSettingsModalHookParams = {
 const useAlgorithmSettingsModal = (params: useAlgorithmSettingsModalHookParams) => {
   const { addSnackbar } = useContext(SnackbarContext)
   const getUser = usePersistedStore.getState().getUser
+  const setStudentLpLeAlgorithm = useStore.getState().setStudentLpLeAlgorithm
+  const setTeacherLpLeAlgorithm = useStore.getState().setTeacherLpLeAlgorithm
 
   const handleSave = useCallback(() => {
     getUser().then((user) => {
@@ -36,6 +38,7 @@ const useAlgorithmSettingsModal = (params: useAlgorithmSettingsModalHookParams)
           params.options[params.selected].key
         )
           .then(() => {
+            setTeacherLpLeAlgorithm(params.getIDs.topicID, params.options[params.selected].key)
             if (params.changeObserver) params.changeObserver()
           })
           .catch((error) => {
@@ -44,6 +47,7 @@ const useAlgorithmSettingsModal = (params: useAlgorithmSettingsModalHookParams)
       } else if (user.role === 'student') {
         postStudentLpLeAlg(user.settings.user_id, params.getIDs.topicID, params.options[params.selected].key)
           .then(() => {
+            setStudentLpLeAlgorithm(user.settings.user_id, params.getIDs.topicID, params.options[params.selected].key)
             if (params.changeObserver) params.changeObserver()
           })
           .catch((error) => {

src/components/AlgorithmSettingsModal/AlgorithmSettingsModal.test.tsx

@@ -11,7 +11,6 @@ const mockOptions = [
   { name: 'option3', description: 'description3', key: 'key3' }
 ]
 
-
 describe('AlgorithmSettingsModal', () => {
   it('is displayed with all options', () => {
     const open = true

src/components/Newsbanner/Newsbanner.hooks.tsx

@@ -1,10 +1,10 @@
+import i18next from 'i18next'
 import log from 'loglevel'
-import { useMemo, useState, useContext, useEffect } from 'react'
-import { SnackbarContext } from '@services'
-import { useSessionStore } from '@store'
+import { useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useUniversity } from '@common/hooks'
-import i18next from 'i18next'
+import { SnackbarContext } from '@services'
+import { useSessionStore } from '@store'
 
 /**
  * @prop  sets the newsItem if there is atleast one news

src/components/Newsbanner/Newsbanner.test.tsx

@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom'
-import { fireEvent, render, act, renderHook } from '@testing-library/react'
+import { act, fireEvent, render, renderHook } from '@testing-library/react'
 import { mockServices } from 'jest.setup'
-import Newsbanner from './Newsbanner'
 import { MemoryRouter } from 'react-router-dom'
 import { useUniversity } from '@common/hooks'
+import Newsbanner from './Newsbanner'
 
 describe('Newsbanner tests', () => {
   beforeEach(() => {

src/components/Newsbanner/Newsbanner.tsx

@@ -1,9 +1,9 @@
+import { keyframes } from '@emotion/react'
+import { memo } from 'react'
 import { Alert, Box, Collapse, IconButton, Typography } from '@common/components'
 import { Close } from '@common/icons'
-import { memo } from 'react'
-import { keyframes } from '@emotion/react'
-import { NewsbannerHookReturn, useNewsbanner as _useNewsbanner } from './Newsbanner.hooks'
 import { useSessionStore } from '@store'
+import { NewsbannerHookReturn, useNewsbanner as _useNewsbanner } from './Newsbanner.hooks'
 
 export type NewsbannerProps = {
   useNewsbanner?: () => NewsbannerHookReturn

src/components/PrivacyModal/PrivacyModal.test.tsx

@@ -1,5 +1,5 @@
 import '@testing-library/jest-dom'
-import { fireEvent, render, act } from '@testing-library/react'
+import { act, fireEvent, render } from '@testing-library/react'
 import { mockServices } from 'jest.setup'
 import * as router from 'react-router'
 import { MemoryRouter } from 'react-router-dom'

src/components/PrivacyModal/PrivacyModal.tsx

@@ -12,8 +12,8 @@ import {
   Tooltip,
   Typography
 } from '@common/components'
-import { PrivacyModalHookReturn, usePrivacyModal as _usePrivacyModal } from './PrivacyModal.hooks'
 import { useUniversity } from '@common/hooks'
+import { PrivacyModalHookReturn, usePrivacyModal as _usePrivacyModal } from './PrivacyModal.hooks'
 
 const style = {
   position: 'absolute',

src/components/TopicCard/TopicCard.hooks.tsx

@@ -56,7 +56,7 @@ export const useTopicCard = (params: TopicCardHookParams) => {
 
   const changeObserver = useCallback(() => {
     getUser().then((user) => {
-      getStudentAlgorithm(true, user.settings.user_id, params.topic?.id)
+      getStudentAlgorithm(user.settings.user_id, params.topic?.id)
         .then((res) => {
           setStudentSelection(res.short_name)
         })
@@ -75,7 +75,7 @@ export const useTopicCard = (params: TopicCardHookParams) => {
 
   useEffect(() => {
     getUser().then((user) => {
-      getStudentAlgorithm(false, user.settings.user_id, params.topic?.id)
+      getStudentAlgorithm(user.settings.user_id, params.topic?.id)
         .then((res) => {
           setStudentSelection(res.short_name)
         })

src/components/TopicCard/TopicCard.test.tsx

@@ -227,7 +227,7 @@ describe('TopicCard tests', () => {
     await waitFor(() => {
       expect(queryByText('components.TopicCard.learningPath')).toBeInTheDocument
       expect(queryByText('components.TopicCard.studentTest')).toBeInTheDocument
-      expect(mockServices.fetchStudentLpLeAlg).toHaveBeenCalledTimes(2)
+      expect(mockServices.fetchStudentLpLeAlg).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -292,7 +292,7 @@ describe('TopicCard tests', () => {
         })
       )
 
-      mockServices.fetchStudentLpLeAlg = jest
+    mockServices.fetchStudentLpLeAlg = jest
       .fn()
       .mockRejectedValueOnce(new Error('Error'))
       .mockRejectedValueOnce(new Error('Error'))
@@ -383,12 +383,12 @@ describe('TopicCard tests', () => {
           },
           university: 'TH-AB'
         })
-    )
+      )
 
     mockServices.fetchStudentLpLeAlg = jest
-    .fn()
-    .mockRejectedValueOnce(new Error('Error'))
-    .mockRejectedValueOnce(new Error('Error'))
+      .fn()
+      .mockRejectedValueOnce(new Error('Error'))
+      .mockRejectedValueOnce(new Error('Error'))
 
     const { queryByText } = render(
       <MemoryRouter>

src/core/LearningPathAlgorithm/StudentLpLeAlgorithm.ts

@@ -1,12 +1,6 @@
-type StudentLpLeAlgorithmReturn = (
-  ignoreCache: boolean,
-  userId?: number,
-  topicId?: number
-) => Promise<StudentLpLeAlgorithm>
+type StudentLpLeAlgorithmReturn = (userId?: number, topicId?: number) => Promise<StudentLpLeAlgorithm>
 
 type StudentLpLeAlgorithm = {
-  algorithm_id: number
-  id: number
   short_name: string
   student_id: number
   topic_id: number

src/core/LearningPathAlgorithm/TeacherLpLeAlgorithm.ts

@@ -1,7 +1,7 @@
 type TeacherLpLeAlgorithmReturn = (topicId?: number) => Promise<TeacherLpLeAlgorithm>
 
 type TeacherLpLeAlgorithm = {
-  algorithm_id: number
+  algorithm_id?: number
   short_name: string
   topic_id: number
 }

src/core/index.ts

@@ -33,9 +33,9 @@ import LearningPathElement from './LearningPathElement/LearningPathElement'
 import LearningPathElementStatus from './LearningPathElement/LearningPathElementStatus'
 import LearningPathLearningElement from './LearningPathLearningElement/LearningPathLearningElement'
 import LearningPathTopic from './LearningPathTopic/LearningPathTopic'
+import News, { NewsResponse } from './News/News'
 import ILS from './QuestionnaireResults/ILS'
 import ListK from './QuestionnaireResults/ListK'
-import News, { NewsResponse } from './News/News'
 import StudentLearningElement from './StudentLearningElement/StudentLearningElement'
 import Topic from './Topic/Topic'
 import User from './User/User'

src/pages/Contact/Contact.tsx

@@ -1,4 +1,4 @@
-import { useState, useContext } from 'react'
+import { useContext, useState } from 'react'
 import { ContactForm } from '@components'
 import { AuthContext } from '@services'
 import { ContactHookProps, ContactHookReturn, useContact as _useContact } from './Contact.hooks'

src/pages/MainFrame/MainFrame.tsx

@@ -6,9 +6,9 @@ import {
   Footer,
   LocalNavBar,
   MenuBar,
+  Newsbanner,
   OpenQuestionnaire,
-  PrivacyModal,
-  Newsbanner
+  PrivacyModal
 } from '@components'
 
 /**

src/services/LearningPathLearningElementAlgorithm/fetchStudentLpLeAlg.ts

@@ -16,11 +16,7 @@ import { fetchData } from '../RequestResponse'
  * @category Services
  */
 
-export const fetchStudentLpLeAlg: StudentLpLeAlgorithmReturn = async (
-  ingnoreCache: boolean,
-  userId?: number,
-  topicId?: number
-) => {
+export const fetchStudentLpLeAlg: StudentLpLeAlgorithmReturn = async (userId?: number, topicId?: number) => {
   return fetchData<StudentLpLeAlgorithm>(getConfig().BACKEND + `/user/${userId}/topic/${topicId}/studentAlgorithm`, {
     method: 'GET',
     credentials: 'include',

src/services/LearningPathLearningElementAlgorithm/fetchStudentLpLeAlgorithm.test.tsx

@@ -26,7 +26,7 @@ describe('fetchStudentLpLeAlg has expected behaviour', () => {
     const userId = 1
     const topicId = 1
 
-    const result = await fetchStudentLpLeAlg(false, userId, topicId)
+    const result = await fetchStudentLpLeAlg(userId, topicId)
 
     expect(fetch).toHaveBeenCalledWith(`${getConfig().BACKEND}/user/${userId}/topic/${topicId}/studentAlgorithm`, {
       method: 'GET',
@@ -54,7 +54,7 @@ describe('fetchStudentLpLeAlg has expected behaviour', () => {
     const userId = 1
     const topicId = 1
 
-    await expect(fetchStudentLpLeAlg(false, userId, topicId)).rejects.toThrow(expectedMessage)
+    await expect(fetchStudentLpLeAlg(userId, topicId)).rejects.toThrow(expectedMessage)
   })
 
   it('should throw an unknown error when the response does not have an error variable', async () => {
@@ -70,6 +70,6 @@ describe('fetchStudentLpLeAlg has expected behaviour', () => {
     const userId = 1
     const topicId = 1
 
-    await expect(fetchStudentLpLeAlg(false, userId, topicId)).rejects.toThrow('')
+    await expect(fetchStudentLpLeAlg(userId, topicId)).rejects.toThrow('')
   })
 })

src/services/News/fetchNews.tsx

@@ -1,6 +1,6 @@
+import { NewsResponse } from '@core'
 import { getConfig } from '@shared'
 import { fetchData } from '../RequestResponse'
-import { NewsResponse } from '@core'
 
 /**
  *

src/store/Slices/StudentLpLeAlgSlice.test.ts

@@ -0,0 +1,17 @@
+import '@testing-library/jest-dom'
+import { useStore } from '../Zustand/Store'
+
+describe('StudentLpLeAlgSlice', () => {
+  test('explicitely setting the algorithm in cache from the frontend', async () => {
+    const setStudentLpLeAlg = useStore.getState().setStudentLpLeAlgorithm
+    const getStudentLpLeAlgorithm = useStore.getState().getStudentLpLeAlgorithm
+    const userId = 1
+    const topicId = 1
+    const algorithmName = 'testAlgorithm'
+
+    setStudentLpLeAlg(userId, topicId, algorithmName)
+    const cachedAlgorithm = await getStudentLpLeAlgorithm(userId, topicId)
+
+    expect(cachedAlgorithm.short_name).toBe('testAlgorithm')
+  })
+})

src/store/Slices/StudentLpLeAlgSlice.ts

@@ -7,6 +7,7 @@ import { resetters } from '../Zustand/Store'
 export default interface StudentLpLeAlgorithmSlice {
   _cache_StudentLpLeAlgorithm_record: Record<string, StudentLpLeAlgorithm>
   getStudentLpLeAlgorithm: StudentLpLeAlgorithmReturn
+  setStudentLpLeAlgorithm: (userId?: number, topicId?: number, algorithmName?: string) => void
 }
 
 export const createStudentLpLeAlgorithmSlice: StateCreator<StoreState, [], [], StudentLpLeAlgorithmSlice> = (
@@ -16,10 +17,10 @@ export const createStudentLpLeAlgorithmSlice: StateCreator<StoreState, [], [], S
   resetters.push(() => set({ _cache_StudentLpLeAlgorithm_record: {} }))
   return {
     _cache_StudentLpLeAlgorithm_record: {},
-    getStudentLpLeAlgorithm: async (ignoreCache, userId, topicId) => {
+    getStudentLpLeAlgorithm: async (userId, topicId) => {
       const cached = get()._cache_StudentLpLeAlgorithm_record[`${userId}-${topicId}`]
-      if (!cached || ignoreCache) {
-        const studentLpLeAlgorithmResponse = await fetchStudentLpLeAlg(ignoreCache, userId, topicId)
+      if (!cached) {
+        const studentLpLeAlgorithmResponse = await fetchStudentLpLeAlg(userId, topicId)
         set({
           _cache_StudentLpLeAlgorithm_record: {
             ...get()._cache_StudentLpLeAlgorithm_record,
@@ -28,6 +29,21 @@ export const createStudentLpLeAlgorithmSlice: StateCreator<StoreState, [], [], S
         })
         return studentLpLeAlgorithmResponse
       } else return cached
+    },
+    setStudentLpLeAlgorithm: (userId, topicId, algorithmName) => {
+      if (userId && topicId && algorithmName) {
+        const updatedState = {
+          short_name: algorithmName,
+          student_id: userId,
+          topic_id: topicId
+        }
+        set({
+          _cache_StudentLpLeAlgorithm_record: {
+            ...get()._cache_StudentLpLeAlgorithm_record,
+            [`${userId}-${topicId}`]: updatedState
+          }
+        })
+      }
     }
   }
 }

src/store/Slices/TeacherLpLeAlgorithmSlice.test.ts

@@ -0,0 +1,16 @@
+import '@testing-library/jest-dom'
+import { useStore } from '../Zustand/Store'
+
+describe('TeacherLpLeAlgSlice', () => {
+  test('explicitely setting the algorithm in cache from the frontend', async () => {
+    const setTeacherLpLeAlg = useStore.getState().setTeacherLpLeAlgorithm
+    const getTeacherLpLeAlgorithm = useStore.getState().getTeacherLpLeAlgorithm
+    const topicId = 1
+    const algorithmName = 'testAlgorithm'
+
+    setTeacherLpLeAlg(topicId, algorithmName)
+    const cachedAlgorithm = await getTeacherLpLeAlgorithm(topicId)
+
+    expect(cachedAlgorithm.short_name).toBe('testAlgorithm')
+  })
+})