From 50ad684ad3cd3831a6fd25183787e8b6f718545b Mon Sep 17 00:00:00 2001
From: Spacelord <git@spacelord.de>
Date: Mon, 3 Mar 2025 16:43:49 +0100
Subject: [PATCH] Add email to user

---
 prisma/schema.prisma                  | 5 ++++-
 src/handlers/db.ts                    | 3 +--
 src/routes/api/v1/user/user.ts        | 6 ++++--
 src/routes/api/v1/user/user_schema.ts | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 571cc6c..6d1872c 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -17,12 +17,13 @@ model user {
   id   Int    @id @unique @default(autoincrement())
   name String @unique
   code String?
+  email String?
 
   // TODO: Prüfen ob nötig, erstmal vorbereitet.
   transactions transactions[]
 
   @@fulltext([name])
-}
+} 
 
 model transactions {
   id Int @id @unique @default(autoincrement())
@@ -62,3 +63,5 @@ model products {
 
   @@fulltext([name])
 }
+
+// TODO: migrate all ids to uuid?
diff --git a/src/handlers/db.ts b/src/handlers/db.ts
index 872634b..73e60c3 100644
--- a/src/handlers/db.ts
+++ b/src/handlers/db.ts
@@ -17,7 +17,6 @@ export function handlePrismaError(errorObj: any, res: Response, source: string)
 	log.db.error(source, errorObj);
 	if (errorObj instanceof Prisma.PrismaClientKnownRequestError) {
 		switch (errorObj.code) {
-
 			// P2002 -> "Unique constraint failed on the {constraint}"
 			case 'P2002':
 				res.status(409).json({ status: 'ERROR', errorcode: 'DB_ERROR', message: 'The object needs to be unique', meta: errorObj.meta });
@@ -44,4 +43,4 @@ export function handlePrismaError(errorObj: any, res: Response, source: string)
 
 export default prisma;
 
-//FIXME: https://www.prisma.io/docs/orm/prisma-client/special-fields-and-types/null-and-undefined
\ No newline at end of file
+//FIXME: https://www.prisma.io/docs/orm/prisma-client/special-fields-and-types/null-and-undefined
diff --git a/src/routes/api/v1/user/user.ts b/src/routes/api/v1/user/user.ts
index acc3a55..c2173d1 100644
--- a/src/routes/api/v1/user/user.ts
+++ b/src/routes/api/v1/user/user.ts
@@ -43,7 +43,7 @@ async function get(req: Request, res: Response) {
 						});
 						res.status(200).json({ count, result });
 					} else {
-						res.status(404).json({ status: 'ERROR', errorcode: 'NOT_FOUND', message: 'Could not find specified object' });
+						res.status(404).json({ status: 'ERROR', errorcode: 'NOT_FOUND', message: 'Could not find specified user' });
 					}
 				})
 				.catch((err) => {
@@ -75,7 +75,7 @@ async function get(req: Request, res: Response) {
 						});
 						res.status(200).json({ count, result });
 					} else {
-						res.status(404).json({ status: 'ERROR', errorcode: 'NOT_FOUND', message: 'Could not find specified object' });
+						res.status(404).json({ status: 'ERROR', errorcode: 'NOT_FOUND', message: 'Could not find any users' });
 					}
 				})
 				.catch((err) => {
@@ -97,6 +97,7 @@ async function post(req: Request, res: Response) {
 			.create({
 				data: {
 					name: value.name,
+					email: value.email,
 					code: value.code === '0000' ? null : value.code
 				},
 				select: {
@@ -127,6 +128,7 @@ async function patch(req: Request, res: Response) {
 				},
 				data: {
 					name: value.name,
+					email: value.email,
 					code: value.code === '0000' ? null : value.code
 				},
 				select: {
diff --git a/src/routes/api/v1/user/user_schema.ts b/src/routes/api/v1/user/user_schema.ts
index 868a6b2..0d2b0dd 100644
--- a/src/routes/api/v1/user/user_schema.ts
+++ b/src/routes/api/v1/user/user_schema.ts
@@ -22,6 +22,7 @@ const schema_get = validator
 // MARK: CREATE user
 const schema_post = validator.object({
 	name: validator.string().min(1).max(32).required(),
+	email: validator.string().email().trim().required(),
 	code: validator.string().min(4).max(4).trim().regex(new RegExp(/^[0-9]+$/))
 });
 
@@ -30,9 +31,10 @@ const schema_patch = validator
 	.object({
 		id: validator.number().positive().precision(0).required(),
 		name: validator.string().min(1).max(32),
+		email: validator.string().email().trim(),
 		code: validator.string().min(4).max(4).trim().regex(new RegExp(/^[0-9]+$/))
 	})
-	.or('name', 'code');
+	.or('name', 'email', 'code');
 
 // MARK: DELETE user
 const schema_del = validator.object({