[pkp-lib][main] #10357 Allow null contextId for emailTemplate Repository (#10358)

* #10357 Repository changes to allow null in the contextId

* #10357 Specific fix for ValidateRegisteredEmail

Author: defstat

Diff for: classes/emailTemplate/Collector.php

@@ -32,7 +32,7 @@ class Collector implements CollectorInterface
      * default.
      */
     public ?bool $isModified = null;
-    public int $contextId;
+    public ?int $contextId;
     public ?array $keys = null;
     public ?string $searchPhrase = null;
     public ?int $count = null;
@@ -41,7 +41,7 @@ class Collector implements CollectorInterface
 
     public const EMAIL_TEMPLATE_STAGE_DEFAULT = 0;
 
-    public function __construct(DAO $dao, int $contextId)
+    public function __construct(DAO $dao, ?int $contextId)
     {
         $this->dao = $dao;
         $this->contextId = $contextId;
@@ -162,16 +162,19 @@ protected function getDefaultQueryBuilder(): Builder
         $q = DB::table('email_templates_default_data as etddata')
             ->select('email_key')
             ->selectRaw('NULL as email_id')
-            ->selectRaw($this->contextId . ' as context_id')
-            ->selectRaw('NULL as alternate_to')
-
-            ->whereNotIn('etddata.email_key', function (Builder $q) {
-                $q->select('et.email_key')
-                    ->from('email_templates as et')
-                    ->where('et.context_id', $this->contextId);
-            })
-
-            ->when(!is_null($this->keys), function (Builder $q) {
+            ->selectRaw($this->contextId !== null ? $this->contextId . ' as context_id' : 'NULL as context_id')
+            ->selectRaw('NULL as alternate_to');
+
+            // Handle case when contextId is provided
+            if ($this->contextId !== null) {
+                $q->whereNotIn('etddata.email_key', function (Builder $q) {
+                    $q->select('et.email_key')
+                        ->from('email_templates as et')
+                        ->where('et.context_id', $this->contextId);
+                });
+            }
+
+            $q->when(!is_null($this->keys), function (Builder $q) {
                 return $q->whereIn('email_key', $this->keys);
             })
 

Diff for: classes/emailTemplate/DAO.php

@@ -130,7 +130,7 @@ public function getMany(Collector $query): LazyCollection
     /**
      * Get a single email template that matches the given key
      */
-    public function getByKey(int $contextId, string $key): ?EmailTemplate
+    public function getByKey(?int $contextId = null, string $key): ?EmailTemplate
     {
         $results = Repo::emailTemplate()->getCollector($contextId)
             ->filterByKeys([$key])

Diff for: classes/emailTemplate/Repository.php

@@ -50,13 +50,13 @@ public function newDataObject(array $params = []): Emailtemplate
     }
 
     /** @copydoc DAO::getByKey() */
-    public function getByKey(int $contextId, string $key): ?EmailTemplate
+    public function getByKey(?int $contextId = null, string $key): ?EmailTemplate
     {
         return $this->dao->getByKey($contextId, $key);
     }
 
     /** @copydoc DAO::getCollector() */
-    public function getCollector(int $contextId): Collector
+    public function getCollector(?int $contextId = null): Collector
     {
         return app(Collector::class, ['contextId' => $contextId]);
     }

Diff for: classes/observers/listeners/ValidateRegisteredEmail.php

@@ -16,6 +16,7 @@
 
 namespace PKP\observers\listeners;
 
+use APP\core\Application;
 use APP\facades\Repo;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\Facades\Mail;
@@ -70,7 +71,7 @@ protected function manageEmail($event): void
             return;
         }
 
-        $contextId = null;
+        $contextId = Application::SITE_CONTEXT_ID;
 
         // Create and compile email template
         if (get_class($event) === UserRegisteredContext::class) {