From d26baf1f574c2d083ba65d8ac4079e21d0bf208b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Jun 2022 10:18:23 +0200 Subject: [PATCH] fix: migration and add more tests --- src/Appwrite/Migration/Version/V14.php | 9 +++-- tests/unit/Migration/MigrationV14Test.php | 46 ++++++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/Appwrite/Migration/Version/V14.php b/src/Appwrite/Migration/Version/V14.php index db05f2b713..2098a2d8bd 100644 --- a/src/Appwrite/Migration/Version/V14.php +++ b/src/Appwrite/Migration/Version/V14.php @@ -424,8 +424,8 @@ class V14 extends Migration if (str_starts_with($document->getAttribute('resource'), 'document/')) { $collectionId = explode('.', $document->getAttribute('event'))[1]; $document - ->setAttribute('resource', "database/default/collections/{$collectionId}/{$document->getAttribute('resource')}") - ->setAttribute('event', "databases.default.collections.{$collectionId}.{$document->getAttribute('event')}"); + ->setAttribute('resource', "database/default/collection/{$collectionId}/{$document->getAttribute('resource')}") + ->setAttribute('event', "databases.default.{$document->getAttribute('event')}"); } break; @@ -433,8 +433,9 @@ class V14 extends Migration /** * Add Database Layer to stats metric. */ - if (str_starts_with($document->getAttribute('metric'), 'collections.')) { - $document->setAttribute('metric', "databases.default.{$document->getAttribute('metric')}"); + if (str_starts_with($document->getAttribute('metric'), 'database.')) { + $metric = ltrim($document->getAttribute('metric'), 'database.'); + $document->setAttribute('metric', "databases.default.{$metric}"); } break; diff --git a/tests/unit/Migration/MigrationV14Test.php b/tests/unit/Migration/MigrationV14Test.php index 09dc7d999c..ea839465af 100644 --- a/tests/unit/Migration/MigrationV14Test.php +++ b/tests/unit/Migration/MigrationV14Test.php @@ -16,7 +16,7 @@ class MigrationV14Test extends MigrationTest $this->method->setAccessible(true); } - public function testMigrateProject() + public function testMigrateProjects() { $document = $this->fixDocument(new Document([ '$id' => 'appwrite', @@ -28,7 +28,7 @@ class MigrationV14Test extends MigrationTest $this->assertEquals($document->getAttribute('version'), '0.15.0'); } - public function testMigrateKey() + public function testMigrateKeys() { $document = $this->fixDocument(new Document([ '$id' => 'appwrite', @@ -127,4 +127,46 @@ class MigrationV14Test extends MigrationTest $this->assertEquals($document->getCreatedAt(), 123456789); } + + public function testMigrateAudits() + { + $document = $this->fixDocument(new Document([ + '$id' => 'appwrite', + '$collection' => 'audit', + 'resource' => 'collection/movies', + 'event' => 'collections.movies.create' + ])); + + $this->assertEquals($document->getAttribute('resource'), 'database/default/collection/movies'); + $this->assertEquals($document->getAttribute('event'), 'databases.default.collections.movies.create'); + + $document = $this->fixDocument(new Document([ + '$id' => 'appwrite', + '$collection' => 'audit', + 'resource' => 'document/avatar', + 'event' => 'collections.movies.documents.avatar.create' + ])); + + $this->assertEquals($document->getAttribute('resource'), 'database/default/collection/movies/document/avatar'); + $this->assertEquals($document->getAttribute('event'), 'databases.default.collections.movies.documents.avatar.create'); + } + + public function testMigrateStats() + { + $document = $this->fixDocument(new Document([ + '$id' => 'appwrite', + '$collection' => 'stats', + 'metric' => 'database.collections.62b2039844d4277495d0.documents.create' + ])); + + $this->assertEquals($document->getAttribute('metric'), 'databases.default.collections.62b2039844d4277495d0.documents.create'); + + $document = $this->fixDocument(new Document([ + '$id' => 'appwrite', + '$collection' => 'stats', + 'metric' => 'users.create' + ])); + + $this->assertEquals($document->getAttribute('metric'), 'users.create'); + } }