Merge pull request #68 from WildCodeSchool/dev

Dev vers staging

Author: ChloeNuage

backend/src/services/groupMemberService.ts

@@ -14,32 +14,35 @@ type RemoveMembersInput = {
 
 /**
  * Add users to a group from a list of emails.
- * - Silently skips emails that do not match a user.
+ * - Add emails to a pending invitation list if they do not exist in the db.
  */
 export async function addMembersToGroup({ userEmails, groupId }: AddMembersInput) {
   if (!userEmails.length) return;
 
   await Promise.all(
     userEmails.map(async (userEmail) => {
       const userToAdd = await User.findOne({ where: { email: userEmail } });
-      const userPending = await PendingInvitation.findOne({ where: { userEmail: userEmail } });
-      if (!userToAdd && !userPending) {
-        // if the user does not exist in the db, add it to the pendinginvitationList
-        const pendingInvitation = PendingInvitation.create({
-          userEmail: userEmail,
-          groupId,
+
+      //If the user exists in the db, check if they are already a member of the group and if not, add them to the group
+      if (userToAdd) {
+        const existingMember = await GroupMember.findOne({
+          where: { userId: userToAdd.id, groupId },
         });
+        if (existingMember) return;
 
-        await pendingInvitation.save();
+        const groupMember = GroupMember.create({ userId: userToAdd.id, groupId });
+        await groupMember.save();
         return;
       }
 
-      const groupMember = GroupMember.create({
-        userId: userToAdd?.id,
-        groupId,
+      //If the user does not exist in the db, check if they are already in the pendinginvitationList and if not, add them to the pendinginvitationList
+      const userPending = await PendingInvitation.findOne({
+        where: { userEmail, groupId },
       });
+      if (userPending) return;
 
-      await groupMember.save();
+      const pendingInvitation = PendingInvitation.create({ userEmail, groupId });
+      await pendingInvitation.save();
     }),
   );
 }

frontend/.github/workflows/playwright.yml

@@ -0,0 +1,27 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30

frontend/.gitignore

@@ -22,4 +22,11 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.env
+.env
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/

frontend/e2e/authentication.spec.ts

@@ -0,0 +1,68 @@
+import { test, expect } from '@playwright/test';
+
+function generateRandomEmail() {
+  return `test-${Math.random()}@example.com`;
+}
+
+const randomEmail = generateRandomEmail();
+
+test('inscription', async ({ page }) => {
+  await page.goto('http://localhost:3000/');
+
+  // Vérifier que la homepage est chargée
+  await expect(page.getByRole('heading', { name: 'Le site magique pour ne plus se prendre la tête pour les cadeaux communs.', level: 1 })).toBeVisible();
+
+  // Inscription
+  await page.getByRole('link', { name: 'Inscription' }).click();
+  await expect(page.getByRole('heading', { name: 'Créer mon compte', level: 2 })).toBeVisible();
+
+  // Remplir le formulaire d'inscription
+  await page.getByTestId('lastNameRegister').fill('Doe');
+  await page.getByTestId('firstNameRegister').fill('John');
+  await page.getByTestId('emailRegister').fill(randomEmail);
+  await page.getByTestId('birthdayRegister').fill('1990-01-01');
+  await page.getByTestId('passwordRegister').fill('Unmdp123!');
+  await page.getByTestId('passwordConfirmRegister').fill('Unmdp123!');
+  await page.getByTestId('buttonRegister').click();
+
+  // Vérifier que l'utilisateur est redirigé vers le dashboard
+    await expect(page.getByRole('heading', { name: 'Mes groupes', level: 2 })).toBeVisible();
+    await expect(page.getByText('Aucun groupe de discussion')).toBeVisible();
+    await expect(page.getByRole('button', { name: 'Créer un groupe' })).toBeVisible();
+
+    // Accéder au profil
+    await page.getByTestId('[object Object]').nth(2).click();
+    await expect(page.getByRole('heading', { name: 'Mon profil', level: 1 })).toBeVisible();
+
+    // Modifier le profil
+    const btnModifier = page.getByRole('button', { name: 'Modifier mes infos' });
+    await btnModifier.scrollIntoViewIfNeeded();
+    await btnModifier.click();
+
+    // Remplir le formulaire de modification
+    await page.getByTestId('firstName').fill('Jane');
+    await page.getByTestId('email').fill('jane.doe@example.com');
+    await page.getByTestId('phoneNumber').fill('1234567890');
+    await page.getByTestId('birthday').fill('1990-01-01');
+
+    await page.getByRole('button', { name: 'Enregistrer' }).click();
+    await expect(page.getByText('Profil mis à jour avec succès !')).toBeVisible();
+
+    // Supprimer le profil
+    const btnSupprimer = page.getByRole('button', { name: 'Supprimer mon profil' });
+    await btnSupprimer.scrollIntoViewIfNeeded();
+    await btnSupprimer.click();
+
+    // Vérifier que le modal de suppression est ouvert
+    await expect(page.getByTestId('modal-delete-profile')).toBeVisible();
+    await page.getByRole('button', { name: 'Confirmer' }).click();
+    
+
+    // Vérifier que l'utilisateur est déconnecté
+    await expect(page.getByText('Votre profil a bien été supprimé.')).toBeVisible();
+    await expect(page.url()).toBe('http://localhost:3000/');
+    await expect(page.getByRole('link', { name: 'Connexion' })).toBeVisible();
+    await expect(page.getByRole('link', { name: 'Inscription' })).toBeVisible();
+
+});
+