Refactor audit log retrieval to use toPublicAuditRecord method for improved readability and maintainability

src/FederationServer/Classes/Managers/AuditLogManager.php

@@ -8,6 +8,7 @@
     use FederationServer\Classes\Logger;
     use FederationServer\Exceptions\DatabaseOperationException;
     use FederationServer\Objects\AuditLogRecord;
+    use FederationServer\Objects\PublicAuditRecord;
     use InvalidArgumentException;
     use PDO;
     use PDOException;
@@ -313,6 +314,31 @@
             }
         }
 
+        /**
+         * Converts an AuditLogRecord to a PublicAuditRecord.
+         *
+         * @param AuditLogRecord $record The AuditLogRecord to convert.
+         * @return PublicAuditRecord The converted PublicAuditRecord.
+         * @throws DatabaseOperationException Thrown if there was a database error while transforming the record.
+         */
+        public static function toPublicAuditRecord(AuditLogRecord $record): PublicAuditRecord
+        {
+            $operatorRecord = null;
+            $entityRecord = null;
+
+            if($record->getOperator() !== null)
+            {
+                $operatorRecord = OperatorManager::getOperator($record->getOperator());
+            }
+
+            if($record->getEntity() !== null)
+            {
+                $entityRecord = EntitiesManager::getEntityByUuid($record->getEntity());
+            }
+
+            return new PublicAuditRecord($record, $operatorRecord, $entityRecord);
+        }
+
         /**
          * Deletes all audit log entries.
          *

src/FederationServer/Methods/Audit/ListAuditLogs.php

@@ -51,27 +51,11 @@
                 $filteredEntries = null;
             }
 
-
             try
             {
-                $auditLogs = AuditLogManager::getEntries($limit, $page, $filteredEntries);
+                $results = array_map(fn($log) => AuditLogManager::toPublicAuditRecord($log),
-                foreach($auditLogs as $logRecord)
+                    AuditLogManager::getEntries($limit, $page, $filteredEntries)
-                {
+                );
-                    $operatorRecord = null;
-                    $entityRecord = null;
-
-                    if($logRecord->getOperator() !== null)
-                    {
-                        $operatorRecord = OperatorManager::getOperator($logRecord->getOperator());
-                    }
-
-                    if($logRecord->getEntity() !== null)
-                    {
-                        $entityRecord = EntitiesManager::getEntityByUuid($logRecord->getEntity());
-                    }
-
-                    $results[] = new PublicAuditRecord($logRecord, $operatorRecord, $entityRecord);
-                }
             }
             catch (DatabaseOperationException $e)
             {

src/FederationServer/Methods/Entities/ListEntityAuditLogs.php

@@ -69,24 +69,9 @@
                     throw new RequestException('Not Found: Entity with the specified UUID does not exist', 404);
                 }
 
-                $auditLogs = AuditLogManager::getEntriesByEntity($entityUuid, $limit, $page, $filteredEntries);
+                $results = array_map(fn($log) => AuditLogManager::toPublicAuditRecord($log),
-                foreach($auditLogs as $logRecord)
+                    AuditLogManager::getEntriesByEntity($entityUuid, $limit, $page, $filteredEntries)
-                {
+                );
-                    $operatorRecord = null;
-                    $entityRecord = null;
-
-                    if($logRecord->getOperator() !== null)
-                    {
-                        $operatorRecord = OperatorManager::getOperator($logRecord->getOperator());
-                    }
-
-                    if($logRecord->getEntity() !== null)
-                    {
-                        $entityRecord = EntitiesManager::getEntityByUuid($logRecord->getEntity());
-                    }
-
-                    $results[] = new PublicAuditRecord($logRecord, $operatorRecord, $entityRecord);
-                }
             }
             catch (DatabaseOperationException $e)
             {

src/FederationServer/Methods/Operators/ListOperatorAuditLogs.php

@@ -69,24 +69,9 @@
                     throw new RequestException('Not Found: Operator with the specified UUID does not exist', 404);
                 }
 
-                $auditLogs = AuditLogManager::getEntriesByOperator($operatorUuid, $limit, $page, $filteredEntries);
+                $results = array_map(fn($log) => AuditLogManager::toPublicAuditRecord($log),
-                foreach($auditLogs as $logRecord)
+                    AuditLogManager::getEntriesByOperator($operatorUuid, $limit, $page, $filteredEntries)
-                {
+                );
-                    $operatorRecord = null;
-                    $entityRecord = null;
-
-                    if($logRecord->getOperator() !== null)
-                    {
-                        $operatorRecord = OperatorManager::getOperator($logRecord->getOperator());
-                    }
-
-                    if($logRecord->getEntity() !== null)
-                    {
-                        $entityRecord = EntitiesManager::getEntityByUuid($logRecord->getEntity());
-                    }
-
-                    $results[] = new PublicAuditRecord($logRecord, $operatorRecord, $entityRecord);
-                }
             }
             catch (DatabaseOperationException $e)
             {