apps/backend/src/drizzle/schema/users.ts

@@ -17,7 +17,7 @@ export const users = pgTable("users", {
 		.$defaultFn(() => createId()),
 	name: varchar("name", { length: 255 }).notNull(),
 	username: varchar("username").notNull().unique(),
-	email: varchar("email"),
+	email: varchar("email").notNull().unique(),
 	password: text("password").notNull(),
 	isEnabled: boolean("isEnabled").default(true),
 	resetPasswordToken: varchar("resetPasswordToken"),

apps/backend/src/routes/users/route.ts

@@ -18,7 +18,7 @@ import { forbidden, notFound } from "../../errors/DashboardError";
 export const userFormSchema = z.object({
 	name: z.string().min(1, "Name is required").max(255),
 	username: z.string().min(1, "Username is required").max(255),
-	email: z.string().min(1, "Email is required").email().optional().or(z.literal("")),
+	email: z.string().min(1, "Email is required").max(255),
 	password: z.string().min(6, "Password is required"),
 	companyName: z.string().min(1, "Company name is required").max(255),
     position: z.string().min(1, "Position is required").max(255),

apps/frontend/src/modules/usersManagement/modals/UserFormModal.tsx

@@ -80,7 +80,7 @@ export default function UserFormModal() {
 
 		form.setValues({
 			id: data.id,
-			email: data.email ?? "",
+			email: data.email,
 			name: data.name,			
 			photoProfileUrl: "",
 			username: data.username,
@@ -140,7 +140,7 @@ export default function UserFormModal() {
 					roles: values.roles,
 					isEnabled: "true",
 					username: values.username,
-					companyName: values.email,
+					companyName: values.companyName,
 					position: values.position,
 					workExperience: values.workExperience,
 					address: values.address,