[new_profile/sex] Remove strtolower() and force uppercase (#8633)

The keys in the new_profile module were lower case which forces the Sex library class to use a strtolower() function to validate the value and then submits the lowercase value in the SQL insert statement where SQL implicitly converts it to uppercase. This workflow is very risky as different versions of SQL or different databases may not recognise the lowercase and uppercase as the same word and treat it as a truncation. This is also simply bad practice and unnecessary here.
aces · May 2, 2023 · 577e3a7 · 577e3a7
1 parent 4c58152
commit 577e3a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/modules/new_profile/php/new_profile.class.inc b/modules/new_profile/php/new_profile.class.inc
@@ -142,9 +142,9 @@ class New_Profile extends \NDB_Form
         $dobFormat = $config->getSetting('dobFormat');
         $edc       = $config->getSetting('useEDC');
         $sex       = [
-            'male'   => 'Male',
-            'female' => 'Female',
-            'other'  => 'Other',
+            'Male'   => 'Male',
+            'Female' => 'Female',
+            'Other'  => 'Other',
         ];
         $pscidSet  = "false";
         $minYear   = (isset($startYear, $ageMax)) ? $startYear - $ageMax : null;

diff --git a/modules/new_profile/test/new_profileTest.php b/modules/new_profile/test/new_profileTest.php
@@ -77,7 +77,7 @@ function testNewProfileCreateCandidate(): void
         // send a key to sex
         $sexElement = $this->safeFindElement(WebDriverBy::Name('sex'));
         $sexOption  = new WebDriverSelect($sexElement);
-        $sexOption->selectByValue("male");
+        $sexOption->selectByValue("Male");
         $sexElement = $this->safeFindElement(WebDriverBy::Name('site'));
         $sexOption  = new WebDriverSelect($sexElement);
         $sexOption->selectByValue("1");

diff --git a/src/StudyEntities/Candidate/Sex.php b/src/StudyEntities/Candidate/Sex.php
@@ -29,9 +29,9 @@ class Sex implements \JsonSerializable
     public $value;
 
     private const VALID_VALUES = array(
-                                  'male',
-                                  'female',
-                                  'other',
+                                  'Male',
+                                  'Female',
+                                  'Other',
                                  );
 
     /**
@@ -61,7 +61,7 @@ public function __construct(string $value)
      */
     public static function validate(string $value): bool
     {
-        return in_array(strtolower($value), self::VALID_VALUES, true);
+        return in_array($value, self::VALID_VALUES, true);
     }
 
     /**