feat: teachers can create letters now

hei-school · Nov 20, 2024 · 47fcd2a · 47fcd2a
1 parent deafe34
commit 47fcd2a
Show file tree

Hide file tree

Showing 22 changed files with 375 additions and 170 deletions.
diff --git a/cypress/e2e/download.cy.tsx b/cypress/e2e/download.cy.tsx
@@ -25,7 +25,7 @@ describe("Manager.Work.Docs.Download", () => {
     );
     cy.intercept(
       "POST",
-      `/students/${student1Mock.id}/work_files/raw?filename=new_document&work_study_status=WORKING*`,
+      `/users/${student1Mock.id}/work_files/raw?filename=new_document&work_study_status=WORKING*`,
       newWorkerDoc
     );
 
@@ -60,32 +60,32 @@ describe("Student.Transcript.Docs.Download", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files?*`,
+      `/users/${student1Mock.id}/work_files?*`,
       workDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files/${workDoc1.id}`,
+      `/users/${student1Mock.id}/work_files/${workDoc1.id}`,
       workDoc1
     );
 
@@ -110,22 +110,22 @@ describe("Student.Work.Docs.Download", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
@@ -160,32 +160,32 @@ describe("Student.Other.Docs.Download", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files?*`,
+      `/users/${student1Mock.id}/work_files?*`,
       workDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files/${workDoc1.id}`,
+      `/users/${student1Mock.id}/work_files/${workDoc1.id}`,
       workDoc1
     );
 

diff --git a/cypress/e2e/letter.event.cy.tsx b/cypress/e2e/letter.event.cy.tsx
@@ -12,11 +12,9 @@ describe("Letter.event", () => {
       `/events/${event1mock.id}/participants?page=1&page_size=10`,
       eventParticipantsMock
     ).as("getEventParticipantPage1");
-    cy.intercept(
-      "POST",
-      `/students/${student1Mock.id}/letters?*`,
-      newLetter
-    ).as("createLetter");
+    cy.intercept("POST", `/users/${student1Mock.id}/letters?*`, newLetter).as(
+      "createLetter"
+    );
     cy.intercept("GET", `/events/${event1mock.id}`, event1mock);
   });
 

diff --git a/cypress/e2e/letters.cy.tsx → cypress/e2e/letters.users.cy.tsx b/cypress/e2e/letters.cy.tsx → cypress/e2e/letters.users.cy.tsx
@@ -1,43 +1,43 @@
 import {
   newLetter,
-  statsMocks,
   student1LettersMocks,
+  teacher1LettersMocks,
 } from "../fixtures/api_mocks/letters-mocks";
 import {student1Mock, studentsMock} from "../fixtures/api_mocks/students-mocks";
+import {teacher1Mock} from "../fixtures/api_mocks/teachers-mocks";
 
 const ITEM_PER_LIST = 10;
 
-describe("Student.Letters", () => {
+const testLettersFunctionality = (
+  role: string,
+  id: string,
+  letterMocks: any
+) => {
   beforeEach(() => {
-    cy.login({role: "STUDENT"});
-    cy.intercept(
-      "GET",
-      `/students/${student1Mock.id}/letters?page=1&page_size=10`,
-      student1LettersMocks.slice(0, ITEM_PER_LIST)
-    ).as("getStudent1LettersPage1");
-    cy.intercept(
-      "POST",
-      `/students/${student1Mock.id}/letters?*`,
-      newLetter
-    ).as("createLetter");
-    cy.intercept("GET", `/students/${newLetter.id}`);
-    cy.intercept("GET", `letters/stats`, statsMocks).as("getStats");
+    cy.login({role});
+
+    const userId = id;
+    expect(userId).to.exist;
+
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/letters?page=1&page_size=10&status=PENDING`,
-      student1LettersMocks
-    ).as("getStudent1LettersPending");
+      `/users/${userId}/letters?page=1&page_size=10`,
+      letterMocks.slice(0, ITEM_PER_LIST)
+    ).as("getusers1LettersPage1");
+    cy.intercept("POST", `/users/${userId}/letters?*`, newLetter).as(
+      "createLetter"
+    );
   });
 
-  it("student can list his letters", () => {
+  it("can list letters", () => {
     cy.getByTestid("letters-list-tab").click();
-    cy.wait("@getStudent1LettersPage1");
+    cy.wait("@getusers1LettersPage1");
     cy.getByTestid("letter-list-wrapper")
       .children()
       .should("have.length", ITEM_PER_LIST);
   });
 
-  it("student can create his letters", () => {
+  it("can create letters", () => {
     cy.getByTestid("letters-list-tab").click();
     cy.getByTestid("letter-create-button").click();
     cy.get("#description").type(newLetter.description!);
@@ -50,6 +50,14 @@ describe("Student.Letters", () => {
       expect(interception.response!.statusCode).to.eq(200);
     });
   });
+};
+
+describe("Student.Letters", () => {
+  testLettersFunctionality("STUDENT", student1Mock.id, student1LettersMocks);
+});
+
+describe("Teacher.Letters", () => {
+  testLettersFunctionality("TEACHER", teacher1Mock.id, teacher1LettersMocks);
 });
 
 describe("Manager.Letters.student", () => {
@@ -83,22 +91,20 @@ describe("Manager.Letters.student", () => {
   it("manager can list student letter", () => {
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/letters?page=1&page_size=10`,
+      `/users/${student1Mock.id}/letters?page=1&page_size=10`,
       student1LettersMocks.slice(0, ITEM_PER_LIST)
-    ).as("getStudent1LettersPage1");
+    ).as("getusers1LettersPage1");
     cy.getByTestid("letters-list-tab").click();
-    cy.wait("@getStudent1LettersPage1");
+    cy.wait("@getusers1LettersPage1");
     cy.getByTestid("letter-list-wrapper")
       .children()
       .should("have.length", ITEM_PER_LIST);
   });
 
   it("manager can create letters for student", () => {
-    cy.intercept(
-      "POST",
-      `/students/${student1Mock.id}/letters?*`,
-      newLetter
-    ).as("createLetter");
+    cy.intercept("POST", `/users/${student1Mock.id}/letters?*`, newLetter).as(
+      "createLetter"
+    );
     cy.getByTestid("letters-list-tab").click();
     cy.getByTestid("letter-create-button").click();
     cy.get("#description").type(newLetter.description!);

diff --git a/cypress/e2e/student.docs.cy.tsx b/cypress/e2e/student.docs.cy.tsx
@@ -14,32 +14,32 @@ describe("Transcript.Docs", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files?*`,
+      `/users/${student1Mock.id}/work_files?*`,
       workDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files/${workDoc1.id}`,
+      `/users/${student1Mock.id}/work_files/${workDoc1.id}`,
       workDoc1
     );
 
@@ -63,22 +63,22 @@ describe("Work.Docs", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
@@ -112,32 +112,32 @@ describe("Other.Docs", () => {
     cy.intercept("GET", `/students/${student1Mock.id}`, student1Mock);
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
+      `/users/${student1Mock.id}/files?file_type=TRANSCRIPT*`,
       transcriptsMock
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files?file_type=OTHER*`,
+      `/users/${student1Mock.id}/files?file_type=OTHER*`,
       otherDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${transcript1.id}`,
+      `/users/${student1Mock.id}/files/${transcript1.id}`,
       transcript1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/files/${otherDoc1.id}`,
+      `/users/${student1Mock.id}/files/${otherDoc1.id}`,
       otherDoc1
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files?*`,
+      `/users/${student1Mock.id}/work_files?*`,
       workDocsMocks
     );
     cy.intercept(
       "GET",
-      `/students/${student1Mock.id}/work_files/${workDoc1.id}`,
+      `/users/${student1Mock.id}/work_files/${workDoc1.id}`,
       workDoc1
     );
 

diff --git a/cypress/e2e/student.fees.mpbs.cy.tsx b/cypress/e2e/student.fees.mpbs.cy.tsx
@@ -33,7 +33,7 @@ describe("Mobile payment by student", () => {
     ).should("exist");
   });
 
-  it("can create a mpbs", () => {
+  it.only("can create a mpbs", () => {
     const [fee1Mock, ...fees] = feesMock;
 
     cy.intercept(
@@ -52,7 +52,7 @@ describe("Mobile payment by student", () => {
     ).click({force: true});
 
     cy.get("#psp_id").click().type("MP240726.1541.D88425");
-    cy.get('[data-testid="SaveIcon"]').click();
+    cy.contains("Enregistrer").click();
 
     cy.contains("Frais créés avec succès");