mirror of
https://github.com/detleph/server.git
synced 2026-09-04 08:36:06 +02:00
FIX: Formatting & Syntax error
This commit is contained in:
@@ -1,8 +1,13 @@
|
|||||||
import { Prisma } from "@prisma/client"
|
import { Prisma } from "@prisma/client";
|
||||||
import { PrismaClientKnownRequestError } from "@prisma/client/runtime";
|
import { PrismaClientKnownRequestError } from "@prisma/client/runtime";
|
||||||
import { Request, Response } from "express";
|
import { Request, Response } from "express";
|
||||||
import prisma from "../lib/prisma";
|
import prisma from "../lib/prisma";
|
||||||
import { createInsufficientPermissionsError, DataType, generateError, generateInvalidBodyError } from "./common";
|
import {
|
||||||
|
createInsufficientPermissionsError,
|
||||||
|
DataType,
|
||||||
|
generateError,
|
||||||
|
generateInvalidBodyError,
|
||||||
|
} from "./common";
|
||||||
|
|
||||||
export const getAllEvents = async (req: Request, res: Response) => {
|
export const getAllEvents = async (req: Request, res: Response) => {
|
||||||
const events = await prisma.event.findMany({
|
const events = await prisma.event.findMany({
|
||||||
@@ -68,7 +73,8 @@ export const getEvent = async (req: Request, res: Response) => {
|
|||||||
res.status(500).json({
|
res.status(500).json({
|
||||||
type: "error",
|
type: "error",
|
||||||
payload: {
|
payload: {
|
||||||
message: "Unknown error occurred with your request. Check if your parameters are correct",
|
message:
|
||||||
|
"Unknown error occurred with your request. Check if your parameters are correct",
|
||||||
schema: {
|
schema: {
|
||||||
eventId: DataType.UUID,
|
eventId: DataType.UUID,
|
||||||
},
|
},
|
||||||
@@ -79,7 +85,6 @@ export const getEvent = async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// requires: auth(ELEVATED)
|
// requires: auth(ELEVATED)
|
||||||
export const addEvent = async (req: Request, res: Response) => {
|
export const addEvent = async (req: Request, res: Response) => {
|
||||||
if (req.auth?.permission_level !== "ELEVATED") {
|
if (req.auth?.permission_level !== "ELEVATED") {
|
||||||
@@ -90,12 +95,11 @@ export const addEvent = async (req: Request, res: Response) => {
|
|||||||
typeof req.body.date !== "string" ||
|
typeof req.body.date !== "string" ||
|
||||||
typeof req.body.description !== "string"
|
typeof req.body.description !== "string"
|
||||||
) {
|
) {
|
||||||
generateInvalidBodyError({
|
generateInvalidBodyError({
|
||||||
name: DataType.STRING,
|
name: DataType.STRING,
|
||||||
date: DataType.DATETIME,
|
date: DataType.DATETIME,
|
||||||
description: DataType.STRING,
|
description: DataType.STRING,
|
||||||
})
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Check if date is valid
|
//TODO: Check if date is valid
|
||||||
@@ -128,7 +132,10 @@ interface DeleteEventQueryParams {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// requires: auth(ELEVATED)
|
// requires: auth(ELEVATED)
|
||||||
export const deleteEvent = (req: Request<DeleteEventQueryParams>, res: Response) => {
|
export const deleteEvent = (
|
||||||
|
req: Request<DeleteEventQueryParams>,
|
||||||
|
res: Response
|
||||||
|
) => {
|
||||||
if (req.auth?.permission_level !== "ELEVATED") {
|
if (req.auth?.permission_level !== "ELEVATED") {
|
||||||
res.status(403).json(createInsufficientPermissionsError());
|
res.status(403).json(createInsufficientPermissionsError());
|
||||||
}
|
}
|
||||||
@@ -141,7 +148,13 @@ export const deleteEvent = (req: Request<DeleteEventQueryParams>, res: Response)
|
|||||||
return res.status(204).end();
|
return res.status(204).end();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") {
|
if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") {
|
||||||
return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`));
|
return res
|
||||||
|
.status(404)
|
||||||
|
.json(
|
||||||
|
generateError(
|
||||||
|
`The organisation with the ID ${pid} could not be found`
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw e;
|
throw e;
|
||||||
|
|||||||
+6
-2
@@ -1,4 +1,9 @@
|
|||||||
import express, { ErrorRequestHandler, NextFunction, Request, Response } from "express";
|
import express, {
|
||||||
|
ErrorRequestHandler,
|
||||||
|
NextFunction,
|
||||||
|
Request,
|
||||||
|
Response,
|
||||||
|
} from "express";
|
||||||
import prisma from "./lib/prisma";
|
import prisma from "./lib/prisma";
|
||||||
import eventRouter from "./Routes/event.routes";
|
import eventRouter from "./Routes/event.routes";
|
||||||
import adminAuthRouter from "./Routes/admin_auth.routes";
|
import adminAuthRouter from "./Routes/admin_auth.routes";
|
||||||
@@ -7,7 +12,6 @@ import adminRouter from "./Routes/admin.routes";
|
|||||||
import organisationRouter from "./Routes/organisation.routes";
|
import organisationRouter from "./Routes/organisation.routes";
|
||||||
import groupRouter from "./Routes/group.routes";
|
import groupRouter from "./Routes/group.routes";
|
||||||
|
|
||||||
|
|
||||||
require("dotenv").config(); // Load dotenv config
|
require("dotenv").config(); // Load dotenv config
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ import mjml from "mjml";
|
|||||||
const template_folder = "/app/resources/email/templates/";
|
const template_folder = "/app/resources/email/templates/";
|
||||||
|
|
||||||
const compileTemplates = () => {
|
const compileTemplates = () => {
|
||||||
console.log("Compiling templates: ")
|
console.log("Compiling templates: ");
|
||||||
|
|
||||||
fs.readdir(template_folder, (err, files) => {
|
fs.readdir(template_folder, (err, files) => {
|
||||||
if (err) console.log(err);
|
if (err) console.log(err);
|
||||||
|
|||||||
Reference in New Issue
Block a user