Improved code on model Person

MGeurts · Jul 31, 2024 · 797e0b0 · 797e0b0
1 parent b523e1d
commit 797e0b0
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/app/Models/Person.php b/app/Models/Person.php
@@ -161,8 +161,6 @@ protected function getNameAttribute(): ?string
 
     protected function getAgeAttribute(): ?int
     {
-        $age = null;
-
         if ($this->dob) {
             if ($this->dod) {
                 // deceased based on dob & dod
@@ -185,9 +183,11 @@ protected function getAgeAttribute(): ?int
                 // living
                 $age = Carbon::now()->format('Y') - $this->yob;
             }
+        } else {
+            $age = null;
         }
 
-        return $age >= 0 ? $age : null;
+        return $age > 0 ? $age : null;
     }
 
     protected function getNextBirthdayAttribute(): ?Carbon
@@ -214,8 +214,6 @@ protected function getNextBirthdayRemainingDaysAttribute(): ?int
 
     protected function getLifetimeAttribute(): ?string
     {
-        $lifetime = null;
-
         if ($this->dob) {
             if ($this->dod) {
                 // deceased based on dob & dod
@@ -238,6 +236,8 @@ protected function getLifetimeAttribute(): ?string
                 // living
                 $lifetime = strval($this->yob);
             }
+        } else {
+            $lifetime = null;
         }
 
         return $lifetime; //returns YEAR(dob) - YEAR(dod)
@@ -276,10 +276,10 @@ protected function getBirthFormattedAttribute(): ?string
         } elseif ($this->yob) {
             $dob = $this->yob;
         } else {
-            $dob = '??';
+            $dob = null;
         }
 
-        return strval($dob);
+        return $dob ? strval($dob) : $dob;
     }
 
     protected function getDeathFormattedAttribute(): ?string
@@ -289,10 +289,10 @@ protected function getDeathFormattedAttribute(): ?string
         } elseif ($this->yod) {
             $dod = $this->yod;
         } else {
-            $dod = '??';
+            $dod = null;
         }
 
-        return strval($dod);
+        return  $dod ? strval($dod) : $dod;
     }
 
     protected function getAddressAttribute(): ?string