i dont remember my changes

AlbanSdl · AlbanSdl · commit e5341c2e3775 · 2024-05-16T12:12:18.000+02:00
diff --git a/web/schema.prisma b/web/schema.prisma
@@ -15,8 +15,8 @@ model Borrow {
   id              Int      @id @default(autoincrement())
   userLogin       String
   joyconsTaken    Int
-  borrowOpeningId Int      @unique
-  returnOpeningId Int      @unique
+  borrowOpeningId String      @unique
+  returnOpeningId String      @unique
   createdAt       DateTime @default(now())
 
   user          User    @relation(fields: [userLogin], references: [login])
@@ -25,7 +25,7 @@ model Borrow {
 }
 
 model Opening {
-  id              Int       @id @default(autoincrement())
+  id              String       @id @default(uuid())
   date            DateTime?
   code            String?
   codeGeneratedAt DateTime?
diff --git a/web/src/apiRouter.ts b/web/src/apiRouter.ts
@@ -5,6 +5,7 @@ import {
   CODE_LIFETIME,
   generateCode,
   generateNewCode,
+  sendDiscordWebhook,
   setLastTimeChestWasAlive,
 } from "./utils";
 
@@ -65,7 +66,8 @@ apiRouter.post("/sesame", async (request: Request, response: Response) => {
 });
 
 apiRouter.get("/ping", async (request: Request, response: Response) => {
-  setLastTimeChestWasAlive(Date.now());
+  const interval: number = Number(request.body.interval) || undefined;
+  setLastTimeChestWasAlive(Date.now(), interval);
   return response.status(200).send("Good news ! (Me too)");
 });
 
@@ -83,34 +85,26 @@ apiRouter.get("/reports", async (request: Request, response: Response) => {
   if (borrows.length) {
     logger.info(`Generating reports for ${borrows.length} users !`);
     const count = borrows.reduce((acc, borrow) => acc + borrow.joyconsTaken, 0);
-    fetch(process.env.DISCORD_WEBHOOK_URL, {
-      method: "POST",
-      headers: {'Content-Type': 'application/json'},
-      body: JSON.stringify({
-        content: null,
-        embeds: [
-          {
-            title: "⚠️ Emprunts non rendus",
-            description: `🚨 ${count} joycon${count > 1 ? "s" : ""} n'${
-              count > 1 ? "ont" : "a"
-            } pas été rendu${count > 1 ? "s" : ""} !`,
-            color: 11468800,
-            fields: borrows.map((borrow) => ({
-              name: `${borrow.user.firstName} ${
-                borrow.user.lastName
-              }`,
-              value: `${borrow.joyconsTaken} joycon${
-                borrow.joyconsTaken > 1 ? "s" : ""
-              } non rendu(s)\nContacte le : ${
-                borrow.user.mail
-              }`,
-            })),
-            timestamp: new Date().toISOString(),
-          },
-        ],
-        attachments: [],
-      }),
-    });
+    sendDiscordWebhook([
+      {
+        title: "⚠️ Emprunts non rendus",
+        description: `🚨 ${count} joycon${count > 1 ? "s" : ""} n'${
+          count > 1 ? "ont" : "a"
+        } pas été rendu${count > 1 ? "s" : ""} !`,
+        color: 11468800,
+        fields: borrows.map((borrow) => ({
+          name: `${borrow.user.firstName} ${borrow.user.lastName}`,
+          value: `${borrow.joyconsTaken} joycon${
+            borrow.joyconsTaken > 1 ? "s" : ""
+          } non rendu(s)\nContacte le : ${
+            borrow.user.mail
+          }\n[Génère un nouveau code de retour](https://turboswitch.assos.utt.fr/forceOpen?id=${
+            borrow.returnOpeningId
+          })`,
+        })),
+        timestamp: new Date(),
+      },
+    ]);
   }
   return response.status(200).send("Generating reports");
 });
diff --git a/web/src/utils.ts b/web/src/utils.ts
@@ -3,6 +3,17 @@ import jwt from "jsonwebtoken";
 import { prisma, prismaUtils } from "./prisma";
 import { Prisma } from "@prisma/client";
 
+export type DiscordEmbed = {
+  title: string;
+  description: string;
+  color: number;
+  fields: {
+    name: string;
+    value: string;
+  }[];
+  timestamp: Date;
+};
+
 export function authenticate(request: Request) {
   if (!request.cookies["token"]) {
     return null;
@@ -144,15 +155,68 @@ export async function generateNewCode(borrowId: number) {
   return code;
 }
 
+export function sendDiscordWebhook(embeds: DiscordEmbed[]) {
+  return fetch(process.env.DISCORD_WEBHOOK_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      content: null,
+      embeds: embeds.map((embed) => ({
+        ...embed,
+        timestamp: embed.timestamp.toISOString(),
+      })),
+      attachments: [],
+    }),
+  });
+}
+
 let lastTimeChestWasAlive = 0;
-export function setLastTimeChestWasAlive(time: number) {
+let sendInterval = Number.parseInt(process.env.TIME_BEFORE_CHEST_DEATH) * 1000;
+let lastChestAlive = false;
+
+function checkChestAlive() {
+  if (chestAlive() !== lastChestAlive) {
+    lastChestAlive = !lastChestAlive;
+    if (lastChestAlive) {
+      // Chest is up
+      sendDiscordWebhook([
+        {
+          title: "✅ Le coffre est de nouveau en ligne",
+          color: 2985934,
+          description: "*Niceeeeuuuhh* 🎉🎉🎉",
+          fields: [],
+          timestamp: new Date(),
+        },
+      ]);
+    } else {
+      // Chest is down
+      sendDiscordWebhook([
+        {
+          title: "⚠️ Le coffre est hors ligne !",
+          color: 16711680,
+          description:
+            "*<@&1209413150424825876> vérifiez l'état du coffre et des piles !*",
+          fields: [],
+          timestamp: new Date(),
+        },
+      ]);
+    }
+  }
+}
+
+export function setLastTimeChestWasAlive(time: number, sendInSecs?: number) {
   lastTimeChestWasAlive = time;
+  sendInterval =
+    ((sendInSecs || Number.parseInt(process.env.TIME_BEFORE_CHEST_DEATH)) + 2) *
+    1000;
+  setTimeout(checkChestAlive, sendInterval);
 }
-export function getLastTimeChestWasAlive() {
-  if (process.env.CHEST_ALWAYS_ALIVE === 'true') {
-    return Date.now();
-  }
-  return lastTimeChestWasAlive;
+
+export function chestAlive() {
+  return (
+    process.env.CHEST_ALWAYS_ALIVE === "true" ||
+    Date.now() - lastTimeChestWasAlive < sendInterval
+  );
 }
 
 export const CODE_LIFETIME = Number(process.env.CODE_LIFETIME) * 1000;
diff --git a/web/src/webRouter.ts b/web/src/webRouter.ts
@@ -1,45 +1,49 @@
-import { NextFunction, Request, Response, Router } from "express";
+import { Request, Response, Router } from "express";
 import path from "path";
 import { XMLParser } from "fast-xml-parser";
 import jwt from "jsonwebtoken";
 import { prisma } from "./prisma";
 import {
-  authenticate, formatOpening,
+  authenticate,
+  chestAlive,
+  formatOpening,
   generateCode,
   generateNewCode,
   getJoyconsLeft,
-  getLastTimeChestWasAlive,
-  getWaitingOpening, OPENING_INCLUDE_BEFORE_FORMATTING,
+  getWaitingOpening,
+  OPENING_INCLUDE_BEFORE_FORMATTING,
 } from "./utils";
 
 const webRouter = Router();
 
-function chestAlive() {
-  return Date.now() - getLastTimeChestWasAlive() < Number.parseInt(process.env.TIME_BEFORE_CHEST_DEATH) * 1000;
-}
-
 webRouter.get("/borrow", async (request: Request, response: Response) => {
-  if (!chestAlive()) return response.redirect('/down');
+  if (!chestAlive()) return response.redirect("/down");
   const login = authenticate(request);
-  if (!authenticate(request)) return response.redirect('/login');
-  if (await getWaitingOpening(login)) return response.redirect('/code');
+  if (!authenticate(request)) return response.redirect("/login");
+  if (await getWaitingOpening(login)) return response.redirect("/code");
   const joyconsLeft = await getJoyconsLeft();
-  return response.render(path.join(__dirname, '../www/borrow.html'), { joyconsLeft });
+  return response.render(path.join(__dirname, "../www/borrow.html"), {
+    joyconsLeft,
+  });
 });
 
 webRouter.get("/code", async (request: Request, response: Response) => {
   const login = authenticate(request);
-  if (!login) return response.redirect('/login');
-  if (!chestAlive()) return response.redirect('/down');
-  if (!await getWaitingOpening(login)) return response.redirect('/');
+  if (!login) return response.redirect("/login");
+  if (!chestAlive()) return response.redirect("/down");
+  if (!(await getWaitingOpening(login))) return response.redirect("/");
   const opening = await getWaitingOpening(login);
   const newCode = await generateNewCode(opening.id);
-  return response.render(path.join(__dirname, "../www/getCode.html"), { code: newCode, joycons: opening.borrow.joyconsTaken, type: opening.type });
+  return response.render(path.join(__dirname, "../www/getCode.html"), {
+    code: newCode,
+    joycons: opening.borrow.joyconsTaken,
+    type: opening.type,
+  });
 });
 
 webRouter.get("/login", async (request: Request, response: Response) => {
-  if (!chestAlive()) return response.redirect('/down');
-  if (authenticate(request)) return response.redirect('/');
+  if (!chestAlive()) return response.redirect("/down");
+  if (authenticate(request)) return response.redirect("/");
   if (!request.query["ticket"]) {
     return response.sendFile(path.join(__dirname, "../www/login.html"));
   }
@@ -100,16 +104,16 @@ webRouter.get("/login/cas", async (request: Request, response: Response) => {
   );
 });
 
-webRouter.get('/logout', async (request: Request, response: Response) => {
-  return response.clearCookie('token').redirect('/');
+webRouter.get("/logout", async (request: Request, response: Response) => {
+  return response.clearCookie("token").redirect("/");
 });
 
 webRouter.post("/borrow", async (request: Request, response: Response) => {
   const login = authenticate(request);
-  if (!login) return response.redirect('/login');
-  if (!chestAlive()) return response.redirect('/down');
-  if (await getWaitingOpening(login)) return response.redirect('/code');
-  if (!request.body.joycons) return response.redirect('/borrow');
+  if (!login) return response.redirect("/login");
+  if (!chestAlive()) return response.redirect("/down");
+  if (await getWaitingOpening(login)) return response.redirect("/code");
+  if (!request.body.joycons) return response.redirect("/borrow");
   const joycons = Number.parseInt(request.body.joycons);
   if (Number.isNaN(joycons)) {
     return response.redirect("/borrow");
@@ -132,49 +136,64 @@ webRouter.post("/borrow", async (request: Request, response: Response) => {
       user: { connect: { login } },
     },
   });
-  return response.redirect('/code');
+  return response.redirect("/code");
 });
 
-webRouter.get('/forceOpen', async (request: Request, response: Response) => {
-  if (!chestAlive()) return response.redirect('/down');
-  if (!request.query['id']) return response.redirect('/');
-  const opening = formatOpening(await prisma.opening.findUnique({
-    where: { id: Number.parseInt(request.query.id as string), date: null, borrow: null },
-    ...OPENING_INCLUDE_BEFORE_FORMATTING
-  }));
+webRouter.get("/forceOpen", async (request: Request, response: Response) => {
+  if (!chestAlive()) return response.redirect("/down");
+  if (!request.query["id"]) return response.redirect("/");
+  const opening = formatOpening(
+    await prisma.opening.findUnique({
+      where: {
+        id: Number.parseInt(request.query.id as string),
+        date: null,
+        borrow: null,
+      },
+      ...OPENING_INCLUDE_BEFORE_FORMATTING,
+    })
+  );
   if (!opening) {
-    return response.redirect('/');
+    return response.redirect("/");
   }
-  const newCode = await generateNewCode(Number.parseInt(request.query.id as string));
-  response.render(path.join(__dirname, '../www/getCode.html'), { code: newCode, joycons: opening.borrow.joyconsTaken, type: opening.type });
+  const newCode = await generateNewCode(
+    Number.parseInt(request.query.id as string)
+  );
+  response.render(path.join(__dirname, "../www/getCode.html"), {
+    code: newCode,
+    joycons: opening.borrow.joyconsTaken,
+    type: opening.type,
+  });
 });
 
 webRouter.get("/down", async (request: Request, response: Response) => {
-  if (chestAlive()) return response.redirect('/');
+  if (chestAlive()) return response.redirect("/");
   response.sendFile(path.join(__dirname, "../www/down.html"));
 });
 
-webRouter.get('/legal', async (request: Request, response: Response) => {
+webRouter.get("/legal", async (request: Request, response: Response) => {
   return response.sendFile(path.join(__dirname, "../www/legal.html"));
 });
 
-webRouter.get('/cancel', async (request: Request, response: Response) => {
-  if (!chestAlive()) return response.redirect('/down');
+webRouter.get("/cancel", async (request: Request, response: Response) => {
+  if (!chestAlive()) return response.redirect("/down");
   const login = authenticate(request);
-  if (!login) return response.redirect('/login');
+  if (!login) return response.redirect("/login");
   const opening = await getWaitingOpening(login);
-  if (opening && opening.type === 'borrow') {
-    await prisma.opening.update({ where: { id: opening.id }, data: { code: null, codeGeneratedAt: null } });
+  if (opening && opening.type === "borrow") {
+    await prisma.opening.update({
+      where: { id: opening.id },
+      data: { code: null, codeGeneratedAt: null },
+    });
   }
-  return response.redirect('/');
+  return response.redirect("/");
 });
 
-webRouter.get('/', async (request: Request, response: Response) => {
-  if (!chestAlive()) return response.redirect('/down');
+webRouter.get("/", async (request: Request, response: Response) => {
+  if (!chestAlive()) return response.redirect("/down");
   const login = authenticate(request);
-  if (!login) return response.redirect('/login');
-  if (await getWaitingOpening(login)) return response.redirect('/code');
-  return response.redirect('/borrow');
+  if (!login) return response.redirect("/login");
+  if (await getWaitingOpening(login)) return response.redirect("/code");
+  return response.redirect("/borrow");
 });
 
 webRouter.use(async (request: Request, response: Response) => {
