Merge pull request #1469 from UniversityOfHelsinkiCS/fix-grouping-que…

…stion

fix: Grouping filter not working for grouping question

cypress/integration/feedbackCount.spec.js → cypress/integration/feedbackResults.spec.js

@@ -2,9 +2,9 @@ const { teacher, student } = require('../fixtures/headers')
 
 /// <reference types="Cypress" />
 
-describe('Feedback count', () => {
+describe('Feedback results', () => {
   beforeEach(() => {
-    cy.createFeedbackTarget({ extraStudents: 5 })
+    cy.createFeedbackTarget({ extraStudents: 12 })
     cy.setFeedbackActive()
     cy.getTestFbtId().as('fbtId')
   })
@@ -50,8 +50,8 @@ describe('Feedback count', () => {
       .invoke('text')
       .then(newCount => {
         cy.get('@fbtPageInitialCount').then(initialCount => {
-          const newCountInt = parseInt(newCount.split("/")[0], 10)
-          const initialCountInt = parseInt(initialCount.split("/")[0], 10)
+          const newCountInt = parseInt(newCount.split('/')[0], 10)
+          const initialCountInt = parseInt(initialCount.split('/')[0], 10)
           expect(newCountInt).to.eq(initialCountInt + 1)
         })
       })

src/client/pages/FeedbackTarget/tabs/Results/GroupSelector.tsx

@@ -35,17 +35,21 @@ const GroupButton: React.FC<GroupButtonProps> = ({ option, onClick, value, ...pr
 
   const buttonLabel = <Box p={1}>{option.name}</Box>
 
+  const hasTooltipContent = option.studentCount || option.teachers
+
   const buttonChildren =
-    option.id !== 'ALL' ? (
+    option.id !== 'ALL' && hasTooltipContent ? (
       <PaperTooltip
         title={
           <Box p="0.3rem">
-            <Typography variant="body2">
-              {t('common:studentCount')}:{' '}
-              <Typography component="span" color="textSecondary">
-                {option.studentCount}
+            {option.studentCount && (
+              <Typography variant="body2">
+                {t('common:studentCount')}:{' '}
+                <Typography component="span" color="textSecondary">
+                  {option.studentCount}
+                </Typography>
               </Typography>
-            </Typography>
+            )}
             {option.teachers && (
               <>
                 <Typography variant="body2" sx={{ mt: '0.3rem', mb: '0.2rem' }}>
@@ -105,7 +109,6 @@ const GroupSelector: React.FC<GroupSelectorProps> = ({
       teachers: group.teachers,
       studentCount: group.studentCount,
     }))
-    .filter(group => group.studentCount && group.studentCount > 0 && group.studentCount < studentCount)
     .sort(sortGroups)
 
   const groupOptions: GroupOption[] = React.useMemo(() => {

src/client/pages/FeedbackTarget/tabs/Results/Results.jsx

@@ -15,7 +15,6 @@ import useIsMobile from '../../../../hooks/useIsMobile'
 import useChartConfig from './QuestionResults/useChartConfig'
 import { useFeedbackTargetContext } from '../../FeedbackTargetContext'
 import GroupSelector from './GroupSelector'
-import { getGroups } from './utils'
 import useFeedbackTargetId from '../../useFeedbackTargetId'
 
 const NotEnoughFeedbacks = ({ t }) => (
@@ -49,6 +48,26 @@ const OnlyTeacherAccess = ({ t }) => (
   </Box>
 )
 
+/**
+ * Get the groups for the feedback target
+ * If the feedback target has a grouping question, use the options from that question
+ * Otherwise use the groups from the feedback target
+ */
+const getGroups = feedbackTarget => {
+  const groupQuestion = feedbackTarget.surveys.teacherSurvey?.questions?.find(q => q.secondaryType === 'GROUPING')
+
+  if (groupQuestion) {
+    return groupQuestion.data.options.map(opt => ({
+      id: opt.id,
+      name: opt.label,
+      teachers: feedbackTarget.groups?.find(g => g.id === opt.id)?.teachers,
+      // It would be nice to have studentCount here as well. Atm it's not available when using grouping question
+    }))
+  }
+
+  return feedbackTarget.groups ?? []
+}
+
 const FilterSection = ({ isLoading, groupId, setGroupId, feedbackResults, exportRef }) => {
   const { ref, inView } = useInView({ initialInView: true })
 
@@ -59,6 +78,7 @@ const FilterSection = ({ isLoading, groupId, setGroupId, feedbackResults, export
   const groups = getGroups(feedbackTarget)
 
   const hasMultipleGroups = groups?.length > 1
+
   const feedbacks = feedbackResults?.feedbacks
   const groupsAvailable = feedbackResults?.groupsAvailable
 

src/client/pages/FeedbackTarget/tabs/Results/utils.js

@@ -3,18 +3,6 @@ import { format, parseISO } from 'date-fns'
 export const getCourseStartDate = feedbackTarget =>
   format(parseISO(feedbackTarget.courseRealisation.startDate), 'yyyy-MM-dd')
 
-export const getGroups = feedbackTarget => {
-  const groupQuestion = feedbackTarget.surveys.teacherSurvey?.questions?.find(q => q.secondaryType === 'GROUPING')
-  if (groupQuestion) {
-    return groupQuestion.data.options.map(opt => ({
-      id: opt.id,
-      name: opt.label,
-    }))
-  }
-
-  return feedbackTarget.groups ?? []
-}
-
 export const sortGroups = ({ name: nameA }, { name: nameB }) => {
   // Helper function to check if a string contains any numbers
   const containsNumber = str => /\d/.test(str)

src/server/test/seedFeedbacks.ts

@@ -0,0 +1,33 @@
+import Feedback, { FeedbackData } from 'models/feedback'
+import { FeedbackTarget, UserFeedbackTarget } from '../models'
+import { TEST_COURSE_REALISATION_ID } from './testIds'
+
+export const seedFeedbacks = async (feedbackDatas: FeedbackData[]) => {
+  const fbt = await FeedbackTarget.findOne({
+    where: {
+      courseRealisationId: TEST_COURSE_REALISATION_ID,
+    },
+    include: [
+      {
+        model: UserFeedbackTarget,
+        as: 'userFeedbackTargets',
+      },
+    ],
+  })
+
+  await Promise.all(
+    // @ts-expect-error fbt is any
+    (fbt!.userFeedbackTargets as any[]).map(async (uft, idx) => {
+      if (idx >= feedbackDatas.length) return
+      const ftData = feedbackDatas[idx]
+      const ft = await Feedback.create({
+        data: ftData,
+        userId: uft.userId,
+        degreeStudyRight: null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      })
+      await uft.update({ feedbackId: ft.id })
+    })
+  )
+}

src/server/test/testingController.js

@@ -2,7 +2,7 @@ const Router = require('express')
 const _ = require('lodash')
 const morgan = require('morgan')
 
-const { FeedbackTarget, CourseRealisation, User } = require('../models')
+const { FeedbackTarget } = require('../models')
 
 const { ApplicationError } = require('../util/customErrors')
 const { initTestSummary } = require('./seedSummary')
@@ -12,79 +12,6 @@ const { TEST_COURSE_REALISATION_ID } = require('./testIds')
 const { inProduction } = require('../util/config')
 const { getUniversitySurvey } = require('../services/surveys')
 
-const updateCourseRealisation = async (req, res) => {
-  const { feedbackTargetId } = req.params
-
-  const feedbackTarget = await FeedbackTarget.findByPk(Number(feedbackTargetId))
-
-  if (!feedbackTarget) ApplicationError.NotFound(`FBT ${feedbackTargetId} not found`)
-
-  const courseRealisation = await CourseRealisation.findByPk(feedbackTarget.courseRealisationId)
-
-  if (!courseRealisation) ApplicationError.NotFound(`Course realisation ${courseRealisation.id} not found`)
-
-  const updates = _.pick(req.body, ['startDate', 'endDate'])
-
-  Object.assign(courseRealisation, updates)
-
-  await courseRealisation.save()
-
-  const { feedbackResponse, feedbackResponseEmailSent } = req.body
-
-  Object.assign(feedbackTarget, {
-    opensAt: updates.startDate,
-    closesAt: updates.endDate,
-    feedbackResponse,
-    feedbackResponseEmailSent,
-  })
-
-  await feedbackTarget.save()
-
-  return res.sendStatus(200)
-}
-
-const updateManyCourseRealisations = async (req, res) => {
-  const { user } = req
-
-  if (!user) throw new ApplicationError('No user found', 404)
-
-  const { feedbackTargetIds } = _.pick(req.body, ['feedbackTargetIds'])
-
-  const updates = _.pick(req.body, ['startDate', 'endDate'])
-
-  /* eslint-disable */
-  for (const id of feedbackTargetIds) {
-    const feedbackTarget = await FeedbackTarget.findByPk(Number(id))
-    if (!feedbackTarget) ApplicationError.NotFound(`FBT ${id} not found`)
-
-    const courseRealisation = await CourseRealisation.findByPk(feedbackTarget.courseRealisationId)
-    if (!courseRealisation) ApplicationError.NotFound(`CUR ${feedbackTarget.courseRealisationId} not found`)
-
-    Object.assign(courseRealisation, updates)
-
-    await courseRealisation.save()
-  }
-  /* eslint-enable */
-
-  return res.send(200)
-}
-
-const updateUser = async (req, res) => {
-  const { userId } = req.params
-
-  const user = await User.findByPk(userId)
-
-  if (!user) throw new ApplicationError('User not found', 404)
-
-  const updates = _.pick(req.body, ['employeeNumber', 'studentNumber', 'username'])
-
-  Object.assign(user, updates)
-
-  await user.save()
-
-  return res.send(200)
-}
-
 const initSummary = async (req, res) => {
   await initTestSummary({ user: _.pick(req.body, ['hyPersonSisuId', 'uid']) })
   return res.send(200)
@@ -129,6 +56,12 @@ const resetDb = async (req, res) => {
   return res.send(204)
 }
 
+const seedFeedbacks = async (req, res) => {
+  const { feedbackDatas } = req.body
+  await seedFeedbacks(feedbackDatas)
+  return res.send(201)
+}
+
 const getTestFbtId = async (req, res) => {
   const fbt = await FeedbackTarget.findOne({
     where: {
@@ -157,14 +90,10 @@ router.use((_, __, next) => {
 router.use(Router.json())
 router.use(morgan('dev'))
 
-router.put('/user/:userId', updateUser)
-
-router.put('/courseRealisation/:feedbackTargetId', updateCourseRealisation)
-router.put('/courseRealisations', updateManyCourseRealisations)
-
 router.post('/init-summary', initSummary)
 router.post('/seed-users', seedTestUsers2)
 router.post('/seed-feedback-targets', seedFeedbackTargets)
+router.post('/seed-feedbacks', seedFeedbacks)
 router.post('/seed-organisation-correspondent', seedOrganisationCorrespondentHandler)
 router.post('/reset-db', resetDb)