diff --git a/.gitignore b/.gitignore index 2336d77..79cfe3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ node_modules/ -info.log \ No newline at end of file +info.log +storage/ +uploads/ \ No newline at end of file diff --git a/api.js b/api.js new file mode 100644 index 0000000..f515dee --- /dev/null +++ b/api.js @@ -0,0 +1,24 @@ +const express = require('express'); +const router = express.Router(); +const cors = require('cors'); +const projectRoutes = require('./routes/projectRoutes'); +const measurementRoutes = require('./routes/measurementRoutes'); +const videoRoutes = require('./routes/videoRoutes'); +const imageRoutes = require('./routes/imageRoutes'); +const uploadRoutes = require('./routes/uploadRoutes'); +const fileWatcher = require('./src/data/filewatcher.js'); + +router.use(cors({ + origin: ['http://127.0.0.1:5500', 'http://localhost:5500', 'http://localhost:3000'], + methods: ['GET', 'POST', 'PUT', 'DELETE'], + allowedHeaders: ['Content-Type'], + credentials: true, +})); + +router.use('/', projectRoutes); +router.use('/', measurementRoutes); +router.use('/', videoRoutes); +router.use('/', imageRoutes); +router.use('/', uploadRoutes); + +module.exports = router; diff --git a/db.js b/db.js index 258ebf0..e1c46a7 100644 --- a/db.js +++ b/db.js @@ -1,9 +1,10 @@ const { Client } = require('pg'); +const local = true; // Connexion à la base de données PostgreSQL const client = new Client({ - host: '172.30.0.2', - port: 5432, + host: local ? 'mikoshi' : '172.30.0.2', + port: local ? 54322 : 5432, user: 'timelapse', password: 'timelapse', database: 'timelapse' diff --git a/package-lock.json b/package-lock.json index cb629bf..ba1dbda 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,16 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "cors": "^2.8.5", "express": "^4.21.0", + "multer": "^1.4.5-lts.1", "mysql2": "^3.11.3", "pg": "^8.13.0", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.1" }, "devDependencies": { + "@types/cors": "^2.8.17", "nodemon": "^3.1.7" } }, @@ -69,12 +72,32 @@ "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==", "license": "MIT" }, + "node_modules/@types/cors": { + "version": "2.8.17", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz", + "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "license": "MIT" }, + "node_modules/@types/node": { + "version": "22.13.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz", + "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -102,6 +125,12 @@ "node": ">= 8" } }, + "node_modules/append-field": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", + "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==", + "license": "MIT" + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -189,6 +218,23 @@ "node": ">=8" } }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -263,6 +309,21 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "license": "MIT" }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "engines": [ + "node >= 0.8" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -299,6 +360,25 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "license": "MIT" }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -791,6 +871,12 @@ "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==", "license": "MIT" }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -923,12 +1009,51 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, + "node_modules/multer": { + "version": "1.4.5-lts.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", + "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", + "license": "MIT", + "dependencies": { + "append-field": "^1.0.0", + "busboy": "^1.0.0", + "concat-stream": "^1.5.2", + "mkdirp": "^0.5.4", + "object-assign": "^4.1.1", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/mysql2": { "version": "3.11.3", "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.11.3.tgz", @@ -1046,6 +1171,15 @@ "node": ">=0.10.0" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", @@ -1251,6 +1385,12 @@ "node": ">=0.10.0" } }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -1310,6 +1450,27 @@ "node": ">= 0.8" } }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1502,6 +1663,29 @@ "node": ">= 0.8" } }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -1613,6 +1797,12 @@ "node": ">= 0.6" } }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "license": "MIT" + }, "node_modules/undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", @@ -1620,6 +1810,13 @@ "dev": true, "license": "MIT" }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -1629,6 +1826,12 @@ "node": ">= 0.8" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/package.json b/package.json index 25e3725..35de5c9 100755 --- a/package.json +++ b/package.json @@ -11,14 +11,16 @@ "license": "ISC", "description": "", "dependencies": { + "cors": "^2.8.5", "express": "^4.21.0", + "multer": "^1.4.5-lts.1", "mysql2": "^3.11.3", "pg": "^8.13.0", "swagger-jsdoc": "^6.2.8", - "swagger-ui-express": "^5.0.1", - "cors": "^2.8.5" + "swagger-ui-express": "^5.0.1" }, "devDependencies": { + "@types/cors": "^2.8.17", "nodemon": "^3.1.7" } } diff --git a/routes/api.js b/routes/api.js deleted file mode 100644 index f6cd998..0000000 --- a/routes/api.js +++ /dev/null @@ -1,575 +0,0 @@ -const express = require('express'); -const router = express.Router(); -const db = require('../db'); -const path = require('path'); -const fs = require('fs'); -const ffmpeg = require('../ffmpeg'); -const fileUtils = require('../utils/fileUtils'); -const serverError = require('../utils/serverError'); -const video = require('../utils/video'); -const dbTester = require('../test/dbTester'); -const cors = require('cors'); // Import the cors package - -router.use(cors({ - origin: ['http://127.0.0.1:5500', 'http://localhost:5500'], - methods: 'GET,POST,PUT,DELETE', - allowedHeaders: 'Content-Type', -})); - -/** - * @swagger - * /projects: - * get: - * description: Use to request all projects - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/projects', async (req, res) => { - try { - const projects = await db.query('SELECT * FROM public.projects'); - res.json(projects.rows); - } catch (error) { - serverError.sendError('Error getting projects:', res, error); - } -}); - -/** - * @swagger - * /projects/{id}/create-video: - * get: - * description: Create a video from images of a specific project by project id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the project to create video for. - * schema: - * type: integer - * responses: - * 200: - * description: Video created successfully - * 404: - * description: No images found for this project - * 500: - * description: Internal server error - */ -router.get('/projects/:id/create-video', async (req, res) => { - const projectId = req.params.id; - if (!projectId || isNaN(projectId)) { - return res.status(400).json({ error: 'Invalid project ID' }); - } - try { - const videoPath = await video.createVideo(projectId); - res.json(videoPath); - res.status(200).json({ message: 'Video created successfully', videoPath }); - } catch (error) { - serverError.sendError('Error creating video:', res, error); - } -}); - -/** - * @swagger - * /projects/{id}: - * get: - * description: Use to request a specific project by id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the project to retrieve. - * schema: - * type: integer - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/projects/:id', async (req, res) => { - const projectId = req.params.id; - if (!projectId || isNaN(projectId)) { - return res.status(400).json({ error: 'Invalid project ID' }); - } - try { - const project = await db.query('SELECT * FROM public.projects WHERE id = $1', [projectId]); - if (project.rows.length === 0) { - return res.status(404).json({ error: 'Project not found' }); - } - res.json(project.rows[0]); - } catch (error) { - serverError.sendError('Error getting project:', res, error); - } -}); - -/** - * @swagger - * /projects/{id}/videos: - * get: - * description: Use to request all videos for a specific project by project id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the project to retrieve videos for. - * schema: - * type: integer - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/projects/:id/videos', (req, res) => { - const projectId = req.params.id; - if (!projectId || isNaN(projectId)) { - return res.status(400).json({ error: 'Invalid project ID' }); - } - const query = 'SELECT * FROM public.videos WHERE project_id = $1'; - db.query(query, [projectId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération des vidéos pour le projet:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /projects/{id}/measurements: - * get: - * description: Use to request all measurements for a specific project by project id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the project to retrieve measurements for. - * schema: - * type: integer - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/projects/:id/measurements', (req, res) => { - const projectId = req.params.id; - if (!projectId || isNaN(projectId)) { - return res.status(400).json({ error: 'Invalid project ID' }); - } - const query = 'SELECT * FROM public.measurements WHERE project_id = $1'; - db.query(query, [projectId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération des mesures pour le projet:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /projects: - * post: - * description: Use to add a new project - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * properties: - * name: - * type: string - * description: - * type: string - * responses: - * 201: - * description: Project added successfully - * 500: - * description: Internal server error - */ -router.post('/projects', async (req, res) => { - const { name, description } = req.body; - if (!name || !description) { - return res.status(400).json({ error: 'Name and description are required' }); - } - - try { - const query = `INSERT INTO public.projects (name, description, status) VALUES ($1, $2, 0) RETURNING id`; - const result = await db.query(query, [name, description]); - const projectId = result.rows[0].id; - - fileUtils.createProjectDirectory(projectId); - res.status(201).json({ message: 'Project created successfully', projectId }); - } catch (error) { - serverError.sendError('Error creating project:', res, error); - } -}); - -/** - * @swagger - * /projects/{id}: - * delete: - * description: Use to delete a project by ID - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the project to delete. - * schema: - * type: integer - * responses: - * 200: - * description: Project deleted successfully - * 404: - * description: No project found with this ID - * 500: - * description: Internal server error - */ -router.delete('/projects/:id', async (req, res) => { - const projectId = req.params.id; - if (!projectId || isNaN(projectId)) { - return res.status(400).json({ error: 'Invalid project ID' }); - } - - try { - const result = await db.query('DELETE FROM public.projects WHERE id = $1 RETURNING id', [projectId]); - if (result.rowCount === 0) { - return res.status(404).json({ error: 'No project found with this ID' }); - } - - fileUtils.deleteProjectDirectory(projectId); - res.status(200).json({ message: 'Project deleted successfully', id: projectId }); - } catch (error) { - serverError.sendError('Error deleting project:', res, error); - } -}); - -/** - * @swagger - * /measurements: - * get: - * description: Use to request all measurements - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/measurements', (req, res) => { - const query = 'SELECT * FROM public.measurements'; - db.query(query, (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération des mesures:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /measurements/{id}: - * get: - * description: Use to request a specific measurement by id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the measurement to retrieve. - * schema: - * type: integer - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/measurements/:id', (req, res) => { - const measurementId = req.params.id; - if (!measurementId || isNaN(measurementId)) { - return res.status(400).json({ error: 'Invalid measurement ID' }); - } - const query = 'SELECT * FROM public.measurements WHERE id = $1'; - db.query(query, [measurementId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération de la mesure:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /measurements: - * post: - * description: Use to add a new measurement - * responses: - * 201: - * description: Measurement added successfully - * 500: - * description: Internal server error - */ -router.post('/measurements', (req, res) => { - const { project_id, timestamp, image_path, temperature, humidity, completed } = req.body; - if (!project_id || !timestamp || !image_path || !temperature || !humidity || !completed) { - return res.status(400).json({ error: 'All fields are required' }); - } - const query = 'INSERT INTO public.measurements (project_id, timestamp, image_path, temperature, humidity, completed) VALUES ($1, $2, $3, $4, $5, $6) RETURNING id'; - db.query(query, [project_id, timestamp, image_path, temperature, humidity, completed], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de l\'ajout de la mesure:', res, err); - } - res.status(201).json({ message: 'Mesure ajoutée avec succès', id: results.rows[0].id }); - }); -}); - -/** - * @swagger - * /measurements/{id}: - * delete: - * description: Use to delete a measurement by ID - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the measurement to delete. - * schema: - * type: integer - * responses: - * 200: - * description: Measurement deleted successfully - * 404: - * description: No measurement found with this ID - * 500: - * description: Internal server error - */ -router.delete('/measurements/:id', (req, res) => { - const measurementId = req.params.id; - if (!measurementId || isNaN(measurementId)) { - return res.status(400).json({ error: 'Invalid measurement ID' }); - } - const query = 'DELETE FROM public.measurements WHERE id = $1 RETURNING id'; - db.query(query, [measurementId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la suppression de la mesure:', res, err); - } - if (results.rowCount === 0) { - return res.status(404).json({ error: 'Aucune mesure trouvée avec cet ID.' }); - } - res.status(200).json({ message: 'Mesure supprimée avec succès', id: measurementId }); - }); -}); - -/** - * @swagger - * /videos: - * get: - * description: Use to request all videos - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/videos', (req, res) => { - const query = 'SELECT * FROM public.videos'; - db.query(query, (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération des vidéos:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /videos/{id}: - * get: - * description: Use to request a specific video by id - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the video to retrieve. - * schema: - * type: integer - * responses: - * 200: - * description: A successful response - * 500: - * description: Internal server error - */ -router.get('/videos/:id', (req, res) => { - const videoId = req.params.id; - if (!videoId || isNaN(videoId)) { - return res.status(400).json({ error: 'Invalid video ID' }); - } - const query = 'SELECT * FROM public.videos WHERE id = $1'; - db.query(query, [videoId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération de la vidéo:', res, err); - } - res.json(results.rows); - }); -}); - -/** - * @swagger - * /videos: - * post: - * description: Use to create a new video - * requestBody: - * required: true - * content: - * application/json: - * schema: - * type: object - * properties: - * project_id: - * type: integer - * measurement_ids: - * type: string - * video_path: - * type: string - * duration: - * type: number - * resolution: - * type: string - * name: - * type: string - * responses: - * 201: - * description: Video created successfully - * 500: - * description: Internal server error - */ -router.post('/videos', (req, res) => { - const { project_id, measurement_ids, video_path, duration, resolution, name } = req.body; - if (!project_id || !measurement_ids || !video_path || !duration || !resolution || !name) { - return res.status(400).json({ error: 'All fields are required' }); - } - - const list_ids = measurement_ids.split(','); - const image_count = list_ids.length; - const videoPath = '/videos/' + name + '.mp4'; - - const query_first = 'SELECT timestamp FROM public.measurements WHERE id = $1'; - const query_last = 'SELECT timestamp FROM public.measurements WHERE id = $1'; - - db.query(query_first, [list_ids[0]], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération du timestamp de la première image:', res, err); - } - const start_timestamp = results.rows[0].timestamp; - - db.query(query_last, [list_ids[image_count - 1]], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la récupération du timestamp de la dernière image:', res, err); - } - const end_timestamp = results.rows[0].timestamp; - const fps = image_count / duration; - - const query = 'INSERT INTO public.videos (project_id, measurement_ids, video_path, start_timestamp, end_timestamp, image_count, resolution, duration, fps, status, name) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING id'; - db.query(query, [project_id, measurement_ids, videoPath, start_timestamp, end_timestamp, image_count, resolution, duration, fps, 0, name], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de l\'ajout de la vidéo:', res, err); - } - res.status(201).json({ message: 'Vidéo ajoutée avec succès', id: results.rows[0].id }); - }); - }); - }); -}); - -/** - * @swagger - * /videos/{id}: - * delete: - * description: Use to delete a video by ID - * parameters: - * - in: path - * name: id - * required: true - * description: Numeric ID of the video to delete. - * schema: - * type: integer - * responses: - * 200: - * description: Video deleted successfully - * 404: - * description: No video found with this ID - * 500: - * description: Internal server error - */ -router.delete('/videos/:id', (req, res) => { - const videoId = req.params.id; - if (!videoId || isNaN(videoId)) { - return res.status(400).json({ error: 'Invalid video ID' }); - } - const query = 'DELETE FROM public.videos WHERE id = $1 RETURNING id'; - db.query(query, [videoId], (err, results) => { - if (err) { - serverError.sendError('Erreur lors de la suppression de la vidéo:', res, err); - } - if (results.rowCount === 0) { - return res.status(404).json({ error: 'Aucune vidéo trouvée avec cet ID.' }); - } - res.status(200).json({ message: 'Vidéo supprimée avec succès', id: videoId }); - }); -}); - -// Test Image -/** - * @swagger - * /smile: - * get: - * description: Use to request the smile image - * responses: - * 200: - * description: A successful response - * 404: - * description: Image not found - */ -router.get('/smile', (req, res) => { - const imagePath = path.join('/storage/smile.jpg'); - fs.access(imagePath, fs.constants.F_OK, (err) => { - if (err) { - console.error('Image not found:', err); - return res.status(404).json({ error: 'Image not found' }); - } - res.sendFile(imagePath); - }); -}); - -/** - * @swagger - * /image/{filename}: - * get: - * description: Use to request a specific image by filename - * parameters: - * - in: path - * name: filename - * required: true - * description: Name of the image file to retrieve. - * schema: - * type: string - * example: image.jpg - * responses: - * 200: - * description: A successful response - * 404: - * description: Image not found - */ -router.get('/image/:filename', (req, res) => { - const imagePath = path.join('/storage/image', req.params.filename); - fs.access(imagePath, fs.constants.F_OK, (err) => { - if (err) { - console.error('Image not found:', err); - return res.status(404).json({ error: 'Image not found' }); - } - res.sendFile(imagePath); - }); -}); - -module.exports = router; diff --git a/routes/imageRoutes.js b/routes/imageRoutes.js new file mode 100644 index 0000000..e6eeffe --- /dev/null +++ b/routes/imageRoutes.js @@ -0,0 +1,89 @@ +const express = require('express'); +const router = express.Router(); +const path = require('path'); +const fs = require('fs'); +const dbTester = require('../test/tester'); +const db = require('../db'); +const serverError = require('../utils/serverError'); + +/** + * @swagger + * /smile: + * get: + * summary: Retrieve a smile image + * responses: + * 200: + * description: Smile image retrieved successfully + * content: + * image/jpeg: + * schema: + * type: string + * format: binary + * 404: + * description: Image not found + */ +router.get('/smile', (req, res) => { + const imagePath = dbTester.getSmileImage(); + fs.access(imagePath, fs.constants.F_OK, (err) => { + if (err) { + console.error('Image not found:', err); + return res.status(404).json({ error: 'Image not found' }); + } + res.sendFile(imagePath); + }); +}); + +/** + * @swagger + * /images/{projectId}/{orderId}: + * get: + * summary: Retrieve an image by project ID and order ID + * parameters: + * - in: path + * name: projectId + * required: true + * schema: + * type: string + * description: The ID of the project + * - in: path + * name: orderId + * required: true + * schema: + * type: string + * description: The ID of the order + * responses: + * 200: + * description: Image retrieved successfully + * content: + * image/jpeg: + * schema: + * type: string + * format: binary + * 404: + * description: Image not found + * 500: + * description: Internal server error + */ +router.get('/images/:projectId/:orderId', (req, res) => { + const projectId = req.params.projectId; + const orderId = req.params.orderId; + const query = 'SELECT path FROM public.measurements WHERE project_id = $1 AND order_id = $2'; + db.query(query, [projectId, orderId], (err, results) => { + if (err) { + return serverError.sendError('Error getting image:', res, err); + } + if (results.rows.length === 0) { + return res.status(404).json({ error: 'Image not found' }); + } + const imagePath = results.rows[0].path; + fs.access(imagePath, fs.constants.F_OK, (err) => { + if (err) { + console.error('Image not found:', err); + return res.status(404).json({ error: 'Image not found' }); + } + res.download(imagePath); + }); + }); +}); + +module.exports = router; diff --git a/routes/measurementRoutes.js b/routes/measurementRoutes.js new file mode 100644 index 0000000..38abff1 --- /dev/null +++ b/routes/measurementRoutes.js @@ -0,0 +1,240 @@ +const express = require('express'); +const router = express.Router(); +const db = require('../db'); +const measureManager = require('../src/measure/measureManager'); +const serverError = require('../utils/serverError'); + +/** + * @swagger + * /measurements: + * get: + * summary: Récupérer toutes les mesures + * description: Récupère toutes les mesures de la base de données. + * responses: + * 200: + * description: Une liste de mesures. + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: '#/components/schemas/Measurement' + * 500: + * description: Erreur serveur. + */ +router.get('/measurements', (req, res) => { + const query = 'SELECT * FROM public.measurements'; + db.query(query, (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération des mesures:', res, err); + } + res.json(results.rows); + }); +}); + +/** + * @swagger + * /measurements/{id}: + * get: + * summary: Récupérer une mesure par ID + * description: Récupère une mesure spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID de la mesure + * responses: + * 200: + * description: Une mesure. + * content: + * application/json: + * schema: + * $ref: '#/components/schemas/Measurement' + * 400: + * description: ID de mesure invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/measurements/:id', (req, res) => { + const measurementId = req.params.id; + if (!measurementId || isNaN(measurementId)) { + return res.status(400).json({ error: 'Invalid measurement ID' }); + } + const query = 'SELECT * FROM public.measurements WHERE id = $1'; + db.query(query, [measurementId], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération de la mesure:', res, err); + } + res.json(results.rows); + }); +}); + +/** + * @swagger + * /measurements/{projectId}/{orderId}: + * get: + * summary: Récupérer une mesure par project ID et order ID + * description: Récupère une mesure spécifique en utilisant le project ID et order ID. + * parameters: + * - in: path + * name: projectId + * schema: + * type: integer + * required: true + * description: ID du projet + * - in: path + * name: orderId + * schema: + * type: integer + * required: true + * description: ID de la commande + * responses: + * 200: + * description: Une mesure. + * content: + * application/json: + * schema: + * $ref: '#/components/schemas/Measurement' + * 400: + * description: ID de projet ou de commande invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/measurements/:projectId/:orderId', async (req, res) => { + const projectId = req.params.projectId; + const orderId = req.params.orderId; + if (!projectId || isNaN(projectId) || !orderId || isNaN(orderId)) { + return res.status(400).json({ error: 'Invalid project ID or order ID' }); + } + try { + const measurement = await measureManager.getMeasurement(projectId, orderId); + res.json(measurement); + } catch (error) { + serverError.sendError('Error getting measurement:', res, error); + } +}); + +/** + * @swagger + * /measurements: + * post: + * summary: Ajouter une nouvelle mesure + * description: Ajoute une nouvelle mesure à la base de données. + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * properties: + * project_id: + * type: integer + * timestamp: + * type: string + * format: date-time + * image_path: + * type: string + * temperature: + * type: number + * humidity: + * type: number + * responses: + * 201: + * description: Mesure ajoutée avec succès. + * 400: + * description: Tous les champs sont requis. + * 500: + * description: Erreur serveur. + */ +router.post('/measurements', (req, res) => { + const { project_id, timestamp, image_path, temperature, humidity } = req.body; + if (!project_id || !timestamp || !image_path || !temperature || !humidity) { + return res.status(400).json({ error: 'All fields are required' }); + } + const query = 'INSERT INTO public.measurements (project_id, timestamp, image_path, temperature, humidity) VALUES ($1, $2, $3, $4, $5) RETURNING id'; + db.query(query, [project_id, timestamp, image_path, temperature, humidity], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de l\'ajout de la mesure:', res, err); + } + res.status(201).json({ message: 'Mesure ajoutée avec succès', id: results.rows[0].id }); + }); +}); + +/** + * @swagger + * /measurements/{id}: + * delete: + * summary: Supprimer une mesure par ID + * description: Supprime une mesure spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID de la mesure + * responses: + * 200: + * description: Mesure supprimée avec succès. + * 400: + * description: ID de mesure invalide. + * 500: + * description: Erreur serveur. + */ +router.delete('/measurements/:id', async (req, res) => { + const measurementId = req.params.id; + if (!measurementId || isNaN(measurementId)) { + return res.status(400).json({ error: 'Invalid measurement ID' }); + } + try { + const measurement = await measureManager.deleteMeasurement(measurementId); + res.status(200).json({ message: 'Measurement deleted successfully', id: measurementId }); + } catch (error) { + serverError.sendError('Error deleting measurement:', res, error); + } +}); + +/** + * @swagger + * /measurements/{projectId}/{orderId}: + * delete: + * summary: Supprimer une mesure par project ID et order ID + * description: Supprime une mesure spécifique en utilisant le project ID et order ID. + * parameters: + * - in: path + * name: projectId + * schema: + * type: integer + * required: true + * description: ID du projet + * - in: path + * name: orderId + * schema: + * type: integer + * required: true + * description: ID de la commande + * responses: + * 200: + * description: Mesure supprimée avec succès. + * 400: + * description: ID de projet ou de commande invalide. + * 500: + * description: Erreur serveur. + */ +router.delete('/measurements/:projectId/:orderId', async (req, res) => { + const projectId = req.params.projectId; + const orderId = req.params.orderId; + if (!projectId || isNaN(projectId) || !orderId || isNaN(orderId)) { + return res.status(400).json({ error: 'Invalid project ID or order ID' }); + } + try { + const measurement = await measureManager.deleteMeasurementByOrderId(projectId, orderId); + res.status(200).json({ message: 'Measurement deleted successfully', id: measurement.id }); + } catch (error) { + serverError.sendError('Error deleting measurement:', res, error); + } +}); + +module.exports = router; diff --git a/routes/projectRoutes.js b/routes/projectRoutes.js new file mode 100644 index 0000000..ee29573 --- /dev/null +++ b/routes/projectRoutes.js @@ -0,0 +1,225 @@ +const express = require('express'); +const router = express.Router(); +const projectManager = require('../src/project/projectManager'); +const serverError = require('../utils/serverError'); + +/** + * @swagger + * /projects: + * get: + * summary: Récupérer tous les projets + * description: Récupère tous les projets disponibles. + * responses: + * 200: + * description: Une liste de projets. + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: '#/components/schemas/Project' + * 500: + * description: Erreur serveur. + */ +router.get('/projects', async (req, res) => { + try { + const projects = await projectManager.getAllProjects(); + res.json(projects); + } catch (error) { + serverError.sendError('Error getting all projects:', res, error); + } +}); + +/** + * @swagger + * /projects/{id}: + * get: + * summary: Récupérer un projet par ID + * description: Récupère un projet spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID du projet + * responses: + * 200: + * description: Un projet. + * content: + * application/json: + * schema: + * $ref: '#/components/schemas/Project' + * 400: + * description: ID de projet invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/projects/:id', async (req, res) => { + const projectId = req.params.id; + if (!projectId || isNaN(projectId)) { + return res.status(400).json({ error: 'Invalid project ID' }); + } + try { + const project = await projectManager.getProjectById(projectId); + res.json(project); + } catch (error) { + serverError.sendError('Error getting project by ID:', res, error); + } +}); + +/** + * @swagger + * /projects/{id}/videos: + * get: + * summary: Récupérer les vidéos d'un projet par ID + * description: Récupère les vidéos associées à un projet spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID du projet + * responses: + * 200: + * description: Une liste de vidéos. + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: '#/components/schemas/Video' + * 400: + * description: ID de projet invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/projects/:id/videos', async (req, res) => { + const projectId = req.params.id; + if (!projectId || isNaN(projectId)) { + return res.status(400).json({ error: 'Invalid project ID' }); + } + try { + const videos = await projectManager.getVideosByProjectId(projectId); + res.json(videos); + } catch (error) { + serverError.sendError('Error getting videos by project ID:', res, error); + } +}); + +/** + * @swagger + * /projects/{id}/measurements: + * get: + * summary: Récupérer les mesures d'un projet par ID + * description: Récupère les mesures associées à un projet spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID du projet + * responses: + * 200: + * description: Une liste de mesures. + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: '#/components/schemas/Measurement' + * 400: + * description: ID de projet invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/projects/:id/measurements', async (req, res) => { + const projectId = req.params.id; + if (!projectId || isNaN(projectId)) { + return res.status(400).json({ error: 'Invalid project ID' }); + } + try { + const measurements = await projectManager.getMeasurementsByProjectId(projectId); + res.json(measurements); + } catch (error) { + serverError.sendError('Error getting measurements by project ID:', res, error); + } +}); + +/** + * @swagger + * /projects: + * post: + * summary: Ajouter un nouveau projet + * description: Ajoute un nouveau projet à la base de données. + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * properties: + * name: + * type: string + * description: + * type: string + * responses: + * 201: + * description: Projet ajouté avec succès. + * 400: + * description: Le nom et la description sont requis. + * 500: + * description: Erreur serveur. + */ +router.post('/projects', async (req, res) => { + const { name, description } = req.body; + if (!name || !description) { + return res.status(400).json({ error: 'Name and description are required' }); + } + try { + const project = await projectManager.createProject(name, description, new Date(), 0); + projectManager.createProjectDirectory(project.id); + res.status(201).json({ message: 'Project added successfully', id: project.id }); + } catch (error) { + serverError.sendError('Error creating project:', res, error); + } +}); + +/** + * @swagger + * /projects/{id}: + * delete: + * summary: Supprimer un projet par ID + * description: Supprime un projet spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID du projet + * responses: + * 200: + * description: Projet supprimé avec succès. + * 400: + * description: ID de projet invalide. + * 500: + * description: Erreur serveur. + */ +router.delete('/projects/:id', async (req, res) => { + const projectId = req.params.id; + if (!projectId || isNaN(projectId)) { + return res.status(400).json({ error: 'Invalid project ID' }); + } + try { + projectManager.deleteProjectDirectory(projectId); + projectManager.deleteProjectById(projectId); + res.status(200).json({ message: 'Project deleted successfully', id: projectId }); + } catch (error) { + serverError.sendError('Error deleting project:', res, error); + } +}); + +module.exports = router; diff --git a/routes/uploadRoutes.js b/routes/uploadRoutes.js new file mode 100644 index 0000000..6c208d3 --- /dev/null +++ b/routes/uploadRoutes.js @@ -0,0 +1,130 @@ +const express = require('express'); +const router = express.Router(); +const multer = require('multer'); +const measureManager = require('../src/measure/measureManager'); +const serverError = require('../utils/serverError'); + +const upload = multer({ storage: multer.memoryStorage() }); + +/** + * @swagger + * /upload: + * post: + * summary: Télécharger une image + * description: Télécharge une image pour un projet et un ordre spécifiques. + * consumes: + * - multipart/form-data + * parameters: + * - in: formData + * name: image + * type: file + * description: Fichier image à télécharger + * - in: formData + * name: projectId + * type: integer + * description: ID du projet + * - in: formData + * name: orderId + * type: integer + * description: ID de la commande + * responses: + * 200: + * description: Image téléchargée avec succès. + * content: + * application/json: + * schema: + * type: object + * properties: + * message: + * type: string + * path: + * type: string + * 400: + * description: Tous les champs sont requis. + * 500: + * description: Erreur serveur. + */ +router.post('/upload', upload.single('image'), async (req, res) => { + const { projectId, orderId } = req.body; + const image = req.file; + + if (!image || !projectId || !orderId) { + return res.status(400).json({ error: 'All fields are required' }); + } + + try { + const imagePath = await measureManager.uploadMeasureImage(image, projectId, orderId); + res.json({ message: 'Image uploaded successfully', path: imagePath }); + } catch (error) { + serverError.sendError('Error uploading image:', res, error); + } +}); + +/** + * @swagger + * /uploadmeasurement: + * post: + * summary: Télécharger une mesure avec une image + * description: Télécharge une mesure avec une image pour un projet spécifique. + * consumes: + * - multipart/form-data + * parameters: + * - in: formData + * name: image + * type: file + * description: Fichier image à télécharger + * - in: formData + * name: projectId + * type: integer + * description: ID du projet + * - in: formData + * name: timestamp + * type: string + * format: date-time + * description: Horodatage de la mesure + * - in: formData + * name: temperature + * type: number + * description: Température mesurée + * - in: formData + * name: humidity + * type: number + * description: Humidité mesurée + * responses: + * 200: + * description: Mesure téléchargée avec succès. + * content: + * application/json: + * schema: + * type: object + * properties: + * message: + * type: string + * path: + * type: string + * id: + * type: integer + * 400: + * description: Tous les champs sont requis. + * 500: + * description: Erreur serveur. + */ +router.post('/uploadmeasurement', upload.single('image'), async (req, res) => { + const { projectId, timestamp, temperature, humidity } = req.body; + const image = req.file; + + if (!image || !projectId || !timestamp || !temperature || !humidity) { + return res.status(400).json({ error: 'All fields are required' }); + } + + try { + const nextOrderId = await measureManager.getNextOrderId(projectId); + const imagePath = await measureManager.uploadMeasureImage(image, projectId, nextOrderId); + const measurement = await measureManager.addMeasureToProject(projectId, timestamp, imagePath, temperature, humidity, nextOrderId); + res.json({ message: 'Measurement uploaded successfully', path: imagePath, id: measurement.id }); + } catch (error) { + serverError.sendError('Error uploading measurement:', res, error); + } +}); + +module.exports = router; diff --git a/routes/videoRoutes.js b/routes/videoRoutes.js new file mode 100644 index 0000000..d799bff --- /dev/null +++ b/routes/videoRoutes.js @@ -0,0 +1,183 @@ +const express = require('express'); +const router = express.Router(); +const db = require('../db'); +const serverError = require('../utils/serverError'); + +/** + * @swagger + * /videos: + * get: + * summary: Récupérer toutes les vidéos + * description: Récupère toutes les vidéos de la base de données. + * responses: + * 200: + * description: Une liste de vidéos. + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: '#/components/schemas/Video' + * 500: + * description: Erreur serveur. + */ +router.get('/videos', (req, res) => { + const query = 'SELECT * FROM public.videos'; + db.query(query, (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération des vidéos:', res, err); + } + res.json(results.rows); + }); +}); + +/** + * @swagger + * /videos/{id}: + * get: + * summary: Récupérer une vidéo par ID + * description: Récupère une vidéo spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID de la vidéo + * responses: + * 200: + * description: Une vidéo. + * content: + * application/json: + * schema: + * $ref: '#/components/schemas/Video' + * 400: + * description: ID de vidéo invalide. + * 500: + * description: Erreur serveur. + */ +router.get('/videos/:id', (req, res) => { + const videoId = req.params.id; + if (!videoId || isNaN(videoId)) { + return res.status(400).json({ error: 'Invalid video ID' }); + } + const query = 'SELECT * FROM public.videos WHERE id = $1'; + db.query(query, [videoId], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération de la vidéo:', res, err); + } + res.json(results.rows); + }); +}); + +/** + * @swagger + * /videos: + * post: + * summary: Ajouter une nouvelle vidéo + * description: Ajoute une nouvelle vidéo à la base de données. + * requestBody: + * required: true + * content: + * application/json: + * schema: + * type: object + * properties: + * project_id: + * type: integer + * measurement_ids: + * type: string + * video_path: + * type: string + * duration: + * type: number + * resolution: + * type: string + * name: + * type: string + * responses: + * 201: + * description: Vidéo ajoutée avec succès. + * 400: + * description: Tous les champs sont requis. + * 500: + * description: Erreur serveur. + */ +router.post('/videos', (req, res) => { + const { project_id, measurement_ids, video_path, duration, resolution, name } = req.body; + if (!project_id || !measurement_ids || !video_path || !duration || !resolution || !name) { + return res.status(400).json({ error: 'All fields are required' }); + } + + const list_ids = measurement_ids.split(','); + const image_count = list_ids.length; + const videoPath = '/videos/' + name + '.mp4'; + + const query_first = 'SELECT timestamp FROM public.measurements WHERE id = $1'; + const query_last = 'SELECT timestamp FROM public.measurements WHERE id = $1'; + + db.query(query_first, [list_ids[0]], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération du timestamp de la première image:', res, err); + } + const start_timestamp = results.rows[0].timestamp; + + db.query(query_last, [list_ids[image_count - 1]], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la récupération du timestamp de la dernière image:', res, err); + } + const end_timestamp = results.rows[0].timestamp; + const fps = image_count / duration; + + const query = 'INSERT INTO public.videos (project_id, measurement_ids, video_path, start_timestamp, end_timestamp, image_count, resolution, duration, fps, status, name) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING id'; + db.query(query, [project_id, measurement_ids, videoPath, start_timestamp, end_timestamp, image_count, resolution, duration, fps, 0, name], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de l\'ajout de la vidéo:', res, err); + } + res.status(201).json({ message: 'Vidéo ajoutée avec succès', id: results.rows[0].id }); + }); + }); + }); +}); + +/** + * @swagger + * /videos/{id}: + * delete: + * summary: Supprimer une vidéo par ID + * description: Supprime une vidéo spécifique en utilisant son ID. + * parameters: + * - in: path + * name: id + * schema: + * type: integer + * required: true + * description: ID de la vidéo + * responses: + * 200: + * description: Vidéo supprimée avec succès. + * 400: + * description: ID de vidéo invalide. + * 404: + * description: Aucune vidéo trouvée avec cet ID. + * 500: + * description: Erreur serveur. + */ +router.delete('/videos/:id', (req, res) => { + const videoId = req.params.id; + if (!videoId || isNaN(videoId)) { + return res.status(400).json({ error: 'Invalid video ID' }); + } + const query = 'DELETE FROM public.videos WHERE id = $1 RETURNING id'; + db.query(query, [videoId], (err, results) => { + if (err) { + serverError.sendError('Erreur lors de la suppression de la vidéo:', res, err); + } + if (results.rowCount === 0) { + return res.status(404).json({ error: 'Aucune vidéo trouvée avec cet ID.' }); + } + res.status(200).json({ message: 'Vidéo supprimée avec succès', id: videoId }); + }); +}); + +module.exports = router; diff --git a/sample/smile.png b/sample/smile.png new file mode 100644 index 0000000..c5c51cd Binary files /dev/null and b/sample/smile.png differ diff --git a/server.js b/server.js index aa2bdeb..3778a51 100644 --- a/server.js +++ b/server.js @@ -1,13 +1,22 @@ // server.js const express = require('express'); +const cors = require('cors'); const app = express(); const port = 3000; // Middleware pour gérer les requêtes JSON app.use(express.json()); +// Cors accès à tout +app.use(cors({ + origin: ['http://127.0.0.1:5500', 'http://localhost:5500', 'http://localhost:3000'], + methods: ['GET', 'POST', 'PUT', 'DELETE'], + allowedHeaders: ['Content-Type'], + credentials: true, +})); + // Importer les routes -const apiRoutes = require('./routes/api'); +const apiRoutes = require('./api'); app.use('/api', apiRoutes); // Swagger dependencies @@ -27,6 +36,9 @@ const swaggerOptions = { { url: 'https://timelapse.kerboul.me/api', }, + { + url: 'http://localhost:3000/api', + } ], }, apis: ['./routes/*.js'], // Prend en compte tous les fichiers de routes pour générer la documentation diff --git a/src/data/filewatcher.js b/src/data/filewatcher.js new file mode 100644 index 0000000..9fa18fb --- /dev/null +++ b/src/data/filewatcher.js @@ -0,0 +1,42 @@ +import db from '../../db.js'; +import path from 'path'; +import storageManager from '../data/storageManager.js'; +import fs from 'fs'; + +async function checkAndRemoveInvalidEntries() { + console.log('Checking for invalid entries...'); + try { + const measurementsRes = await db.query('SELECT id, path FROM measurements'); + //console.log('Fetched measurements:', measurementsRes.rows); + for (const row of measurementsRes.rows) { + //console.log('Checking file path:', row.path); + if (!fs.existsSync(row.path)) { + // Remove invalid entry + await db.query('DELETE FROM measurements WHERE id = $1', [row.id]); + console.log(`Deleted invalid measurement entry with id: ${row.id}`); + } + } + + // Scan all images in storage + const allImages = await storageManager.scanAllImages(); + //console.log('Scanned all images:', allImages); + for (const imagePath of allImages) { + const entryRes = await db.query('SELECT id FROM measurements WHERE path = $1', [imagePath]); + if (entryRes.rows.length === 0) { + // Remove the file if the entry does not exist + fs.unlinkSync(imagePath); + console.log(`Deleted file at path: ${imagePath} as its database entry does not exist`); + } + } + } catch (err) { + console.error('Error checking and removing invalid entries:', err); + } +} + + + +// Run the check periodically +setInterval(checkAndRemoveInvalidEntries, 10000); // Every second + +// Initial run +checkAndRemoveInvalidEntries(); \ No newline at end of file diff --git a/src/data/storageManager.js b/src/data/storageManager.js new file mode 100644 index 0000000..5fe4f0f --- /dev/null +++ b/src/data/storageManager.js @@ -0,0 +1,71 @@ +const fs = require('fs'); +const path = require('path'); +const PROJECTS_DIR = path.join('.'); + +function createFolder(name){ + const projectDir = path.join(PROJECTS_DIR, `${name}`); + if (!fs.existsSync(projectDir)) { + fs.mkdirSync(projectDir, { recursive: true }); + } + return projectDir; +} + +function deleteFolder(name){ + const projectDir = path.join(PROJECTS_DIR, `${name + }`); + if (fs.existsSync + (projectDir)) { + fs.rmSync(projectDir, { recursive: true, force: true }); + } +} + +function scanAllImages(dir = 'storage') { + const projectDir = path.join(PROJECTS_DIR, dir); + let results = []; + + function scanDirectory(directory) { + const files = fs.readdirSync(directory); + files.forEach(file => { + const filePath = path.join(directory, file); + const stat = fs.statSync(filePath); + if (stat.isDirectory()) { + scanDirectory(filePath); + } else if (file.endsWith('.jpg')) { + results.push(filePath); + } + }); + } + + scanDirectory(projectDir); + return results; +} + +function saveFile(filePath, content) { + // Ensure content is a buffer + if (Buffer.isBuffer(content)) { + fs.writeFileSync(filePath, content); + } else { + throw new Error('Content must be a buffer'); + } +} + +function getFile(name){ + const filePath = path.join(PROJECTS_DIR, `${name}`); + return fs + .readFileSync(filePath); +} + +function deleteFile(name){ + const filePath = path.join(PROJECTS_DIR, `${name}`); + if (fs.existsSync(filePath)) + fs.rmSync(filePath); +} + +module.exports = { + createFolder, + deleteFolder, + scanAllImages, + saveFile, + getFile, + deleteFile +}; \ No newline at end of file diff --git a/src/measure/measureManager.js b/src/measure/measureManager.js new file mode 100644 index 0000000..9634e17 --- /dev/null +++ b/src/measure/measureManager.js @@ -0,0 +1,87 @@ +import db from '../../db.js'; +import path from 'path'; +import storageManager from '../data/storageManager.js'; + +async function uploadMeasureImage(image, projectId, orderId) { + const projectDir = storageManager.createFolder('./storage/' + projectId.toString()); + const imagesDir = storageManager.createFolder(path.join(projectDir, 'images')); + var imagePath = path.join(imagesDir, `${orderId}.jpg`); + storageManager.saveFile(imagePath, image.buffer); + + return imagePath; +} + +async function getMeasureImage(projectId, orderId) { + const projectPath = `${projectId}`; + const imagePath = `${projectPath}/${orderId}.jpg`; + return storageManager.getFile(imagePath); +} + +async function getNextOrderId(projectId) { + const query = 'SELECT MAX(order_id) FROM public.measurements WHERE project_id = $1'; + const values = [projectId]; + const res = await db.query(query, values); + return res.rows[0].max + 1; +} + +async function addMeasureToProject(projectId, orderId, timestamp, path, temperature, humidity) { + const query = 'INSERT INTO public.measurements (project_id, timestamp, path, temperature, humidity, order_id) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *'; + const values = [projectId, orderId, timestamp, path, temperature, humidity]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function getMeasurements(projectId) { + const query = 'SELECT * FROM public.measurements WHERE project_id = $1'; + const values = [projectId]; + const res = await db.query(query, values); + return res.rows; +} + +async function getMeasurement(projectId, orderId) { + const query = 'SELECT * FROM public.measurements WHERE project_id = $1 AND order_id = $2'; + const values = [projectId, orderId]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function getMeasurementById(id) { + const query = 'SELECT * FROM public.measurements WHERE id = $1'; + const values = [id]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function updateMeasurement(projectId, orderId, timestamp, path, temperature, humidity) { + const query = 'UPDATE public.measurements SET timestamp = $3, path = $4, temperature = $5, humidity = $6 WHERE project_id = $1 AND order_id = $2 RETURNING *'; + const values = [projectId, orderId, timestamp, path, temperature, humidity]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function updateMeasurementById(id, timestamp, path, temperature, humidity) { + const query = 'UPDATE public.measurements SET timestamp = $2, path = $3, temperature = $4, humidity = $5 WHERE id = $1 RETURNING *'; + const values = [id, timestamp, path, temperature, humidity]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function deleteMeasurement(id) { + const query = 'DELETE FROM public.measurements WHERE id = $1'; + const values = [id]; + const res = await db.query(query, values); + return res.rows[0]; +} + +export { + uploadMeasureImage, + addMeasureToProject, + getNextOrderId, + getMeasurements, + getMeasurement, + updateMeasurement, + deleteMeasurement, + getMeasureImage, + getMeasurementById, + updateMeasurementById +} diff --git a/src/project/projectManager.js b/src/project/projectManager.js new file mode 100644 index 0000000..ed5e0ca --- /dev/null +++ b/src/project/projectManager.js @@ -0,0 +1,74 @@ +import storageManager from '../data/storageManager.js'; +import db from '../../db.js'; + +function createProjectDirectory(projectId) { + const projectPath = `${projectId}`; + storageManager.createFolder(projectPath); + storageManager.createFolder(`${projectPath}/images`); + storageManager.createFolder(`${projectPath}/videos`); +} + +function deleteProjectDirectory(projectId) { + const projectPath = `${projectId}`; + storageManager.deleteFolder(projectPath); +} + +async function getAllProjects() { + const query = 'SELECT * FROM public.projects'; + const res = await db.query(query); + console.log('getAllProjects:', res.rows); + return res.rows; +} + +async function getProjectById(projectId) { + const query = 'SELECT * FROM public.projects WHERE id = $1'; + const values = [projectId]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function createProject(name, description, start_date, status) { + const query = 'INSERT INTO public.projects (name, description, start_date, status) VALUES ($1, $2, $3, $4) RETURNING *'; + const values = [name, description, start_date, status]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function editProjectById(projectID, name, description, startDate, status) { + const query = 'UPDATE public.projects SET name = $1, description = $2, start_date = $3, status = $4 WHERE id = $5 RETURNING *'; + const values = [name, description, startDate, status, projectID]; + const res = await db.query(query, values); + return res.rows[0]; +} + +async function deleteProjectById(projectId) { + const query = 'DELETE FROM public.projects WHERE id = $1'; + const values = [projectId]; + await db.query(query, values); +} + +async function getVideosByProjectId(projectId) { + const query = 'SELECT * FROM public.videos WHERE project_id = $1'; + const values = [projectId]; + const res = await db.query(query, values); + return res.rows; +} + +async function getMeasurementsByProjectId(projectId) { + const query = 'SELECT * FROM public.measurements WHERE project_id = $1'; + const values = [projectId]; + const res = await db.query(query, values); + return res.rows; +} + +export { + createProjectDirectory, + deleteProjectDirectory, + getAllProjects, + getProjectById, + createProject, + editProjectById, + deleteProjectById, + getVideosByProjectId, + getMeasurementsByProjectId +}; diff --git a/test/dbTester.js b/test/dbTester.js deleted file mode 100644 index 91a6d00..0000000 --- a/test/dbTester.js +++ /dev/null @@ -1,27 +0,0 @@ -const databaseUtils = require('../utils/dbUtils'); - -console.log('Testing database functions...'); - -async function printProjects() { - const projects = await databaseUtils.projectsTable.getAll(); - console.log('Projects:', projects); -} - -async function testCreateDestroyProject() { - const project = await databaseUtils.projectsTable.create('Test Project', 'This is a test project', new Date(), 0); - console.log('Created project:', project); - await databaseUtils.projectsTable.delete(project.id); - console.log('Deleted project:', project); -} - -try { - testCreateDestroyProject(); -} catch (error) { - console.error('Error:', error); -} - -try { - printProjects(); -} catch (error) { - console.error('Error:', error); -} \ No newline at end of file diff --git a/test/tester.js b/test/tester.js new file mode 100644 index 0000000..87f286c --- /dev/null +++ b/test/tester.js @@ -0,0 +1,19 @@ +const storageManager = require('../src/data/storageManager'); +const path = require('path'); + +console.log('Testing database functions...'); + +try { + storageManager.createFolder('test_folder'); + console.log('1 - Folder created'); + storageManager.deleteFolder('test_folder'); + console.log('2 - Folder deleted'); +} catch (error) { + console.error('Error testing database functions:', error); +} + +function getSmileImage() { + return path.join(__dirname, '../sample/smile.png'); +} + +exports.getSmileImage = getSmileImage; \ No newline at end of file diff --git a/utils/dbUtils.js b/utils/dbUtils.js deleted file mode 100644 index f17ae91..0000000 --- a/utils/dbUtils.js +++ /dev/null @@ -1,91 +0,0 @@ -const db = require('../db'); // Assurez-vous que le chemin est correct -const { get } = require('../routes/api'); - -const projectsTable = { - create: async (name, description, startDate, status) => { - const query = 'INSERT INTO public.projects (name, description, start_date, status) VALUES ($1, $2, $3, $4) RETURNING *'; - const values = [name, description, startDate, status]; - const res = await db.query(query, values); - return res.rows[0]; - }, - update: async (id, name, description, startDate, status) => { - const query = 'UPDATE public.projects SET name = $1, description = $2, start_date = $3, status = $4 WHERE id = $5 RETURNING *'; - const values = [name, description, startDate, status, id]; - const res = await db.query(query, values); - return res.rows[0]; - }, - delete: async (id) => { - const query = 'DELETE FROM public.projects WHERE id = $1'; - const values = [id]; - await db.query(query, values); - }, - getById: async (id) => { - const query = 'SELECT * FROM public.projects WHERE id = $1'; - const values = [id]; - const res = await db.query(query, values); - return res.rows[0]; - }, - getAll: async () => { - const query = 'SELECT * FROM public.projects'; - const res = await db.query(query); - return res.rows; - } -}; - -const measurementsTable = { - create: async (projectId, timestamp, imagePath, temperature, humidity, completed) => { - const query = 'INSERT INTO public.measurements (project_id, timestamp, image_path, temperature, humidity, completed) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *'; - const values = [projectId, timestamp, imagePath, temperature, humidity, completed]; - const res = await db.query(query, values); - return res.rows[0]; - }, - update: async (id, projectId, timestamp, imagePath, temperature, humidity, completed) => { - const query = 'UPDATE public.measurements SET project_id = $1, timestamp = $2, image_path = $3, temperature = $4, humidity = $5, completed = $6 WHERE id = $7 RETURNING *'; - const values = [projectId, timestamp, imagePath, temperature, humidity, completed, id]; - const res = await db.query(query, values); - return res.rows[0]; - }, - delete: async (id) => { - const query = 'DELETE FROM public.measurements WHERE id = $1'; - const values = [id]; - await db.query(query, values); - }, - getById: async (id) => { - const query = 'SELECT * FROM public.measurements WHERE id = $1'; - const values = [id]; - const res = await db.query(query, values); - return res.rows[0]; - } -}; - -const videosTable = { - create: async (projectId, measurementIds, videoPath, startTimestamp, endTimestamp, imageCount, resolution, duration, fps, status, name) => { - const query = 'INSERT INTO public.videos (project_id, measurement_ids, video_path, start_timestamp, end_timestamp, image_count, resolution, duration, fps, status, name) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *'; - const values = [projectId, measurementIds, videoPath, startTimestamp, endTimestamp, imageCount, resolution, duration, fps, status, name]; - const res = await db.query(query, values); - return res.rows[0]; - }, - update: async (id, projectId, measurementIds, videoPath, startTimestamp, endTimestamp, imageCount, resolution, duration, fps, status, name) => { - const query = 'UPDATE public.videos SET project_id = $1, measurement_ids = $2, video_path = $3, start_timestamp = $4, end_timestamp = $5, image_count = $6, resolution = $7, duration = $8, fps = $9, status = $10, name = $11 WHERE id = $12 RETURNING *'; - const values = [projectId, measurementIds, videoPath, startTimestamp, endTimestamp, imageCount, resolution, duration, fps, status, name, id]; - const res = await db.query(query, values); - return res.rows[0]; - }, - delete: async (id) => { - const query = 'DELETE FROM public.videos WHERE id = $1'; - const values = [id]; - await db.query(query, values); - }, - getById: async (id) => { - const query = 'SELECT * FROM public.videos WHERE id = $1'; - const values = [id]; - const res = await db.query(query, values); - return res.rows[0]; - } -}; - -module.exports = { - projectsTable, - measurementsTable, - videosTable -}; \ No newline at end of file diff --git a/utils/fileUtils.js b/utils/fileUtils.js deleted file mode 100644 index d3fdb96..0000000 --- a/utils/fileUtils.js +++ /dev/null @@ -1,40 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const PROJECTS_DIR = path.join('/storage'); - -/** - * Crée un dossier pour un projet donné. - * @param {number} projectId - L'ID du projet. - * @param {string} baseDir - Le répertoire de base où le dossier du projet sera créé. - */ -function createProjectDirectory(projectId) { - console.log('PROJECTS_DIR:', PROJECTS_DIR); - const projectDir = path.join(PROJECTS_DIR, `${projectId}`); - console.log(`Creating directory: ${projectDir}`); - if (!fs.existsSync(projectDir)) { - fs.mkdirSync(projectDir, { recursive: true }); - console.log(`Directory created: ${projectDir}`); - } else { - console.log(`Directory already exists: ${projectDir}`); - } -} - -/** - * Supprime le dossier d'un projet donné. - * @param {number} projectId - L'ID du projet. - */ -function deleteProjectDirectory(projectId) { - console.log('PROJECTS_DIR:', PROJECTS_DIR); - const projectDir = path.join(PROJECTS_DIR, `${projectId}`); - if (fs.existsSync(projectDir)) { - fs.rmSync(projectDir, { recursive: true, force: true }); - console.log(`Directory deleted: ${projectDir}`); - } else { - console.log(`Directory does not exist: ${projectDir}`); - } -} - -module.exports = { - createProjectDirectory, - deleteProjectDirectory -}; \ No newline at end of file