From bd04d8f472b4136a0233a2d56f368392c2fe482f Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Thu, 28 May 2026 14:39:46 +0700
Subject: [PATCH] update

---
 src/controllers/user.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/controllers/user.ts b/src/controllers/user.ts
index 22b8d95..fa2768c 100644
--- a/src/controllers/user.ts
+++ b/src/controllers/user.ts
@@ -484,7 +484,7 @@ export class UserController {
 
 		try {
 			const schema = Joi.object().keys({
-				email: Joi.string().email().max(64).required().label("Email"),
+				email: Joi.string().email().max(64).optional().label("Email"),
 				username: Joi.string().max(64).required().label("Username"),
 				password: Joi.string().pattern(new RegExp("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$")).min(8).required().label("Password"),
 				retype_password: Joi.ref("password"),
@@ -502,13 +502,6 @@ export class UserController {
 			data.email = param.email;
 			data.status = param.status;
 
-			const email = await OrmHelper.DB.getRepository(User).findOne({
-				where: {
-					email: param.email,
-					deleted_at: IsNull()
-				}
-			});
-
 			const username = await OrmHelper.DB.getRepository(User).findOne({
 				where: {
 					username: param.username,
@@ -516,8 +509,17 @@ export class UserController {
 				}
 			});
 
-			if (email) {
-				throw { message: "Email already exists" };
+			if (!param.email) {
+				const email = await OrmHelper.DB.getRepository(User).findOne({
+					where: {
+						email: param.email,
+						deleted_at: IsNull()
+					}
+				});
+
+				if (email) {
+					throw { message: "Email already exists" };
+				}
 			}
 
 			if (username) {