Move common code from request handlers to service

1 files changed, 2 insertions, 13 deletions

diff --git a/app/Http/RequestHandlers/AddSpouseToIndividualPage.php b/app/Http/RequestHandlers/AddSpouseToIndividualPage.php
index 9071a5968a..b2f3f6b4e6 100644
--- a/app/Http/RequestHandlers/AddSpouseToIndividualPage.php
+++ b/app/Http/RequestHandlers/AddSpouseToIndividualPage.php
@@ -81,30 +81,19 @@ class AddSpouseToIndividualPage implements RequestHandlerInterface
         // Create a dummy individual, so that we can create new/empty facts.
         $sex     = self::OPPOSITE_SEX[$individual->sex()];
         $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'));
         $names             = $surname_tradition->newSpouseNames($individual, $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,
+                ...$this->gedcom_edit_service->newIndividualFacts($tree, $sex, $names),
             ],
+            'f' => $this->gedcom_edit_service->newFamilyFacts($tree),
         ];
 
         $titles = [