News with pictures

Author: T1gr0uu

backend/package.json

@@ -23,6 +23,7 @@
     "axios": "^1.8.4",
     "bcryptjs": "^3.0.2",
     "big-integer": "^1.6.52",
+    "body-parser": "^2.2.0",
     "cors": "^2.8.5",
     "dotenv": "^16.5.0",
     "drizzle-kit": "^0.30.6",

backend/server.ts

@@ -1,7 +1,10 @@
-const express = require('express');
-const cors = require('cors');
+import express from 'express';
+import cors from 'cors';
+import bodyParser from 'body-parser';
 
 import dotenv from 'dotenv';
+import path from "path";
+
 import authRoutes from './src/routes/auth.routes';
 import roleRoutes from './src/routes/role.routes';
 import userRoutes from './src/routes/user.routes';
@@ -27,10 +30,11 @@ dotenv.config();
 async function startServer() {
     const app = express();
 
-    // Configuration des middlewares
+    // Configuration des middlewares    
     app.use(cors({ origin: "*" }));
-    app.use(express.json());
+    app.use(bodyParser.json());
     app.use(express.urlencoded({ extended: true }));
+    
 
     try {
         // Initialisation de la base de données
@@ -53,6 +57,7 @@ async function startServer() {
         app.use('/api/email',authenticateUser, emailRoutes);
         app.use('/api/news',authenticateUser, newsRoutes);
         app.use('/api/discord',authenticateUser, discordRoutes);
+        app.use("/uploads/imgnews", authenticateUser, express.static(path.join(__dirname, "/uploads/imgnews")));
 
         // Démarrage du serveur
         app.listen(server_port, () => {

backend/src/controllers/news.controller.ts

@@ -4,12 +4,25 @@ import { Ok, Error } from "../utils/responses";
 import * as template from "../utils/emailtemplates";
 import * as email_service from "../services/email.service";
 import * as user_service from '../services/user.service'
+import path from "path";
+import fs from "fs";
 
 export const createNews = async (req: Request, res: Response) => {
+
+  
   const { title, description, type, published, target } = req.body;
+  const file = req.file;
 
   try {
-    const news = await news_service.createNews(title, description, type, published, target);
+
+    const image_url = file ? `/uploads/imgnews/${file.filename}` : undefined;
+    const news = await news_service.createNews(
+      title, 
+      description, 
+      type, 
+      published, 
+      target,
+      image_url);
     Ok(res, { msg: "Actu créée avec succès", data: news });
   } catch (err) {
     console.error(err);
@@ -51,17 +64,19 @@ export const listPublishedNewsByType = async (req: Request, res: Response) => {
 };
 
 export const publishNews = async (req: Request, res: Response) => {
-  const { id, title, description, type, target } = req.body;
+  const { id} = req.body;
 
   try {
     await news_service.publishNewsandNotify(id);
 
+    const news = await news_service.getNewsById(Number(id));
+
     // Génération du mail HTML
-    const html = template.compileTemplate({ title, description }, template.templateNotifyNews);
+    const html = template.compileTemplate({title : news.title}, template.templateNotifyNews);
 
-    const recipients = target === "Tous"
+    const recipients = news.target === "Tous"
       ? (await user_service.getUsersAdmin()).map(u => u.email)
-      : (await user_service.getUsersbyPermission(target)).map(u => u.email);
+      : (await user_service.getUsersbyPermission(news.target)).map(u => u.email);
 
     if(recipients.length === 0){ 
         Error(res, {msg : "No recipients"});
@@ -71,7 +86,7 @@ export const publishNews = async (req: Request, res: Response) => {
     const email = {
       from: "integration@utt.fr",
       to: [],
-      subject: `[INTEGRATION UTT] Nouvelle actu : ${title}`,
+      subject: `[INTEGRATION UTT] Nouvelle actu : ${news.title}`,
       html : html,
       cc: [],
       bcc: recipients,
@@ -91,9 +106,17 @@ export const deleteNews = async (req: Request, res: Response) => {
     const {newsId} = req.query
 
     try {
-        await news_service.deleteNews(Number(newsId));
-        Ok(res, { msg: "Actus supprimée avec succès !" });
-        return;
+
+      const existing = await news_service.getNewsById(Number(newsId));
+      if (existing?.image_url) {
+        const imagePath = path.join(__dirname, "../../", existing.image_url);
+        if (fs.existsSync(imagePath)) {
+          fs.unlinkSync(imagePath);
+        }
+      }
+      await news_service.deleteNews(Number(newsId));
+      Ok(res, { msg: "Actus supprimée avec succès !" });
+      return;
 
     } catch (error) {
         Error(res, { msg: "Erreur lors de la suppression de l'actus" });
@@ -102,25 +125,33 @@ export const deleteNews = async (req: Request, res: Response) => {
 
 
 export const updateNews = async (req: Request, res: Response) => {
-    const { id, title, description, type, target } = req.body;
-  
-    try {
-      const updated = await news_service.updateNews(Number(id), {
-        title,
-        description,
-        type,
-        target,
-      });
-  
-      if (!updated) {
-        Error(res, { msg: "Aucune actu trouvée à modifier" });
-        return;
+  const { id, title, description, type, target } = req.body;
+  const file = req.file;
+  const image_url = file ? `/uploads/imgnews/${file.filename}` : undefined;
+
+  try {
+    const existing = await news_service.getNewsById(Number(id));
+    if (!existing) {
+      return Error(res, { msg: "Actu introuvable" });
+    }
+
+    // Supprimer l'ancienne image si une nouvelle est uploadée
+    if (file && existing.image_url) {
+      const oldPath = path.join(__dirname, "../../", existing.image_url);
+      if (fs.existsSync(oldPath)) {
+        fs.unlinkSync(oldPath);
       }
-  
-      Ok(res, { msg: "Actu mise à jour avec succès", data: updated });
-    } catch (err) {
-      console.error(err);
-      Error(res, { msg: "Erreur lors de la mise à jour de l'actu" });
     }
+
+    const updates: any = { title, description, type, target };
+    if (image_url) updates.image_url = image_url;
+
+    const updated = await news_service.updateNews(Number(id), updates);
+
+    Ok(res, { msg: "Actu mise à jour avec succès", data: updated });
+  } catch (err) {
+    console.error(err);
+    Error(res, { msg: "Erreur lors de la mise à jour de l'actu" });
+  }
 };
 

backend/src/database/db.ts

@@ -10,13 +10,16 @@ import * as event from '../schemas/Basic/event.schema';
 import * as faction from '../schemas/Basic/faction.schema';
 import * as role from '../schemas/Basic/role.schema';
 import * as challenge from '../schemas/Basic/challenge.schema';
+import * as permanence from '../schemas/Basic/permanence.schema';
 
 import * as userTeam from '../schemas/Relational/userteams.schema';
 import * as teamFaction from '../schemas/Relational/teamfaction.schema';
 import * as teamShotgun from '../schemas/Relational/teamshotgun.schema';
 import * as userPermanence from '../schemas/Relational/userpermanences.schema';
 import * as userRole from '../schemas/Relational/userroles.schema';
 import * as challengValidation from '../schemas/Relational/challengevalidation.schema';
+import * as busattribution from "../schemas/Relational/busattribution.schema";
+import * as registration from "../schemas/Relational/registration.schema";
 
 
 const client = new Client({
@@ -34,13 +37,16 @@ export const db = drizzle(client, {
     ...role,
     ...perm,
     ...challenge,
+    ...permanence,
 
     ...userTeam,
     ...teamFaction,
     ...teamShotgun,
     ...userPermanence,
     ...userRole,
     ...challengValidation,
+    ...busattribution,
+    ...registration
 
   },
 });

backend/src/database/migrations/0015_greedy_genesis.sql

@@ -0,0 +1 @@
+ALTER TABLE "news" ADD COLUMN "image_url" text;