OV-3: * solve merge conficts

BinaryStudioAcademy · Aug 24, 2024 · 3a962ad · 3a962ad
1 parent bef91bb
commit 3a962ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/backend/src/migrations/20240820093010_add_name_field_to_users_table.ts b/backend/src/migrations/20240820093010_add_name_field_to_users_table.ts
@@ -4,13 +4,13 @@ const TABLE_NAME = 'users';
 
 async function up(knex: Knex): Promise<void> {
     await knex.schema.table(TABLE_NAME, (table) => {
-        table.string('full_name').notNullable();
+        table.string('name').notNullable();
     });
 }
 
 async function down(knex: Knex): Promise<void> {
     await knex.schema.table(TABLE_NAME, (table) => {
-        table.dropColumn('full_name');
+        table.dropColumn('name');
     });
 }
 

diff --git a/shared/src/bundles/users/enums/user-validation-message.enum.ts b/shared/src/bundles/users/enums/user-validation-message.enum.ts
@@ -9,7 +9,6 @@ const UserValidationMessage = {
     WRONG_CREDENTIALS: 'Email or password are incorrect',
     USER_IS_NOT_AVAILABLE:
         'User with this email already exists. Log in if it is you',
-    FULL_NAME_INVALID: 'Name must have at least two words',
 } as const;
 
 export { UserValidationMessage };
diff --git a/shared/src/bundles/users/validation-schemas/user-sign-up.validation-schema.ts b/shared/src/bundles/users/validation-schemas/user-sign-up.validation-schema.ts
@@ -49,13 +49,6 @@ const userSignUp = z
     .refine((data) => data.password === data.confirmPassword, {
         message: UserValidationMessage.PASS_DONT_MATCH,
         path: ['confirmPassword'],
-    })
-    .refine(
-        (data) => data.name.split(/\s+/).length >= 2,
-        {
-            message: UserValidationMessage.FULL_NAME_INVALID,
-            path: ['name'],
-        }
-    );
+    });
 
 export { userSignUp };