Move all classes to a sub-namespace

Signed-off-by: Vitor Mattos <vitor@php.rio>

lib/Service/Importer/ABoardImportService.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck\Service\Importer;
 
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\Assignment;

lib/Service/Importer/BoardImportCommandService.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck\Service\Importer;
 
 use OCA\Deck\Exceptions\ConflictException;
 use OCA\Deck\NotFoundException;
@@ -80,7 +80,7 @@ class BoardImportCommandService extends BoardImportService {
 			$config = $this->getInput()->getOption('config');
 			if (is_string($config)) {
 				if (!is_file($config)) {
-					throw new NotFoundException('It\'s not a file.');
+					throw new NotFoundException('It\'s not a valid config file.');
 				}
 				$config = json_decode(file_get_contents($config));
 				if (!$config instanceof \stdClass) {
@@ -94,6 +94,7 @@ class BoardImportCommandService extends BoardImportService {
 			$this->getOutput()->writeln('<error>' . $e->getMessage() . '</error>');
 			$helper = $this->getCommand()->getHelper('question');
 			$question = new Question(
+				"<info>You can get more info on https://deck.readthedocs.io/en/latest/User_documentation_en/#6-import-boards</info>\n" .
 				'Please inform a valid config json file: ',
 				'config.json'
 			);

lib/Service/Importer/BoardImportService.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck\Service\Importer;
 
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Validator;
@@ -163,20 +163,10 @@ class BoardImportService {
 
 	public function getAllowedImportSystems(): array {
 		if (!$this->allowedSystems) {
-			$allowedSystems = glob(__DIR__ . '/BoardImport*Service.php');
-			$allowedSystems = array_filter($allowedSystems, function (string $name) {
-				$name = basename($name);
-				switch ($name) {
-					case 'ABoardImportService.php':
-					case 'BoardImportService.php':
-					case 'BoardImportCommandService.php':
-						return false;
-				}
-				return true;
-			});
+			$allowedSystems = glob(__DIR__ . '/Systems/*Service.php');
 			$allowedSystems = array_map(function ($filename) {
-				preg_match('/\/(?<class>BoardImport(?<system>\w+)Service)\.php$/', $filename, $matches);
-				$className = 'OCA\Deck\Service\\'.$matches['class'];
+				preg_match('/\/(?<class>(?<system>\w+)Service)\.php$/', $filename, $matches);
+				$className = 'OCA\Deck\Service\Importer\Systems\\'.$matches['class'];
 				if (!class_exists($className)) {
 					/** @psalm-suppress UnresolvableInclude */
 					require_once $className;

lib/Service/Importer/Systems/TrelloApiService.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck\Service\Importer\Systems;
 
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
@@ -30,7 +30,7 @@ use OCP\IURLGenerator;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 
-class BoardImportTrelloApiService extends BoardImportTrelloJsonService {
+class TrelloApiService extends TrelloJsonService {
 	/** @var string */
 	public static $name = 'Trello API';
 	protected $needValidateData = false;

lib/Service/Importer/Systems/TrelloJsonService.php

@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Deck\Service;
+namespace OCA\Deck\Service\Importer\Systems;
 
 use OC\Comments\Comment;
 use OCA\Deck\BadRequestException;
@@ -32,13 +32,14 @@ use OCA\Deck\Db\Board;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\Label;
 use OCA\Deck\Db\Stack;
+use OCA\Deck\Service\Importer\ABoardImportService;
 use OCP\Comments\IComment;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 
-class BoardImportTrelloJsonService extends ABoardImportService {
+class TrelloJsonService extends ABoardImportService {
 	/** @var string */
 	public static $name = 'Trello JSON';
 	/** @var IUserManager */