Census assistant - for females get correct married name when there is more than one marriage (#3601)

1 files changed, 32 insertions, 0 deletions

diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php
index c88b6c3e81..d01b80cf98 100644
--- a/app/Census/AbstractCensusColumn.php
+++ b/app/Census/AbstractCensusColumn.php
@@ -120,6 +120,38 @@ class AbstractCensusColumn
     }
 
     /**
+     * What was an individual's likely name on a given date, allowing
+     * for marriages and married names.
+     *
+     * @param Individual $individual
+     *
+     * @return string[]
+     */
+    protected function nameAtCensusDate(Individual $individual): array
+    {
+        $names  = $individual->getAllNames();
+        $name   = $names[0];
+        $family = $this->spouseFamily($individual);
+
+        if ($family instanceof Family) {
+            foreach ($family->facts(['MARR']) as $marriage) {
+                if ($marriage->date()->isOK()) {
+                    $spouse = $family->spouse($individual);
+                    foreach ($names as $individual_name) {
+                        foreach ($spouse->getAllNames() as $spouse_name) {
+                            if ($individual_name['type'] === '_MARNM' && $individual_name['surn'] === $spouse_name['surn']) {
+                                return $individual_name;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $name;
+    }
+
+    /**
      * When did this census occur
      *
      * @return Date