Dev

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "prisma.pinToPrisma6": true
+}

Dockerfile

@@ -3,14 +3,17 @@ FROM node:20-alpine AS builder
 WORKDIR /src
 
 COPY package*.json ./
-RUN npm ci
+RUN npm install
+
 
 COPY . .
 
+RUN npm run build
+
 
 FROM node:20-alpine
 
-WORKDIR /src
+WORKDIR /
 
 
 COPY --from=builder /src/package*.json ./
@@ -22,4 +25,4 @@ ENV PORT=5679
 EXPOSE 5679
 
 
-CMD ["node", "server.js"]
+CMD ["node", "dist/server.js"]

Makefile

@@ -4,6 +4,7 @@
 DOCKER = docker
 IMAGE_NAME = nethr-backend
 CONTAINER_NAME = Nethr-server
+DB_CONTAINER = nethr-srv-db
 
 # Testing
 PRISMA = prisma
@@ -17,6 +18,26 @@ all: run
 build: test
 	$(DOCKER) build -t $(IMAGE_NAME) .
 
+	$(DOCKER) run -d --rm \
+		--name $(DB_CONTAINER) \
+		-e POSTGRES_USER=postgres \
+		-e POSTGRES_PASSWORD=postgres \
+		-e POSTGRES_DB=testdb \
+		-p 5432:5432 \
+		postgres
+
+frbuild: 
+	$(DOCKER) build -t $(IMAGE_NAME) .
+
+	$(DOCKER) run -d --rm \
+		--name $(DB_CONTAINER) \
+		-e POSTGRES_USER=postgres \
+		-e POSTGRES_PASSWORD=postgres \
+		-e POSTGRES_DB=testdb \
+		-p 5432:5432 \
+		postgres
+
+
 run: build
 	$(DOCKER) run -d --name $(CONTAINER_NAME) -p 5679:5679 $(IMAGE_NAME):latest
 
@@ -61,6 +82,9 @@ test-withoutsq:
 
 	$(NPX) rimraf coverage
 
+sonar:
+	$(DOCKER) compose up -d
+
 reset:
 	$(DOCKER) stop $(TESTING_CONTAINER)
 
@@ -69,3 +93,4 @@ clean:
 	$(DOCKER) stop $(CONTAINER_NAME)
 	$(DOCKER) rm $(CONTAINER_NAME)
 	$(DOCKER) rmi $(IMAGE_NAME)
+

docker-compose.yaml

@@ -34,6 +34,7 @@ services:
       - postgresql_data:/var/lib/postgresql/data
     networks: 
       - sonar-net
+
 
 
 networks:

minecraft-srv/docker-compose.yaml

@@ -0,0 +1,13 @@
+services:
+  dind:
+    image: docker:24-dind
+    privileged: true
+    volumes:
+      - docker-data:/var/lib/docker
+
+  app:
+    build: ./app
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - dind

package.json

@@ -2,22 +2,20 @@
 	"name": "srv",
 	"version": "1.0.0",
 	"description": "",
-	"main": "server.js",
+	"main": "src/server.ts",
 	"scripts": {
-		"dev": "nodemon",
+		"dev": "nodemon --watch src --ext ts --exec ts-node src/server.ts",
 		"prisma:migrate": "prisma migrate dev",
 		"prisma:generate": "prisma generate",
-		"start": "node server.js",
+		"start": "node dist/server.js",
 		"lint": "eslint",
+		"build": "tsc",
 		"sonarqube": "docker compose up -d"
 	},
 	"keywords": [],
 	"author": "",
 	"license": "ISC",
-	"type": "module",
-	"ts-node": {
-		"esm": true
-	},
+	"type": "commonjs",
 	"devDependencies": {
 		"@eslint/js": "^9.39.1",
 		"@types/bcryptjs": "^3.0.0",
@@ -37,6 +35,8 @@
 		"rimraf": "^6.1.2",
 		"supertest": "^7.1.4",
 		"ts-jest": "^29.4.5",
+		"ts-node": "^10.9.2",
+		"tsconfig-paths": "^4.2.0",
 		"typescript": "^5.9.3"
 	},
 	"dependencies": {
@@ -51,7 +51,6 @@
 		"jsonwebtoken": "^9.0.2",
 		"nodemailer": "^7.0.10",
 		"nodemon": "^3.1.11",
-		"ts-node": "^10.9.2",
 		"typescript-eslint": "^8.47.0"
 	}
 }

prisma/schema.prisma

@@ -10,17 +10,17 @@ generator client {
 
 // User-Tabelle (mapped auf "users")
 model User {
-  id           String    @id @default(uuid())
-  email        String    @unique
-  passwordHash String    @map("password_hash")
-  createdAt    DateTime  @default(now()) @map("created_at")
-  updatedAt    DateTime  @default(now()) @map("updated_at")
-  lastLogin    DateTime? @map("last_login")
-  status       String    @default("active")
-  role         String    @default("user")
-  locale       String    @default("en")
-  timezone     String    @default("UTC")
-  emailVerifiedAt DateTime?  @map("email_verified_at")
+  id              String    @id @default(uuid())
+  email           String    @unique
+  passwordHash    String    @map("password_hash")
+  createdAt       DateTime  @default(now()) @map("created_at")
+  updatedAt       DateTime  @default(now()) @map("updated_at")
+  lastLogin       DateTime? @map("last_login")
+  status          String    @default("active")
+  role            String    @default("user")
+  locale          String    @default("en")
+  timezone        String    @default("UTC")
+  emailVerifiedAt DateTime? @map("email_verified_at")
 
   profile UserProfile?
   servers Server[]

src/app.ts

@@ -1,11 +1,11 @@
 import express from "express";
 import cors from "cors";
-import { env } from "./config/env.ts";
-import { router } from "./routes/index.ts";
+import { env } from "./config/env";
+import { router } from "./routes/index";
 
 export const createApp = () => {
     const corsOptions = {
-        origin: '*'
+        origin: 'http://localhost:3000'
     };
 
     const app = express();

src/controllers/auth.controller.ts

@@ -1,6 +1,8 @@
 import type { Request, Response, NextFunction } from "express";
-import { authService } from "../services/auth.service.ts";
-import { env } from "../config/env.ts";
+import { authService } from "../services/auth.service";
+import { env } from "../config/env";
+import { Logger } from "../utils/logger";
+import { signAccessToken } from "../core/security/jwt";
 
 export const registerController = async (
     req: Request,
@@ -11,9 +13,11 @@ export const registerController = async (
         const { email, password } = req.body;
         const user = await authService.register(email, password);
         res.status(201).json({ id: user.id, email: user.email });
+        Logger.success(`${user.id} created a account`);
     } catch (err: unknown) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message}`);
         } else {
             res.status(400).json({ error: "Unknown error", err });
         }
@@ -28,10 +32,13 @@ export const loginController = async (
     try {
         const { email, password } = req.body;
         const user = await authService.login(email, password);
-        res.json({ id: user.id, email: user.email });
+        const token = signAccessToken({ sub: user.id, email: user.email, role: user.role })
+        res.json({ id: user.id, email: user.email, token: token });
+        Logger.success(`${user.id} logged in `);
     } catch (err: unknown) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message} `);
         } else {
             res.status(400).json({ error: "Unknown error" });
         }
@@ -50,6 +57,7 @@ export const getUserByEmailController = async (
     } catch (err: unknown) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message} `)
         } else {
             res.status(400).json({ error: "Unknown error", err });
         }
@@ -64,12 +72,15 @@ export const verifyEmailController = async (
     try {
         const token = req.query.token;
 
-        await authService.verifyEmail(token as string);
+        const user = await authService.verifyEmail(token as string);
+
+        Logger.success(`${user.id} has verified a email`);
 
         res.redirect(env.appBaseUrl)
     } catch (err: unknown) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message} `)
         } else {
             res.status(400).json({ error: "Unknown error", err });
         }

src/controllers/user.controller.ts

@@ -1,5 +1,6 @@
 import type { Request, Response, NextFunction } from "express";
-import { userService } from "../services/user.service.ts";
+import { userService } from "../services/user.service";
+import { Logger } from "../utils/logger";
 
 export const getMyProfileController = async (
     req: Request,
@@ -9,10 +10,13 @@ export const getMyProfileController = async (
     try {
         const userId = req.user!.id;
         const result = await userService.getUserWithProfileById(userId);
+
         res.json(result);
+        Logger.success(`${req.user!.id} has requested their profile`);
     } catch (err) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message}`);
         } else {
             res.status(400).json({ error: "Unknown error" });
         }
@@ -29,9 +33,11 @@ export const updateMyProfileController = async (
         const profileData = req.body;
         const result = await userService.updateProfile(userId, profileData);
         res.json(result);
+        Logger.success(`${userId} has updated their profile`)
     } catch (err) {
         if (err instanceof Error) {
             res.status(400).json({ error: err.message });
+            Logger.error(`${err.message}`)
         } else {
             res.status(400).json({ error: "Unknown error" });
         }

src/core/security/jwt.ts

@@ -1,6 +1,6 @@
 import jwt from "jsonwebtoken";
 import type { Secret, SignOptions } from "jsonwebtoken";
-import { env } from '../../config/env.ts';
+import { env } from '../../config/env';
 
 export interface JwtPayload {
     sub: string;

src/middleware/auth.middleware.ts

@@ -1,11 +1,12 @@
 import { Request, Response, NextFunction } from "express";
-import { verifyAccessToken } from "../core/security/jwt.ts";
+import { verifyAccessToken } from "../core/security/jwt";
 
 export function authMiddleware(
   req: Request,
   res: Response,
   next: NextFunction
 ) {
+
   const authHeader = req.headers.authorization;
   if (!authHeader?.startsWith("Bearer ")) {
     return res.status(401).json({ error: "Unauthorized" });

src/repositories/user.repository.ts

@@ -1,4 +1,4 @@
-import { prisma } from "../config/db.ts";
+import { prisma } from "../config/db";
 
 export const userRepository = {
     findByEmail(email: string) {

src/repositories/userProfile.repository.ts

@@ -1,4 +1,4 @@
-import { prisma } from "../config/db.ts";
+import { prisma } from "../config/db";
 
 export const userProfileRepository = {
     findByUserId(userId: string) {

src/routes/auth.routes.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { getUserByEmailController, loginController, registerController, verifyEmailController } from "../controllers/auth.controller.ts";
+import { getUserByEmailController, loginController, registerController, verifyEmailController } from "../controllers/auth.controller";
 
 export const authRouter = Router();
 

src/routes/index.ts

@@ -1,6 +1,8 @@
 import { Router } from "express";
-import { authRouter } from "./auth.routes.ts";
+import { authRouter } from "./auth.routes";
+import { userRouter } from "./user.routes";
 
 export const router = Router();
 
 router.use("/auth", authRouter);
+router.use("/user", userRouter);

src/routes/user.routes.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { authMiddleware } from "../middleware/auth.middleware.ts";
+import { authMiddleware } from "../middleware/auth.middleware";
 
 import {
     getMyProfileController,