Revert "chore/refactor to strategy formatters (#468)"

This reverts commit 7e817d7.

Author: andrestejerina97

app/Audit/AbstractAuditLogFormatter.php

@@ -24,22 +24,5 @@ final public function setContext(AuditContext $ctx): void
         $this->ctx = $ctx;
     }
 
-    protected function getUserInfo(): string
-    {
-        if (!$this->ctx) {
-            return 'Unknown (unknown)';
-        }
-
-        $user_name = 'Unknown';
-        if ($this->ctx->userFirstName || $this->ctx->userLastName) {
-            $user_name = trim(sprintf("%s %s", $this->ctx->userFirstName ?? '', $this->ctx->userLastName ?? '')) ?: 'Unknown';
-        } elseif ($this->ctx->userEmail) {
-            $user_name = $this->ctx->userEmail;
-        }
-        
-        $user_id = $this->ctx->userId ?? 'unknown';
-        return sprintf("%s (%s)", $user_name, $user_id);
-    }
-
     abstract public function format($subject, array $change_set): ?string;
 }

app/Audit/AuditContext.php

@@ -21,7 +21,6 @@ public function __construct(
         public ?string $uiApp = null,
         public ?string $uiFlow = null,
         public ?string $route = null,
-        public ?string $rawRoute = null,
         public ?string $httpMethod = null,
         public ?string $clientIp = null,
         public ?string $userAgent = null,

app/Audit/AuditEventListener.php

@@ -16,19 +16,17 @@
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Route;
 
 /**
  * Class AuditEventListener
  * @package App\Audit
  */
 class AuditEventListener
 {
-    private const ROUTE_METHOD_SEPARATOR = '|';
 
     public function onFlush(OnFlushEventArgs $eventArgs): void
     {
-        if (app()->environment('testing')) {
+        if (app()->environment('testing')){
             return;
         }
         $em = $eventArgs->getObjectManager();
@@ -69,7 +67,7 @@ public function onFlush(OnFlushEventArgs $eventArgs): void
     /**
      * Get the appropriate audit strategy based on environment configuration
      */
-    private function getAuditStrategy($em): ?IAuditStrategy
+    private function getAuditStrategy($em)
     {
         // Check if OTLP audit is enabled
         if (config('opentelemetry.enabled', false)) {
@@ -99,11 +97,7 @@ private function buildAuditContext(): AuditContext
         //$ui = app()->bound('ui.context') ? app('ui.context') : [];
 
         $req = request();
-        
-        $route = Route::getRoutes()->match($req);
-        $method = $route->methods[0] ?? 'UNKNOWN';
-        $rawRoute = $method . self::ROUTE_METHOD_SEPARATOR . $route->uri;
-        
+
         return new AuditContext(
             userId:        $member?->getId(),
             userEmail:     $member?->getEmail(),
@@ -115,7 +109,6 @@ private function buildAuditContext(): AuditContext
             httpMethod:    $req?->method(),
             clientIp:      $req?->ip(),
             userAgent:     $req?->userAgent(),
-            rawRoute:      $rawRoute
         );
     }
 }

app/Audit/AuditLogFormatterFactory.php

@@ -45,36 +45,27 @@ public function make(AuditContext $ctx, $subject, $eventType): ?IAuditLogFormatt
                 if (count($subject) > 0) {
                     $child_entity = $subject[0];
                 }
-                if (is_null($child_entity) && isset($subject->getSnapshot()[0]) && count($subject->getSnapshot()) > 0) {
+                if (is_null($child_entity) && count($subject->getSnapshot()) > 0) {
                     $child_entity = $subject->getSnapshot()[0];
                 }
                 $child_entity_formatter = $child_entity != null ? ChildEntityFormatterFactory::build($child_entity) : null;
                 $formatter = new EntityCollectionUpdateAuditLogFormatter($child_entity_formatter);
                 break;
             case IAuditStrategy::EVENT_ENTITY_CREATION:
-                $formatter = $this->getFormatterByContext($subject, $eventType, $ctx);
-                if (is_null($formatter)) {
-                    $formatter = $this->getStrategyClass($subject, $eventType);
-                }
+                $formatter = $this->getStrategyClass($subject, $eventType);
                 if(is_null($formatter)) {
                     $formatter = new EntityCreationAuditLogFormatter();
                 }
                 break;
             case IAuditStrategy::EVENT_ENTITY_DELETION:
-                $formatter = $this->getFormatterByContext($subject, $eventType, $ctx);
-                if (is_null($formatter)) {
-                    $formatter = $this->getStrategyClass($subject, $eventType);
-                }
+                $formatter = $this->getStrategyClass($subject, $eventType);
                 if(is_null($formatter)) {
                     $child_entity_formatter = ChildEntityFormatterFactory::build($subject);
                     $formatter = new EntityDeletionAuditLogFormatter($child_entity_formatter);
                 }
                 break;
             case IAuditStrategy::EVENT_ENTITY_UPDATE:
-                $formatter = $this->getFormatterByContext($subject, $eventType, $ctx);
-                if (is_null($formatter)) {
-                    $formatter = $this->getStrategyClass($subject, $eventType);
-                }
+                $formatter = $this->getStrategyClass($subject, $eventType);
                 if(is_null($formatter)) {
                     $child_entity_formatter = ChildEntityFormatterFactory::build($subject);
                     $formatter = new EntityUpdateAuditLogFormatter($child_entity_formatter);
@@ -84,39 +75,4 @@ public function make(AuditContext $ctx, $subject, $eventType): ?IAuditLogFormatt
         $formatter->setContext($ctx);
         return $formatter;
     }
-
-    private function getFormatterByContext(object $subject, string $event_type, AuditContext $ctx): ?IAuditLogFormatter
-    {
-        $class = get_class($subject);
-        $entity_config = $this->config['entities'][$class] ?? null;
-        
-        if (!$entity_config || !isset($entity_config['strategies'])) {
-            return null;
-        }
-
-        foreach ($entity_config['strategies'] as $strategy) {
-            if (!$this->matchesStrategy($strategy, $ctx)) {
-                continue;
-            }
-
-            $formatter_class = $strategy['formatter'] ?? null;
-            return $formatter_class ? new $formatter_class($event_type) : null;
-        }
-
-        return null;
-    }
-
-    private function matchesStrategy(array $strategy, AuditContext $ctx): bool
-    {
-        if (isset($strategy['route']) && !$this->routeMatches($strategy['route'], $ctx->rawRoute)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private function routeMatches(string $route, string $actual_route): bool
-    {
-        return strcmp($actual_route, $route) === 0;
-    }
 }