Update SuperUser domain model

src/domain/models/superuser.ts

@@ -6,6 +6,8 @@ export class SuperUser {
     public id: SuperUserId
     public firstName: string
     public lastName: string
+    public email: string
+    public isActive: boolean
     public avatarUrl: string
     public roles: Array<SuperUserRole>
 
@@ -14,13 +16,17 @@ export class SuperUser {
             id: SuperUserId,
             firstName: string,
             lastName: string,
+            email: string,
+            isActive: boolean,
             avatarUrl: string,
             roles: Array<SuperUserRole>,
         },
     ) {
         this.id = superUserProps.id
         this.firstName = superUserProps.firstName
         this.lastName = superUserProps.lastName
+        this.email = superUserProps.email
+        this.isActive = superUserProps.isActive
         this.avatarUrl = superUserProps.avatarUrl
         this.roles = superUserProps.roles
     }

src/domain/services/createSuperUser.ts

@@ -1,6 +1,7 @@
 import { SuperUserRole } from "src/domain/constants";
 import { SuperUserId } from "src/domain/valueObjects";
 import {
+    EmailValidator,
     SuperUserFirstNameValidator,
     SuperUserLastNameValidator,
 } from "src/domain/validators";
@@ -10,33 +11,40 @@ import { SuperUser } from "src/domain/models";
 export class CreateSuperUser {
     protected readonly firstNameValidator: SuperUserFirstNameValidator
     protected readonly lastNameValidator: SuperUserLastNameValidator
+    protected readonly emailValidator: EmailValidator
 
     constructor(
         createSuperUserProps: {
             firstNameValidator: SuperUserFirstNameValidator,
             lastNameValidator: SuperUserLastNameValidator,
+            emailValidator: EmailValidator,
         },
     ) {
         this.firstNameValidator = createSuperUserProps.firstNameValidator
         this.lastNameValidator = createSuperUserProps.lastNameValidator
+        this.emailValidator = createSuperUserProps.emailValidator
     }
 
     execute(
         createUserParams: {
             id: SuperUserId,
             firstName: string,
             lastName: string,
+            email: string,
             avatarUrl: string,
             roles: Array<SuperUserRole>,
         }
     ): SuperUser {
         this.firstNameValidator.validate(createUserParams.firstName)
         this.lastNameValidator.validate(createUserParams.lastName)
+        this.emailValidator.validate(createUserParams.email)
 
         return new SuperUser({
             id: createUserParams.id,
             firstName: createUserParams.firstName,
             lastName: createUserParams.lastName,
+            email: createUserParams.email,
+            isActive: true,
             avatarUrl: createUserParams.avatarUrl,
             roles: createUserParams.roles,
         })

src/domain/services/createUser.ts

@@ -1,7 +1,7 @@
 import { UserId } from "src/domain/valueObjects";
 import {
-    UserNameValidator,
     EmailValidator,
+    UserNameValidator,
     TelegramValidator,
 } from "src/domain/validators";
 import { User  } from "src/domain/models";

src/domain/validators/common.ts

@@ -0,0 +1,14 @@
+import { InvalidEmailError } from "src/domain/errors"
+
+
+const EMAIL_VALIDATION_PATTERN =
+    /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b/
+
+
+export class EmailValidator {
+    validate(value: string): void {
+        if (!EMAIL_VALIDATION_PATTERN.test(value)) {
+            throw new InvalidEmailError()
+        }
+    }
+}

src/domain/validators/index.ts

@@ -1,2 +1,3 @@
+export * from "./common";
 export * from "./user";
-export * from "./superUser"
+export * from "./superUser";

src/domain/validators/user.ts

@@ -1,16 +1,12 @@
 import {
     InvalidUserNameError,
-    InvalidEmailError,
     InvalidTelegramError
 } from "src/domain/errors"
 
 
 const USER_NAME_MIN_LENGTH = 5
 const USER_NAME_MAX_LENGTH = 64
 
-const EMAIL_VALIDATION_PATTERN =
-    /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b/
-
 const TELEGRAM_MIN_LENGTH = 5
 const TELEGRAM_MAX_LENGTH = 32
 const TELEGRAM_VALIDATION_PATTERN = /^[a-zA-Z0-9_]+$/
@@ -30,15 +26,6 @@ export class UserNameValidator {
 }
 
 
-export class EmailValidator {
-    validate(value: string): void {
-        if (!EMAIL_VALIDATION_PATTERN.test(value)) {
-            throw new InvalidEmailError()
-        }
-    }
-}
-
-
 export class TelegramValidator {
     validate(value: string): void {
         if (