Add new paramter in TermsVersionSignatureFactory

rich-id · Feb 27, 2024 · 374faa3 · 374faa3
1 parent 7e4a6e9
commit 374faa3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Domain/Factory/TermsVersionSignatureFactory.php b/src/Domain/Factory/TermsVersionSignatureFactory.php
@@ -30,13 +30,14 @@ public function __construct(SecurityInterface $security, TranslatorInterface $tr
         $this->termsGuardManager = $termsGuardManager;
     }
 
-    public function __invoke(TermsVersion $version, TermsSubjectInterface $subject): TermsVersionSignature
+    public function __invoke(TermsVersion $version, TermsSubjectInterface $subject, ?TermsUserInterface $signatory = null): TermsVersionSignature
     {
         $guard = $this->termsGuardManager->getGuardFor($version->getTerms()->getSlug() ?? '', $subject);
         $subjectName = $guard !== null ? $guard->getSubjectName($subject) : null;
         $subjectName = $subjectName ?? $this->translator->trans('terms_module.pdf_signature.subject_not_found', [], 'terms_module');
 
         $user = $this->security->getUser();
+        $signatory = $signatory ?? $user;
 
         $entity = new TermsVersionSignature();
 
@@ -50,9 +51,9 @@ public function __invoke(TermsVersion $version, TermsSubjectInterface $subject):
             $entity->setSignedBy($user->getUsername());
         }
 
-        if ($user instanceof TermsUserInterface) {
-            $entity->setSignedByName($user->getTermsDisplayName());
-            $entity->setSignedByNameForSort($user->getTermsDisplayNameForSort());
+        if ($signatory instanceof TermsUserInterface) {
+            $entity->setSignedByName($signatory->getTermsDisplayName());
+            $entity->setSignedByNameForSort($signatory->getTermsDisplayNameForSort());
         }
 
         return $entity;

diff --git a/src/Domain/UseCase/SignTerms.php b/src/Domain/UseCase/SignTerms.php
@@ -5,6 +5,7 @@
 namespace RichId\TermsModuleBundle\Domain\UseCase;
 
 use RichId\TermsModuleBundle\Domain\Entity\TermsSubjectInterface;
+use RichId\TermsModuleBundle\Domain\Entity\TermsUserInterface;
 use RichId\TermsModuleBundle\Domain\Event\TermsSignedEvent;
 use RichId\TermsModuleBundle\Domain\Factory\TermsVersionSignatureFactory;
 use RichId\TermsModuleBundle\Domain\Fetcher\GetTermsVersionToSign;
@@ -44,12 +45,12 @@ public function __construct(
         $this->getTermsVersionToSign = $getTermsVersionToSign;
     }
 
-    public function __invoke(string $termsSlug, TermsSubjectInterface $subject, ?bool $accepted): Response
+    public function __invoke(string $termsSlug, TermsSubjectInterface $subject, ?bool $accepted, ?TermsUserInterface $signatory = null): Response
     {
         $lastVersion = ($this->getTermsVersionToSign)($termsSlug, $subject);
 
         if ($accepted === true) {
-            $signature = ($this->termsVersionSignatureFactory)($lastVersion, $subject);
+            $signature = ($this->termsVersionSignatureFactory)($lastVersion, $subject, $signatory);
             $this->entityRecoder->saveSignature($signature);
         }