From 8cd636d3d2dcf55afcc1b26478b756044ebc070c Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Fri, 12 Sep 2025 19:35:29 +0300
Subject: [PATCH] Fix Command cakephp5 tablelocator

---
 app/src/Command/JobCommand.php          |  3 +++
 app/src/Command/NotificationCommand.php | 10 +++++++++-
 app/src/Command/SetupCommand.php        |  3 +++
 app/src/Command/TestCommand.php         |  3 +++
 app/src/Command/UpgradeCommand.php      |  3 +++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/Command/JobCommand.php b/app/src/Command/JobCommand.php
index ee376b192..9a35fc611 100644
--- a/app/src/Command/JobCommand.php
+++ b/app/src/Command/JobCommand.php
@@ -38,9 +38,12 @@
 use Cake\Utility\Security;
 use App\Lib\Enum\JobStatusEnum;
 use App\Lib\Events\CoIdEventListener;
+use Cake\ORM\Locator\LocatorAwareTrait;
 
 class JobCommand extends BaseCommand
 {
+  use LocatorAwareTrait;
+
   /**
    * Register command specific options.
    *
diff --git a/app/src/Command/NotificationCommand.php b/app/src/Command/NotificationCommand.php
index 8f749130d..e3ee3ab96 100644
--- a/app/src/Command/NotificationCommand.php
+++ b/app/src/Command/NotificationCommand.php
@@ -33,9 +33,13 @@
 use Cake\Console\BaseCommand;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
+use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\TableRegistry;
 
 class NotificationCommand extends BaseCommand
 {
+  use LocatorAwareTrait;
+
   /**
    * Register command specific options.
    *
@@ -202,6 +206,10 @@ public function execute(Arguments $args, ConsoleIo $io)
     $io->out("- Recipient Person ID: " . $recipientPersonId);
     $io->out("- Recipient Group ID: " . $recipientGroupId);
 
+    $MessageTemplates = TableRegistry::getTableLocator()->get('MessageTemplates');
+    $template = $MessageTemplates->get($args->getOption('messageTemplateId'));
+
+
     $notificationIds = $Notifications->register(
       subjectPersonId:    $subjectPersonId,
       subjectGroupId:     $subjectGroupId,
@@ -210,7 +218,7 @@ public function execute(Arguments $args, ConsoleIo $io)
       recipientGroupId:   $recipientGroupId,
       action:             $args->getOption('action'),
       comment:            $args->getOption('comment'),
-      messageTemplateId:  (int)$args->getOption('messageTemplateId'),
+      messageTemplate:    $template,
       source:             $args->getOption('source'),
       mustResolve:        $args->getOption('mustResolve')
     );
diff --git a/app/src/Command/SetupCommand.php b/app/src/Command/SetupCommand.php
index 500647a80..ee6b2308d 100644
--- a/app/src/Command/SetupCommand.php
+++ b/app/src/Command/SetupCommand.php
@@ -36,9 +36,12 @@
 use Cake\Utility\Security;
 use App\Lib\Enum\PermissionEnum;
 use App\Lib\Enum\SuspendableStatusEnum;
+use Cake\ORM\Locator\LocatorAwareTrait;
 
 class SetupCommand extends BaseCommand
 {
+  use LocatorAwareTrait;
+
   /**
    * Register command specific options.
    *
diff --git a/app/src/Command/TestCommand.php b/app/src/Command/TestCommand.php
index 8661c13ff..748a5cf52 100644
--- a/app/src/Command/TestCommand.php
+++ b/app/src/Command/TestCommand.php
@@ -35,9 +35,12 @@
 use Cake\Console\ConsoleOptionParser;
 use Cake\Datasource\ConnectionManager;
 use \App\Lib\Util\DeliveryUtilities;
+use Cake\ORM\Locator\LocatorAwareTrait;
 
 class TestCommand extends BaseCommand
 {
+  use LocatorAwareTrait;
+
   protected $io = null;
 
   /**
diff --git a/app/src/Command/UpgradeCommand.php b/app/src/Command/UpgradeCommand.php
index 1026babc1..5541d713c 100644
--- a/app/src/Command/UpgradeCommand.php
+++ b/app/src/Command/UpgradeCommand.php
@@ -34,9 +34,12 @@
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Datasource\ConnectionManager;
+use Cake\ORM\Locator\LocatorAwareTrait;
 
 class UpgradeCommand extends BaseCommand
 {
+  use LocatorAwareTrait;
+
   protected $io = null;
 
   // A list of known versions, must be semantic versioning compliant. The value