From b3d2086f58c55d27b3a7834d6ade8a4fcad85c71 Mon Sep 17 00:00:00 2001
From: Laurent Constantin <laurent.constantin@liip.ch>
Date: Sat, 7 Dec 2024 17:55:12 +0100
Subject: [PATCH] fix(kobo): Split Library controller and align names with
 tests

---
 .../Kobo/Api/V1/{ => Library}/LibraryController.php        | 2 +-
 src/Controller/Kobo/Api/V1/Library/MetadataController.php  | 0
 src/Controller/Kobo/Api/V1/Library/StateController.php     | 0
 .../V1/AnalyticsControllerTest.php}                        | 5 +++--
 .../V1/DownloadControllerTest.php}                         | 5 +++--
 .../V1/InitializationControllerTest.json}                  | 0
 .../V1/InitializationControllerTest.php}                   | 7 ++++---
 .../Controller/Kobo/{ => Api/V1}/KoboTagControllerTest.php | 3 ++-
 .../Kobo/Api/V1/Library/MetadataControllerTest.php         | 0
 .../V1/Library/StateControllerTest.php}                    | 5 +++--
 .../V1/Library/SyncControllerTest.php}                     | 5 +++--
 .../V3/ContentControllerTest.php}                          | 5 +++--
 12 files changed, 22 insertions(+), 15 deletions(-)
 rename src/Controller/Kobo/Api/V1/{ => Library}/LibraryController.php (99%)
 create mode 100644 src/Controller/Kobo/Api/V1/Library/MetadataController.php
 create mode 100644 src/Controller/Kobo/Api/V1/Library/StateController.php
 rename tests/Controller/Kobo/{KoboAnalyticsControllerTest.php => Api/V1/AnalyticsControllerTest.php} (99%)
 rename tests/Controller/Kobo/{KoboDownloadControllerTest.php => Api/V1/DownloadControllerTest.php} (96%)
 rename tests/Controller/Kobo/{KoboInitializationControllerTest.json => Api/V1/InitializationControllerTest.json} (100%)
 rename tests/Controller/Kobo/{KoboInitializationControllerTest.php => Api/V1/InitializationControllerTest.php} (90%)
 rename tests/Controller/Kobo/{ => Api/V1}/KoboTagControllerTest.php (91%)
 create mode 100644 tests/Controller/Kobo/Api/V1/Library/MetadataControllerTest.php
 rename tests/Controller/Kobo/{KoboStateControllerTest.php => Api/V1/Library/StateControllerTest.php} (97%)
 rename tests/Controller/Kobo/{KoboSyncControllerTest.php => Api/V1/Library/SyncControllerTest.php} (98%)
 rename tests/Controller/Kobo/{ReadServiceCheckForChangesControllerTest.php => Api/V3/ContentControllerTest.php} (74%)

diff --git a/src/Controller/Kobo/Api/V1/LibraryController.php b/src/Controller/Kobo/Api/V1/Library/LibraryController.php
similarity index 99%
rename from src/Controller/Kobo/Api/V1/LibraryController.php
rename to src/Controller/Kobo/Api/V1/Library/LibraryController.php
index 13517b7a..fa615900 100644
--- a/src/Controller/Kobo/Api/V1/LibraryController.php
+++ b/src/Controller/Kobo/Api/V1/Library/LibraryController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Kobo\Api\V1;
+namespace App\Controller\Kobo\Api\V1\Library;
 
 use App\Controller\Kobo\AbstractKoboController;
 use App\Entity\Book;
diff --git a/src/Controller/Kobo/Api/V1/Library/MetadataController.php b/src/Controller/Kobo/Api/V1/Library/MetadataController.php
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Controller/Kobo/Api/V1/Library/StateController.php b/src/Controller/Kobo/Api/V1/Library/StateController.php
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/Controller/Kobo/KoboAnalyticsControllerTest.php b/tests/Controller/Kobo/Api/V1/AnalyticsControllerTest.php
similarity index 99%
rename from tests/Controller/Kobo/KoboAnalyticsControllerTest.php
rename to tests/Controller/Kobo/Api/V1/AnalyticsControllerTest.php
index f806f5cd..2f50d053 100644
--- a/tests/Controller/Kobo/KoboAnalyticsControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/AnalyticsControllerTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1;
 
 use App\DataFixtures\KoboFixture;
 use App\Entity\KoboDevice;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 
-class KoboAnalyticsControllerTest extends AbstractKoboControllerTest
+class AnalyticsControllerTest extends AbstractKoboControllerTest
 {
     public const SERIAL_NUMBER = 'N9413679432456';
     public const DEVICE_ID = '2a92bba197b1e0574a3f7d29cb2b05b399ab0d197e6b1aa230bfb75a920b14e7c';
diff --git a/tests/Controller/Kobo/KoboDownloadControllerTest.php b/tests/Controller/Kobo/Api/V1/DownloadControllerTest.php
similarity index 96%
rename from tests/Controller/Kobo/KoboDownloadControllerTest.php
rename to tests/Controller/Kobo/Api/V1/DownloadControllerTest.php
index faf4088d..6c0e83c2 100644
--- a/tests/Controller/Kobo/KoboDownloadControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/DownloadControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1;
 
 use App\DataFixtures\BookFixture;
 use App\DataFixtures\KoboFixture;
@@ -9,8 +9,9 @@
 use App\Kobo\DownloadHelper;
 use App\Kobo\Response\MetadataResponseService;
 use App\Repository\BookRepository;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 
-class KoboDownloadControllerTest extends AbstractKoboControllerTest
+class DownloadControllerTest extends AbstractKoboControllerTest
 {
     public function testDownload(): void
     {
diff --git a/tests/Controller/Kobo/KoboInitializationControllerTest.json b/tests/Controller/Kobo/Api/V1/InitializationControllerTest.json
similarity index 100%
rename from tests/Controller/Kobo/KoboInitializationControllerTest.json
rename to tests/Controller/Kobo/Api/V1/InitializationControllerTest.json
diff --git a/tests/Controller/Kobo/KoboInitializationControllerTest.php b/tests/Controller/Kobo/Api/V1/InitializationControllerTest.php
similarity index 90%
rename from tests/Controller/Kobo/KoboInitializationControllerTest.php
rename to tests/Controller/Kobo/Api/V1/InitializationControllerTest.php
index 47905d7b..8ea3538d 100644
--- a/tests/Controller/Kobo/KoboInitializationControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/InitializationControllerTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1;
 
 use App\DataFixtures\KoboFixture;
 use App\Tests\Contraints\JSONContainKeys;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 use Symfony\Component\BrowserKit\Response;
 
-class KoboInitializationControllerTest extends AbstractKoboControllerTest
+class InitializationControllerTest extends AbstractKoboControllerTest
 {
     /**
      * @throws \JsonException
@@ -62,7 +63,7 @@ public function testInitialization(): void
         self::assertResponseIsSuccessful();
         self::assertResponseHasHeader('kobo-api-token');
 
-        $content = file_get_contents(__DIR__.'/KoboInitializationControllerTest.json');
+        $content = file_get_contents(__DIR__ . '/KoboInitializationControllerTest.json');
         if ($content === false) {
             self::fail('Unable to read test data');
         }
diff --git a/tests/Controller/Kobo/KoboTagControllerTest.php b/tests/Controller/Kobo/Api/V1/KoboTagControllerTest.php
similarity index 91%
rename from tests/Controller/Kobo/KoboTagControllerTest.php
rename to tests/Controller/Kobo/Api/V1/KoboTagControllerTest.php
index 596fcb14..a192d60a 100644
--- a/tests/Controller/Kobo/KoboTagControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/KoboTagControllerTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1;
 
 use App\DataFixtures\KoboFixture;
 use App\DataFixtures\ShelfFixture;
 use App\Entity\Shelf;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 
 class KoboTagControllerTest extends AbstractKoboControllerTest
 {
diff --git a/tests/Controller/Kobo/Api/V1/Library/MetadataControllerTest.php b/tests/Controller/Kobo/Api/V1/Library/MetadataControllerTest.php
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/Controller/Kobo/KoboStateControllerTest.php b/tests/Controller/Kobo/Api/V1/Library/StateControllerTest.php
similarity index 97%
rename from tests/Controller/Kobo/KoboStateControllerTest.php
rename to tests/Controller/Kobo/Api/V1/Library/StateControllerTest.php
index 746be688..79f26ff3 100644
--- a/tests/Controller/Kobo/KoboStateControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/Library/StateControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1\Library;
 
 use App\DataFixtures\BookFixture;
 use App\DataFixtures\KoboFixture;
@@ -13,12 +13,13 @@
 use App\Kobo\Request\ReadingStateStatistics;
 use App\Kobo\Request\ReadingStateStatusInfo;
 use App\Kobo\Response\StateResponse;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * @phpstan-type ReadingStateCriteria array{'book':int, 'readPages': int|null, 'finished': boolean}
  */
-class KoboStateControllerTest extends AbstractKoboControllerTest
+class StateControllerTest extends AbstractKoboControllerTest
 {
     public function testOpen(): void
     {
diff --git a/tests/Controller/Kobo/KoboSyncControllerTest.php b/tests/Controller/Kobo/Api/V1/Library/SyncControllerTest.php
similarity index 98%
rename from tests/Controller/Kobo/KoboSyncControllerTest.php
rename to tests/Controller/Kobo/Api/V1/Library/SyncControllerTest.php
index c266c846..a52fe17d 100644
--- a/tests/Controller/Kobo/KoboSyncControllerTest.php
+++ b/tests/Controller/Kobo/Api/V1/Library/SyncControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V1\Library;
 
 use App\DataFixtures\BookFixture;
 use App\DataFixtures\KoboFixture;
@@ -11,9 +11,10 @@
 use App\Service\KoboSyncTokenExtractor;
 use App\Tests\Contraints\AssertHasDownloadWithFormat;
 use App\Tests\Contraints\JSONIsValidSyncResponse;
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 use App\Tests\TestClock;
 
-class KoboSyncControllerTest extends AbstractKoboControllerTest
+class SyncControllerTest extends AbstractKoboControllerTest
 {
     protected function setUp(): void
     {
diff --git a/tests/Controller/Kobo/ReadServiceCheckForChangesControllerTest.php b/tests/Controller/Kobo/Api/V3/ContentControllerTest.php
similarity index 74%
rename from tests/Controller/Kobo/ReadServiceCheckForChangesControllerTest.php
rename to tests/Controller/Kobo/Api/V3/ContentControllerTest.php
index e5ae84fc..97c133fd 100644
--- a/tests/Controller/Kobo/ReadServiceCheckForChangesControllerTest.php
+++ b/tests/Controller/Kobo/Api/V3/ContentControllerTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Tests\Controller\Kobo;
+namespace App\Tests\Controller\Kobo\Api\V3;
 
+use App\Tests\Controller\Kobo\AbstractKoboControllerTest;
 use Symfony\Component\HttpFoundation\Response;
 
-class ReadServiceCheckForChangesControllerTest extends AbstractKoboControllerTest
+class ContentControllerTest extends AbstractKoboControllerTest
 {
     public function testCheckForChangesPost(): void
     {