From 2d9831ed85a0b115f9d0f56caeab749e35073801 Mon Sep 17 00:00:00 2001
From: Jose Andres Tejerina <andres.tejerina@exomindset.co>
Date: Thu, 23 Oct 2025 17:49:02 -0300
Subject: [PATCH 1/3] feat: add first_name and last_name into OtlpStrategy

---
 app/Audit/AuditLogOtlpStrategy.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Audit/AuditLogOtlpStrategy.php b/app/Audit/AuditLogOtlpStrategy.php
index 87fdb5151..b4d9fa713 100644
--- a/app/Audit/AuditLogOtlpStrategy.php
+++ b/app/Audit/AuditLogOtlpStrategy.php
@@ -63,6 +63,10 @@ public function audit($subject, array $change_set, string $event_type): void
             $user_id = $resource_server_ctx->getCurrentUserId();
             $user_email = $resource_server_ctx->getCurrentUserEmail();
 
+            $user = $resource_server_ctx->getCurrentUser(false, false);
+            $user_first_name = $user ? $user->getFirstName() : null;
+            $user_last_name = $user ? $user->getLastName() : null;
+            
             $formatter = null;
             switch ($event_type) {
                 case self::EVENT_COLLECTION_UPDATE:
@@ -94,7 +98,7 @@ public function audit($subject, array $change_set, string $event_type): void
                 $description = $formatter->format($subject, $change_set);
             }
 
-            $auditData = $this->buildAuditLogData($entity, $subject, $change_set, $event_type, $user_id, $user_email);
+            $auditData = $this->buildAuditLogData($entity, $subject, $change_set, $event_type, $user_id, $user_email, $user_first_name, $user_last_name);
             if (!empty($description)) {
                 $auditData['audit.description'] = $description;
             }
@@ -128,7 +132,7 @@ private function resolveAuditableEntity($subject)
         return null;
     }
 
-    private function buildAuditLogData($entity, $subject, array $change_set, string $event_type, ?string $user_id, ?string $user_email): array
+    private function buildAuditLogData($entity, $subject, array $change_set, string $event_type, ?string $user_id, ?string $user_email, ?string $user_first_name, ?string $user_last_name): array
     {
         $auditData = [
             'audit.action' => $this->mapEventTypeToAction($event_type),
@@ -139,6 +143,8 @@ private function buildAuditLogData($entity, $subject, array $change_set, string
             'audit.event_type' => $event_type,
             'auth.user.id' => $user_id ?? 'unknown',
             'auth.user.email' => $user_email ?? 'unknown',
+            'auth.user.first_name' => $user_first_name ?? 'unknown',
+            'auth.user.last_name' => $user_last_name ?? 'unknown',
             'elasticsearch.index' => $this->elasticIndex,
         ];
 

From 4ae663fefac4ab57326d7d745dea1114559ff21c Mon Sep 17 00:00:00 2001
From: Jose Andres Tejerina <andres.tejerina@exomindset.co>
Date: Thu, 23 Oct 2025 18:14:22 -0300
Subject: [PATCH 2/3] chore: change method for get first_name and last_name
 into OtlpStrategy

---
 app/Audit/AuditLogOtlpStrategy.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Audit/AuditLogOtlpStrategy.php b/app/Audit/AuditLogOtlpStrategy.php
index b4d9fa713..5e83982a9 100644
--- a/app/Audit/AuditLogOtlpStrategy.php
+++ b/app/Audit/AuditLogOtlpStrategy.php
@@ -62,11 +62,9 @@ public function audit($subject, array $change_set, string $event_type): void
             $resource_server_ctx = App::make(\models\oauth2\IResourceServerContext::class);
             $user_id = $resource_server_ctx->getCurrentUserId();
             $user_email = $resource_server_ctx->getCurrentUserEmail();
+            $user_first_name = $resource_server_ctx->getCurrentUserFirstName();
+            $user_last_name = $resource_server_ctx->getCurrentUserLastName();
 
-            $user = $resource_server_ctx->getCurrentUser(false, false);
-            $user_first_name = $user ? $user->getFirstName() : null;
-            $user_last_name = $user ? $user->getLastName() : null;
-            
             $formatter = null;
             switch ($event_type) {
                 case self::EVENT_COLLECTION_UPDATE:

From 8eb23e88a9154daf1283b68ac94dd2c3b72f4419 Mon Sep 17 00:00:00 2001
From: Jose Andres Tejerina <andres.tejerina@exomindset.co>
Date: Fri, 24 Oct 2025 11:31:42 -0300
Subject: [PATCH 3/3] chore: change method for get first_name and last_name
 into OtlpStrategy

---
 app/Audit/AuditLogOtlpStrategy.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Audit/AuditLogOtlpStrategy.php b/app/Audit/AuditLogOtlpStrategy.php
index 5e83982a9..dda4a662c 100644
--- a/app/Audit/AuditLogOtlpStrategy.php
+++ b/app/Audit/AuditLogOtlpStrategy.php
@@ -60,10 +60,12 @@ public function audit($subject, array $change_set, string $event_type): void
             }
 
             $resource_server_ctx = App::make(\models\oauth2\IResourceServerContext::class);
-            $user_id = $resource_server_ctx->getCurrentUserId();
-            $user_email = $resource_server_ctx->getCurrentUserEmail();
-            $user_first_name = $resource_server_ctx->getCurrentUserFirstName();
-            $user_last_name = $resource_server_ctx->getCurrentUserLastName();
+            $user = $resource_server_ctx->getCurrentUser(false, false);
+
+            $user_id = $user ? $user->getId() : null;
+            $user_email = $user ? $user->getEmail() : null;
+            $user_first_name = $user ? $user->getFirstName() : null;
+            $user_last_name = $user ? $user->getLastName() : null;
 
             $formatter = null;
             switch ($event_type) {