From 97fd90edae033b9995a3fc4373fe1aa4141abb14 Mon Sep 17 00:00:00 2001
From: fdai7207 <haytham.daoula@informatik.hs-fulda.de>
Date: Fri, 10 Feb 2023 03:34:57 +0100
Subject: [PATCH] refactoring: removed redundancy in the isValidAdress()
 function.

---
 src/createEmployeeAccount.c | 15 +++------------
 src/createEmployeeAccount.h |  2 ++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/createEmployeeAccount.c b/src/createEmployeeAccount.c
index 39f2bac..edd9262 100644
--- a/src/createEmployeeAccount.c
+++ b/src/createEmployeeAccount.c
@@ -82,18 +82,15 @@ bool isValidPhoneNumber(char *phoneNumber)
 
 bool isValidAdress(char *street,char* city,int houseNumber,int postalCode)
 {
-    int lengthMax = 20;
-    int LengthMin = 3;
     bool validStreet = true;
     bool validHouseNumber = true;
     bool validCity = true;
     bool validpostalCode = true;
-    if(strlen(street)>lengthMax || strlen(street)<LengthMin)
+    if(strlen(street)>maximalAdressLength || strlen(street)<minimalAdressLength)
     {
         validStreet = false;
     }
-
-    if(strlen(city)>lengthMax || strlen(city)<LengthMin)
+    if(strlen(city)>maximalAdressLength || strlen(city)<minimalAdressLength)
     {
         validCity = false;
     }
@@ -105,13 +102,7 @@ bool isValidAdress(char *street,char* city,int houseNumber,int postalCode)
     {
         validpostalCode = false;
     }
-    if(validStreet==true && validCity==true && validHouseNumber==true && validpostalCode==true)
-    {
-        return true;
-    }
-    {
-        return false;
-    }
+    return (validStreet && validCity && validHouseNumber && validpostalCode);
 }
 
 int StringLengthCounter(char* string)
diff --git a/src/createEmployeeAccount.h b/src/createEmployeeAccount.h
index f781fa6..5b9b6fe 100644
--- a/src/createEmployeeAccount.h
+++ b/src/createEmployeeAccount.h
@@ -11,6 +11,8 @@
 #define minimumNameLength  4
 #define maxLength  21
 #define validNumberLength  14
+#define maximalAdressLength  20
+#define minimalAdressLength  3
 
 struct employeesInformations
 {