Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "Update logs read adapter"

Browse Source 
This reverts commit 3e2a805d6c.
This commit is contained in:
Jake Barnby
2025-02-24 18:03:11 +13:00
parent 3e2a805d6c
commit 9c2e1c1f4d
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/account.php
+2 -2
View File
@@ -37,7 +37,7 @@ use libphonenumber\PhoneNumberUtil;
use MaxMind\Db\Reader;
use Utopia\Abuse\Abuse;
use Utopia\App;
use Utopia\Audit\Audit as EventAudit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
@@ -2722,7 +2722,7 @@ App::get('/v1/account/logs')
$logsDB = $getLogsDB($project);
$audit = new EventAudit($logsDB);
$audit = new Activity($logsDB);
$logs = $audit->getLogsByUser(
$user->getInternalId(),
app/controllers/api/databases.php
+4 -4
View File
@@ -20,7 +20,7 @@ use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use MaxMind\Db\Reader;
use Utopia\App;
use Utopia\Audit\Audit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document;
@@ -677,7 +677,7 @@ App::get('/v1/databases/:databaseId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'database/' . $databaseId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
@@ -1070,7 +1070,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'database/' . $databaseId . '/collection/' . $collectionId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
@@ -3725,7 +3725,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'database/' . $databaseId . '/collection/' . $collectionId . '/document/' . $document->getId();
$logs = $audit->getLogsByResource($resource, $limit, $offset);
app/controllers/api/messaging.php
+5 -5
View File
@@ -25,7 +25,7 @@ use Appwrite\Utopia\Database\Validator\Queries\Topics;
use Appwrite\Utopia\Response;
use MaxMind\Db\Reader;
use Utopia\App;
use Utopia\Audit\Audit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
@@ -1003,7 +1003,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'provider/' . $providerId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
$output = [];
@@ -2235,7 +2235,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'topic/' . $topicId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
@@ -2649,7 +2649,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'subscriber/' . $subscriberId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
@@ -3418,7 +3418,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($logsDB);
$audit = new Activity($logsDB);
$resource = 'message/' . $messageId;
$logs = $audit->getLogsByResource($resource, $limit, $offset);
app/controllers/api/projects.php
+4 -3
View File
@@ -21,7 +21,8 @@ use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use PHPMailer\PHPMailer\PHPMailer;
use Utopia\App;
use Utopia\Audit\Audit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Audit\Adapter\Audit;
use Utopia\Cache\Cache;
use Utopia\Config\Config;
use Utopia\Database\Database;
@@ -242,8 +243,8 @@ App::post('/v1/projects')
}
if (!$create && $sharedTablesV1) {
$attributes = \array_map(fn ($attribute) => new Document($attribute), Audit::ATTRIBUTES);
$indexes = \array_map(fn (array $index) => new Document($index), Audit::INDEXES);
$attributes = \array_map(fn ($attribute) => new Document($attribute), $audit->getAttributes());
$indexes = \array_map(fn (array $index) => new Document($index), $audit->getIndexes());
$dbForProject->createDocument(Database::METADATA, new Document([
'$id' => ID::custom('audit'),
'$permissions' => [Permission::create(Role::any())],
app/controllers/api/teams.php
+2 -2
View File
@@ -26,7 +26,7 @@ use libphonenumber\PhoneNumberUtil;
use MaxMind\Db\Reader;
use Utopia\Abuse\Abuse;
use Utopia\App;
use Utopia\Audit\Audit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
@@ -1369,7 +1369,7 @@ App::get('/v1/teams/:teamId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($getLogsDB);
$audit = new Activity($logsDB);
$resource = 'team/' . $team->getId();
$logs = $audit->getLogsByResource($resource, $limit, $offset);
app/controllers/api/users.php
+4 -2
View File
@@ -27,7 +27,7 @@ use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use MaxMind\Db\Reader;
use Utopia\App;
use Utopia\Audit\Audit;
use Utopia\Audit\Adapter\Activity;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
@@ -868,7 +868,9 @@ App::get('/v1/users/:userId/logs')
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
$audit = new Audit($dbForProject);
$logsDB = $getLogsDB($project);
$audit = new Activity($logsDB);
$logs = $audit->getLogsByUser($user->getInternalId(), $limit, $offset);