From 47e0b585dae15f66070431637510744c47022c1c Mon Sep 17 00:00:00 2001
From: Oleksandra <mremarka314@gmail.com>
Date: Sat, 2 Dec 2023 02:09:27 +0200
Subject: [PATCH 1/5] import pattern constants

---
 .../components/signup/signup-form/SignUpFormContent.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
index e009da983..98433827e 100644
--- a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
+++ b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
@@ -7,6 +7,8 @@ import EyeInvisible from '../../../../authorization/EyeInvisible';
 import EyeVisible from '../../../../authorization/EyeVisible';
 import styles from './SignUpFormContent.module.css';
 
+import { EMAIL_PATTERN, PASSWORD_PATTERN } from '../../../../../constants/constants';
+
 export function SignUpFormContentComponent(props) {
   const [showPassword, setShowPassword] = useState(false);
   const [showConfirmPassword, setShowConfirmPassword] = useState(false);
@@ -27,10 +29,6 @@ export function SignUpFormContentComponent(props) {
     confirmPassword: 'Паролі не збігаються',
   };
 
-  const emailPattern = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
-
-  const passwordPattern = /^(?=.*[0-9])(?=.*[a-zA-Z])[a-zA-Z0-9]{8,20}$/;
-
   const {
     register,
     handleSubmit,
@@ -127,7 +125,7 @@ export function SignUpFormContentComponent(props) {
                 {...register('email', {
                   required: errorMessageTemplates.required,
                   pattern: {
-                    value: emailPattern,
+                    value: EMAIL_PATTERN,
                     message: errorMessageTemplates.email,
                   },
                 })}
@@ -182,7 +180,7 @@ export function SignUpFormContentComponent(props) {
                 {...register('password', {
                   required: errorMessageTemplates.required,
                   pattern: {
-                    value: passwordPattern,
+                    value: PASSWORD_PATTERN,
                     message: errorMessageTemplates.password,
                   },
                 })}

From 0df03da9679db2d4017d88d154921de95aaf1048 Mon Sep 17 00:00:00 2001
From: Oleksandra <mremarka314@gmail.com>
Date: Sat, 2 Dec 2023 02:52:01 +0200
Subject: [PATCH 2/5] remove one checkbox restriction

---
 .../signup/signup-form/SignUpFormContent.js   | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
index 98433827e..ba7504be7 100644
--- a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
+++ b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
@@ -3,6 +3,7 @@ import { useForm } from 'react-hook-form';
 import { useNavigate  } from 'react-router-dom';
 
 import axios from 'axios';
+
 import EyeInvisible from '../../../../authorization/EyeInvisible';
 import EyeVisible from '../../../../authorization/EyeVisible';
 import styles from './SignUpFormContent.module.css';
@@ -40,34 +41,15 @@ export function SignUpFormContentComponent(props) {
     mode: 'all',
   });
 
-  const [isChecked, setIsChecked] = useState({
-    startup: false,
-    company: false,
-  });
-
-  const onChangeCheckbox = (event) => {
-    if (event.target.name === 'startup') {
-      setIsChecked({
-        startup: true,
-        company: false,
-      });
-    } else if (event.target.name === 'company') {
-      setIsChecked({
-        startup: false,
-        company: true,
-      });
-    }
-  };
-
   const { setIsValid } = props;
 
   useEffect(() => {
-    const companyOrStartup = isChecked.company || isChecked.startup;
-    const formIsValid = companyOrStartup && isValid;
-    setIsValid(formIsValid);
-  }, [isValid, setIsValid, isChecked.company, isChecked.startup]);
+    setIsValid(isValid);
+  }, [isValid, setIsValid]);
+
 
   const onSubmit = () => {
+
     const dataToSend = {
       email: getValues('email'),
       password: getValues('password'),
@@ -76,11 +58,11 @@ export function SignUpFormContentComponent(props) {
       surname: getValues('surname'),
       company: {
         name: getValues('companyName'),
-        is_registered: isChecked.company,
-        is_startup: isChecked.startup,
+        is_registered: (getValues('representative').indexOf('company') > -1),
+        is_startup: (getValues('representative').indexOf('startup') > -1),
       },
     };
-
+    console.log(dataToSend);
     axios({
       method: 'post',
       url: `${process.env.REACT_APP_BASE_API_URL}/api/auth/users/`,
@@ -299,8 +281,10 @@ export function SignUpFormContentComponent(props) {
                       <input
                         type="checkbox"
                         name="company"
-                        onChange={onChangeCheckbox}
-                        checked={isChecked.company}
+                        value={'company'}
+                        {...register('representative', {
+                          required: errorMessageTemplates.required
+                        })}
                       />
                     </div>
                     <label className={styles['representative__label']}>
@@ -316,8 +300,10 @@ export function SignUpFormContentComponent(props) {
                       <input
                         type="checkbox"
                         name="startup"
-                        onChange={onChangeCheckbox}
-                        checked={isChecked.startup}
+                        value={'startup'}
+                        {...register('representative', {
+                          required: errorMessageTemplates.required
+                        })}
                       />
                     </div>
                     <label className={styles['representative__label']}>
@@ -327,6 +313,9 @@ export function SignUpFormContentComponent(props) {
                 </div>
               </div>
             </div>
+            <div className={styles['signup-form__error']}>
+              {errors.representative && errors.representative.message}
+            </div>
           </div>
           <div className={styles['signup-form__checkboxes-container--rules']}>
             <div className={styles['rules__container']}>

From db3d342a7270eb65ab165f5b44467e3df5d89965 Mon Sep 17 00:00:00 2001
From: Oleksandra <mremarka314@gmail.com>
Date: Sat, 2 Dec 2023 02:59:40 +0200
Subject: [PATCH 3/5] adjust logic: both options allowed

---
 authentication/serializers.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/authentication/serializers.py b/authentication/serializers.py
index c656c5ad2..9e518b73f 100644
--- a/authentication/serializers.py
+++ b/authentication/serializers.py
@@ -58,10 +58,6 @@ def validate(self, value):
             custom_errors["comp_status"].append(
                 "Please choose who you represent."
             )
-        elif is_registered and is_startup:
-            custom_errors["comp_status"].append(
-                "Please choose either registered or startup."
-            )
         try:
             validate_password_long(password)
         except ValidationError as error:

From 44935edebff7e1f215ef97e542af62e5912927e5 Mon Sep 17 00:00:00 2001
From: Oleksandra <mremarka314@gmail.com>
Date: Sat, 2 Dec 2023 03:00:14 +0200
Subject: [PATCH 4/5] adjust test for both options chosen

---
 authentication/tests/test_user_registration.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/authentication/tests/test_user_registration.py b/authentication/tests/test_user_registration.py
index cfaf72bdc..9493baaed 100644
--- a/authentication/tests/test_user_registration.py
+++ b/authentication/tests/test_user_registration.py
@@ -154,8 +154,11 @@ def test_register_user_who_represent_both_chosen(self):
             },
             format="json",
         )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(
-            {"comp_status": ["Please choose either registered or startup."]},
+            {
+                "name": "Jane",
+                "surname": "Smith",
+            },
             response.json(),
         )

From 75a6f5b8de3b8acf5a21859725d0e8a574173cc7 Mon Sep 17 00:00:00 2001
From: Oleksandra <mremarka314@gmail.com>
Date: Sat, 2 Dec 2023 03:07:52 +0200
Subject: [PATCH 5/5] remove redundant console log

---
 .../SignUp/components/signup/signup-form/SignUpFormContent.js    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
index ba7504be7..c2e66cbce 100644
--- a/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
+++ b/FrontEnd/src/components/SignUp/components/signup/signup-form/SignUpFormContent.js
@@ -62,7 +62,6 @@ export function SignUpFormContentComponent(props) {
         is_startup: (getValues('representative').indexOf('startup') > -1),
       },
     };
-    console.log(dataToSend);
     axios({
       method: 'post',
       url: `${process.env.REACT_APP_BASE_API_URL}/api/auth/users/`,