Merge pull request #589 from ohtutraininghub/#566/feat/e2e-tests-for-557

#566/feat/e2e tests for 557

cypress/e2e/adminView.cy.ts

@@ -21,6 +21,10 @@ describe('Admin view', () => {
     cy.get('h1').contains('Admin dashboard');
   });
 
+  it('export course statistics should be accessible', () => {
+    cy.get('h2').contains('Export course statistics');
+  });
+
   it('titlelist should be accessible', () => {
     cy.get('h2').contains('Titles');
   });

cypress/e2e/courseStatistics.cy.ts

@@ -0,0 +1,40 @@
+import { Role } from '@prisma/client';
+
+const adminUser = {
+  name: 'Anna Admin',
+  email: '[email protected]',
+  role: Role.ADMIN,
+  profileCompleted: true,
+};
+
+const fromDate = '2100-09-10';
+const toDate = '2100-09-20';
+
+describe('Exporting Course Statistics', () => {
+  beforeEach(() => {
+    cy.task('clearDatabase');
+    cy.task('seedDatabase');
+    cy.login(adminUser.email, adminUser.role);
+
+    cy.get('[aria-label^="SpeedDial"]').click();
+    cy.getCy('dashboard').click();
+  });
+
+  it('should export csv file when correct dateframe is given', () => {
+    cy.getCy('exportFormFromDate').type(fromDate);
+    cy.getCy('exportFormToDate').type(toDate);
+    cy.getCy('exportStatsButton').click();
+    cy.contains('Download started');
+    cy.readFile(`cypress/downloads/training-data_${fromDate}_${toDate}.csv`);
+  });
+
+  it('should not export csv file when incorrect dateframe is given', () => {
+    cy.getCy('exportFormFromDate').type(toDate);
+    cy.getCy('exportFormToDate').type(fromDate);
+    cy.getCy('exportStatsButton').click();
+    cy.contains('Invalid date range');
+    cy.readFile(
+      `cypress/downloads/training-data_${toDate}_${fromDate}.csv`
+    ).should('not.exist');
+  });
+});

src/components/ExportStats/ExportForm.tsx

@@ -144,6 +144,7 @@ export default function ExportForm({ lang }: Props) {
         </FormControl>
         <Button
           type="submit"
+          data-testid="exportStatsButton"
           disabled={isSubmitting}
           variant="contained"
           color="primary"

src/lib/prisma/courses.ts

@@ -92,21 +92,29 @@ export const getCoursesForCsv = async (fromDate: Date, toDate: Date) => {
           name: true,
         },
       },
-      students: {
+      participations: {
         select: {
-          name: true,
-          country: {
+          user: {
             select: {
               name: true,
+              country: {
+                select: {
+                  name: true,
+                },
+              },
+              title: {
+                select: {
+                  name: true,
+                },
+              },
             },
           },
-          title: {
-            select: {
-              name: true,
-            },
+        },
+        orderBy: {
+          user: {
+            name: 'asc',
           },
         },
-        orderBy: [{ name: 'asc' }],
       },
     },
     orderBy: [{ startDate: 'asc' }, { name: 'asc' }],
@@ -124,10 +132,16 @@ export const getCoursesForCsv = async (fromDate: Date, toDate: Date) => {
   const formattedCourses = courses.map((course) => ({
     name: course.name,
     createdBy: { name: course.createdBy ? course.createdBy.name : null },
-    students: course.students.map((student) => ({
-      name: student.name,
-      country: { name: student.country ? student.country.name : null },
-      title: { name: student.title ? student.title.name : null },
+    students: course.participations.map((participation) => ({
+      name: participation.user.name,
+      country: {
+        name: participation.user.country
+          ? participation.user.country.name
+          : null,
+      },
+      title: {
+        name: participation.user.title ? participation.user.title.name : null,
+      },
     })),
     startDate: course.startDate,
     endDate: course.endDate,