Move all blob related code into a blob subdir

digital-blueprint · Sep 24, 2024 · 84cf995 · 84cf995
1 parent bf429b8
commit 84cf995
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 17 deletions.
diff --git a/src/Service/BlobService.php → src/Blob/BlobService.php b/src/Service/BlobService.php → src/Blob/BlobService.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Dbp\Relay\CabinetBundle\Service;
+namespace Dbp\Relay\CabinetBundle\Blob;
 
 use Dbp\Relay\BlobLibrary\Api\BlobApi;
 use Dbp\Relay\CabinetBundle\Authorization\AuthorizationService;
+use Dbp\Relay\CabinetBundle\Service\ConfigurationService;
 use Dbp\Relay\CoreBundle\Exception\ApiError;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;

diff --git a/src/Controller/BlobSignatureController.php → src/Blob/BlobSignatureController.php b/src/Controller/BlobSignatureController.php → src/Blob/BlobSignatureController.php
@@ -2,10 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Dbp\Relay\CabinetBundle\Controller;
+namespace Dbp\Relay\CabinetBundle\Blob;
 
 use Dbp\Relay\CabinetBundle\Authorization\AuthorizationService;
-use Dbp\Relay\CabinetBundle\Service\BlobService;
 use Dbp\Relay\CoreBundle\Exception\ApiError;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Command/DebugCommand.php b/src/Command/DebugCommand.php
@@ -4,7 +4,7 @@
 
 namespace Dbp\Relay\CabinetBundle\Command;
 
-use Dbp\Relay\CabinetBundle\Service\BlobService;
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Dbp\Relay\CabinetBundle\Service\CabinetService;
 use Dbp\Relay\CabinetBundle\TypesenseSync\TypesenseClient;
 use Symfony\Component\Console\Command\Command;

diff --git a/src/Command/DeleteAllFilesCommand.php b/src/Command/DeleteAllFilesCommand.php
@@ -5,7 +5,7 @@
 namespace Dbp\Relay\CabinetBundle\Command;
 
 use Dbp\Relay\BlobLibrary\Api\BlobApiError;
-use Dbp\Relay\CabinetBundle\Service\BlobService;
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Command/DeleteFileCommand.php b/src/Command/DeleteFileCommand.php
@@ -5,7 +5,7 @@
 namespace Dbp\Relay\CabinetBundle\Command;
 
 use Dbp\Relay\BlobLibrary\Api\BlobApiError;
-use Dbp\Relay\CabinetBundle\Service\BlobService;
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Command/UploadFileCommand.php b/src/Command/UploadFileCommand.php
@@ -5,7 +5,7 @@
 namespace Dbp\Relay\CabinetBundle\Command;
 
 use Dbp\Relay\BlobLibrary\Api\BlobApiError;
-use Dbp\Relay\CabinetBundle\Service\BlobService;
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Resources/config/api_resources.yaml b/src/Resources/config/api_resources.yaml
@@ -11,7 +11,7 @@ resources:
       signature:
         class: ApiPlatform\Metadata\Get
         method: GET
-        controller: Dbp\Relay\CabinetBundle\Controller\BlobSignatureController
+        controller: Dbp\Relay\CabinetBundle\Blob\BlobSignatureController
         uriTemplate: "/signature"
         normalizationContext:
           groups: [ "Cabinet:output" ]

diff --git a/src/Resources/config/routes.yaml b/src/Resources/config/routes.yaml
@@ -2,6 +2,6 @@ typesense_api:
   resource: ../../TypesenseApi/
   type: annotation
 
-controller_api:
-  resource: ../../Controller/
+blob_api:
+  resource: ../../Blob/
   type: annotation
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -9,12 +9,6 @@ services:
     autowire: true
     autoconfigure: true
 
-  Dbp\Relay\CabinetBundle\Controller\:
-    tags: [ 'controller.service_arguments' ]
-    resource: '../../Controller'
-    autowire: true
-    autoconfigure: true
-
   Dbp\Relay\CabinetBundle\Service\ConfigurationService:
     autowire: true
     autoconfigure: true

diff --git a/src/Service/CabinetService.php b/src/Service/CabinetService.php
@@ -6,6 +6,7 @@
 
 use Dbp\Relay\BasePersonBundle\API\PersonProviderInterface;
 use Dbp\Relay\BasePersonBundle\Entity\Person;
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Dbp\Relay\CoreBundle\Exception\ApiError;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerAwareInterface;

diff --git a/src/Service/HealthCheck.php b/src/Service/HealthCheck.php
@@ -4,6 +4,7 @@
 
 namespace Dbp\Relay\CabinetBundle\Service;
 
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Dbp\Relay\CabinetBundle\TypesenseSync\TypesenseClient;
 use Dbp\Relay\CoreBundle\HealthCheck\CheckInterface;
 use Dbp\Relay\CoreBundle\HealthCheck\CheckOptions;

diff --git a/src/TypesenseSync/TypesenseSync.php b/src/TypesenseSync/TypesenseSync.php
@@ -4,8 +4,8 @@
 
 namespace Dbp\Relay\CabinetBundle\TypesenseSync;
 
+use Dbp\Relay\CabinetBundle\Blob\BlobService;
 use Dbp\Relay\CabinetBundle\PersonSync\PersonSyncInterface;
-use Dbp\Relay\CabinetBundle\Service\BlobService;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;