Merge Master (#293)

Suboyyy · Remi-pcn · web-flow · commit e1316e5280f8 · 2025-11-23T15:57:22.000+01:00
* fix: remove rent filtering in fetchUserItems

* fix: comment out rent filtering logic in fetchUserItems

* fix: test after rent item modification

* fix: president + color in white

* fix: color

* ci: not use prisma 7

* ci: dockerfile disable prisma7

* fix: update Discord invite links and year references in email templates

---------

Co-authored-by: Remi-pcn &lt;remiponcin55@gmail.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
-      - run: pnpm pnpx prisma generate
+      - run: pnpm prisma generate
       - run: pnpm lint
 
   build:
@@ -41,7 +41,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
-      - run: pnpm pnpx prisma generate
+      - run: pnpm prisma generate
       - run: pnpm build
 
   test:
@@ -76,8 +76,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
-      - run: pnpm pnpx prisma generate
-      - run: pnpm pnpx prisma db push
+      - run: pnpm prisma generate
+      - run: pnpm prisma db push
       - run: docker exec -i mariadb mysql -utest -ptest arena < seed.sql
       - run: pnpm test:coverage
       - uses: codecov/codecov-action@v5
@@ -108,7 +108,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
-      - run: pnpm pnpx prisma generate
+      - run: pnpm prisma generate
       - env:
           BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
           DBDOCS_TOKEN: ${{ secrets.DBDOCS_TOKEN }}
@@ -133,7 +133,7 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v6
-        with: 
+        with:
           push: true
           tags: |
             ${{ secrets.REGISTRY_URL }}/uttarena/api:${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
diff --git a/Dockerfile b/Dockerfile
@@ -16,10 +16,10 @@ RUN pnpm install --frozen-lockfile --production=false
 
 COPY --chown=node:node ./ ./
 
-RUN pnpm pnpx prisma generate
+RUN pnpm prisma generate
 RUN pnpm build
 
 # Prunes devDependencies
 RUN pnpm install --production --ignore-scripts --prefer-offline
 
-CMD pnpm start
+CMD pnpm start
diff --git a/assets/email/template.html b/assets/email/template.html
@@ -6,8 +6,8 @@
     <meta name="x-apple-disable-message-reformatting" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta content="telephone=no" name="format-detection" />
-    <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Lexend&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css2?family=Lexend&display=swap" rel="stylesheet" />
     <title>UTT Arena {{& year}} - {{& title.topic}}</title>
   </head>
 
@@ -306,7 +306,7 @@
                           <td style="text-align: center">
                             <a
                               target="_blank"
-                              href="https://discord.gg/WhxZwKU"
+                              href="https://discord.gg/tkRrVZYXmT"
                               style="
                                 font-size: 14px;
                                 -webkit-text-size-adjust: none;
diff --git a/src/controllers/admin/badges/generateBadges.ts b/src/controllers/admin/badges/generateBadges.ts
@@ -36,7 +36,7 @@ const getCommisionPermission = (commissionRole: string, commissionId: string) =>
 };
 
 const getCommissionName = (commissionRole: string, commissionId: string, commissionName: string) => {
-  if (commissionId === 'coord' && commissionRole === 'respo') return 'Présidente';
+  if (commissionId === 'coord' && commissionRole === 'respo') return 'Président';
 
   if (commissionRole === 'respo') return `Respo ${commissionName}`;
   return commissionName;
diff --git a/src/operations/item.ts b/src/operations/item.ts
@@ -1,5 +1,5 @@
 import database from '../services/database';
-import { Item, ItemCategory, RawItem, Team, TransactionState, User, UserType } from '../types';
+import { Item, ItemCategory, RawItem, Team, TransactionState, User } from '../types';
 import { isPartnerSchool } from '../utils/helpers';
 import { checkForExpiredCarts } from './carts';
 import { fetchTournament } from './tournament';
@@ -73,10 +73,13 @@ export const fetchUserItems = async (team?: Team, user?: User) => {
     items.find((element) => element.id === 'discount-switch-ssbu').left = -1;
   }
 
-  if (!user || user.type !== UserType.player || !team || team.tournamentId === 'ssbu') {
-    // Remove rents
-    items = items.filter((element) => element.category !== ItemCategory.rent);
-  }
+  // if (
+  //   (!user || user.type === UserType.spectator || !team || team.tournamentId === 'ssbu') &&
+  //   !user.permissions.includes(Permission.orga)
+  // ) {
+  //   // Remove rents
+  //   items = items.filter((element) => element.category !== ItemCategory.rent);
+  // }
 
   const ffsu = team?.tournamentId ? (await fetchTournament(team?.tournamentId)).ffsu : false;
 
diff --git a/src/services/email/templates/accountValidation.ts b/src/services/email/templates/accountValidation.ts
@@ -42,7 +42,7 @@ export const generateAccountValidationEmail = (user: Omit<RawUser, 'permissions'
             },
             {
               name: 'Rejoindre le serveur Discord',
-              location: 'https://discord.gg/WhxZwKU',
+              location: 'https://discord.gg/tkRrVZYXmT',
             },
           ],
         ],
diff --git a/src/services/email/templates/joinDiscord.ts b/src/services/email/templates/joinDiscord.ts
@@ -19,7 +19,7 @@ export const generateJoinDiscordEmail = (user: Omit<RawUser, 'permissions'>) =>
           'Sur ce serveur, tu pourras également y discuter avec les autres joueurs, ou poser des questions aux organisateurs de ton tournoi.',
           {
             name: 'Rejoindre le serveur Discord',
-            location: 'https://discord.gg/WhxZwKU',
+            location: 'https://discord.gg/tkRrVZYXmT',
           },
         ],
       },
diff --git a/src/services/email/templates/lastYearAnnounce.ts b/src/services/email/templates/lastYearAnnounce.ts
@@ -28,7 +28,7 @@ export const generateLastYearPublicAnnounce = (email: string) =>
         components: [
           "Pour s'inscrire, ça se passe sur le site !",
           {
-            name: "Inscris toi à l'UTT Arena 2024 !",
+            name: "Inscris toi à l'UTT Arena 2025 !",
             location: `https://arena.utt.fr/`,
           },
           `_Si le bouton ne marche pas, tu peux utiliser ce lien:_\n_https://arena.utt.fr/_`,
@@ -45,7 +45,7 @@ export const generateLastYearPublicAnnounce = (email: string) =>
             },
             {
               name: 'Rejoindre le serveur Discord',
-              location: 'https://discord.gg/WhxZwKU',
+              location: 'https://discord.gg/tkRrVZYXmT',
             },
           ],
         ],
diff --git a/src/services/email/templates/minor.ts b/src/services/email/templates/minor.ts
@@ -18,7 +18,7 @@ export const generateMinorEmail = (user: Omit<RawUser, 'permissions'>) =>
           "Tu nous as indiqué que tu seras mineur à la date de l'UTT Arena. N'oublie pas de préparer *ton autorisation parentale, et une photocopie de ta pièce d'identité, et de celle de ton responsable légal* !",
           "La vérification se fera à l'entrée de l'UTT Arena, n'hésite pas à envoyer à l'avance ces documents par mail à arena@utt.fr pour simplifier la procédure à l'entrée.",
           {
-            location: 'https://arena.utt.fr/uploads/files/Autorisation_parentale_-_UTT_Arena_2024.pdf',
+            location: 'https://arena.utt.fr/uploads/files/Autorisation_parentale_-_UTT_Arena_2025.pdf',
             name: "Télécharger l'autorisation parentale",
           },
         ],
diff --git a/src/services/email/templates/orderConfirmation.ts b/src/services/email/templates/orderConfirmation.ts
@@ -11,7 +11,7 @@ export const generateOrderConfirmationEmail = (cart: DetailedCart) =>
       highlight: "Bienvenue à l'UTT Arena&nbsp;🔥&nbsp;!",
     },
     reason:
-      "Tu as reçu cet email car tu es inscrit à l'UTT Arena 2024. Si ce n'est pas le cas, contacte-nous et change le mot de passe de ta boîte mail.",
+      "Tu as reçu cet email car tu es inscrit à l'UTT Arena 2025. Si ce n'est pas le cas, contacte-nous et change le mot de passe de ta boîte mail.",
     receiver: cart.user.email,
     sections: [
       {
@@ -82,7 +82,7 @@ export const generateOrderConfirmationEmail = (cart: DetailedCart) =>
           ],
           {
             name: 'Rejoindre le serveur Discord',
-            location: 'https://discord.gg/WhxZwKU',
+            location: 'https://discord.gg/tkRrVZYXmT',
           },
         ],
       },
diff --git a/src/utils/badge.ts b/src/utils/badge.ts
@@ -162,7 +162,8 @@ export const generateBadge = async (badges: Badge[]) => {
 
           // Place the text containing the name is the bottom middle in bold and in uppercase
           // Define a text format
-          const color: PDFKit.Mixins.ColorValue = badges[index].type === 'fullaccess' ? [239, 220, 235] : [23, 18, 74];
+          // const color: PDFKit.Mixins.ColorValue = badges[index].type === 'fullaccess' ? [239, 220, 235] : [23, 18, 74];
+          const color: PDFKit.Mixins.ColorValue = [255, 255, 255];
 
           const textFormat = document.font(fontFamily).fill(color).fontSize(fontSize);
 
diff --git a/tests/items/getItems.test.ts b/tests/items/getItems.test.ts
@@ -80,25 +80,25 @@ describe('GET /items', () => {
         display: true,
       },
     });
-    // without the "discount-switch-ssbu" item and the "ticket-player-ssbu", the "pc" (in rent category) and the 'ticket-player' item
-    expect(response.body).to.have.lengthOf(items.length - 4);
+    // without the "discount-switch-ssbu" item and the "ticket-player-ssbu" and the 'ticket-player' item
+    expect(response.body).to.have.lengthOf(items.length - 3);
     expect(response.body).not.to.have.deep.members([items[0]]);
   });
 
   it('should return 200 with an array of items', async () => {
     const items = await database.item.findMany();
     const response = await request(app).get('/items').expect(200);
 
-    // without the "discount-switch-ssbu" item and the "ticket-player-ssbu" and the "pc" (in rent category)
-    expect(response.body).to.have.lengthOf(items.length - 3);
+    // without the "discount-switch-ssbu" item and the "ticket-player-ssbu"
+    expect(response.body).to.have.lengthOf(items.length - 2);
   });
 
   it('should return 200 with an array of items with the "discount-switch-ssbu" item', async () => {
     const items = await database.item.findMany();
     const response = await request(app).get('/items').set('Authorization', `Bearer ${captainToken}`).expect(200);
 
-    // with the "discount-switch-ssbu" item but without the legacy "ticket-player" and without "pc" (in rent category)
-    expect(response.body).to.have.lengthOf(items.length - 2);
+    // with the "discount-switch-ssbu" item but without the legacy "ticket-player"
+    expect(response.body).to.have.lengthOf(items.length - 1);
   });
 
   it(`should return 200 with an array of items with the "discount-switch-ssbu" and a quantity of -1 item because user has a pending cart containing it`, async () => {
@@ -109,8 +109,8 @@ describe('GET /items', () => {
     const items = await database.item.findMany();
     const response = await request(app).get('/items').set('Authorization', `Bearer ${thirdCaptainToken}`).expect(200);
 
-    // without the legacy "ticket-player" and without "pc" (in rent category)
-    expect(response.body).to.have.lengthOf(items.length - 2);
+    // without the legacy "ticket-player"
+    expect(response.body).to.have.lengthOf(items.length - 1);
     expect(response.body.find((item: Item) => item.id === 'discount-switch-ssbu').left).to.be.equal(-1);
   });
 
@@ -122,8 +122,8 @@ describe('GET /items', () => {
     const items = await database.item.findMany();
     const response = await request(app).get('/items').set('Authorization', `Bearer ${thirdCaptainToken}`).expect(200);
 
-    // without the "discount-switch-ssbu" item and the legacy "ticket-player" and without "pc" (in rent category)
-    expect(response.body).to.have.lengthOf(items.length - 3);
+    // without the "discount-switch-ssbu" item and the legacy "ticket-player"
+    expect(response.body).to.have.lengthOf(items.length - 2);
   });
 
   describe('should return 200 with an array of items with the "discount-switch-ssbu" item because user has a cart containing it, but it was not paid nor it is pending', () => {
@@ -137,8 +137,8 @@ describe('GET /items', () => {
           .set('Authorization', `Bearer ${thirdCaptainToken}`)
           .expect(200);
 
-        // with the "discount-switch-ssbu" item but without the legacy "ticket-player" and without "pc" (in rent category)
-        expect(response.body).to.have.lengthOf(items.length - 2);
+        // with the "discount-switch-ssbu" item but without the legacy "ticket-player"
+        expect(response.body).to.have.lengthOf(items.length - 1);
       });
     }
   });
diff --git a/tests/users/createCart.test.ts b/tests/users/createCart.test.ts
@@ -479,27 +479,6 @@ describe('POST /users/current/carts', () => {
     );
   });
 
-  it('should error as spectator cannot rent a pc', async () => {
-    const spectator = await createFakeUser({ type: UserType.spectator });
-    const specToken = generateToken(spectator);
-
-    return request(app)
-      .post(`/users/current/carts`)
-      .set('Authorization', `Bearer ${specToken}`)
-      .send({
-        tickets: {
-          userIds: [],
-        },
-        supplements: [
-          {
-            itemId: 'pc',
-            quantity: 1,
-          },
-        ],
-      })
-      .expect(404, { error: Error.ItemNotFound });
-  });
-
   it('should sucessfully create a cart with a rental pc', async () => {
     const userToken = generateToken(notValidUserWithSwitchDiscount);
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export const generateAccountValidationEmail = (user: Omit<RawUser, 'permissions'`
`42`	`42`	`},`
`43`	`43`	`{`
`44`	`44`	`name: 'Rejoindre le serveur Discord',`
`45`		`- location: 'https://discord.gg/WhxZwKU',`
	`45`	`+ location: 'https://discord.gg/tkRrVZYXmT',`
`46`	`46`	`},`
`47`	`47`	`],`
`48`	`48`	`],`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const generateJoinDiscordEmail = (user: Omit<RawUser, 'permissions'>) =>`
`19`	`19`	`'Sur ce serveur, tu pourras également y discuter avec les autres joueurs, ou poser des questions aux organisateurs de ton tournoi.',`
`20`	`20`	`{`
`21`	`21`	`name: 'Rejoindre le serveur Discord',`
`22`		`- location: 'https://discord.gg/WhxZwKU',`
	`22`	`+ location: 'https://discord.gg/tkRrVZYXmT',`
`23`	`23`	`},`
`24`	`24`	`],`
`25`	`25`	`},`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const generateMinorEmail = (user: Omit<RawUser, 'permissions'>) =>`
`18`	`18`	`"Tu nous as indiqué que tu seras mineur à la date de l'UTT Arena. N'oublie pas de préparer ton autorisation parentale, et une photocopie de ta pièce d'identité, et de celle de ton responsable légal !",`
`19`	`19`	`"La vérification se fera à l'entrée de l'UTT Arena, n'hésite pas à envoyer à l'avance ces documents par mail à arena@utt.fr pour simplifier la procédure à l'entrée.",`
`20`	`20`	`{`
`21`		`- location: 'https://arena.utt.fr/uploads/files/Autorisation_parentale_-_UTT_Arena_2024.pdf',`
	`21`	`+ location: 'https://arena.utt.fr/uploads/files/Autorisation_parentale_-_UTT_Arena_2025.pdf',`
`22`	`22`	`name: "Télécharger l'autorisation parentale",`
`23`	`23`	`},`
`24`	`24`	`],`