Move common code from request handlers to service

1 files changed, 2 insertions, 21 deletions

diff --git a/app/Http/RequestHandlers/AddSpouseToFamilyPage.php b/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
index 2deb324905..f1ba17b0ad 100644
--- a/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
+++ b/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
@@ -75,34 +75,15 @@ class AddSpouseToFamilyPage implements RequestHandlerInterface
         $family = Registry::familyFactory()->make($xref, $tree);
         $family = Auth::checkFamilyAccess($family, true);
 
-        // Create a dummy individual, so that we can create new/empty facts.
-        $dummyi = Registry::individualFactory()->new('', '0 @@ INDI', null, $tree);
-        $dummyf = Registry::familyFactory()->new('', '0 @@ FAM', null, $tree);
-
         // Name facts.
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $spouse            = $family->spouses()->first();
         assert($spouse instanceof Individual);
         $names      = $surname_tradition->newSpouseNames($spouse, $sex);
-        $name_facts = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
-
-        // Individual facts and events.
-        $quick_facts = explode(',', $tree->getPreference('QUICK_REQUIRED_FACTS'));
-        $indi_facts  = array_map(static fn (string $fact): Fact => new Fact('1 ' . $fact, $dummyi, ''), $quick_facts);
-
-        // Family facts and events.
-        $quick_facts = explode(',', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'));
-        $fam_facts   = array_map(static fn (string $fact): Fact => new Fact('1 ' . $fact, $dummyf, ''), $quick_facts);
 
         $facts = [
-            'i' => [
-                new Fact('1 SEX ' . $sex, $dummyi, ''),
-                ...$name_facts,
-                ...$indi_facts,
-            ],
-            'f' => [
-                ...$fam_facts,
-            ],
+            'i' => $this->gedcom_edit_service->newIndividualFacts($tree, $sex, $names),
+            'f' => $this->gedcom_edit_service->newFamilyFacts($tree),
         ];
 
         if ($sex === 'F') {