Organise les services en sous-répertoires

Roxayl · Roxayl · commit 30290f237ad4 · 2024-04-01T13:14:35.000+02:00
diff --git a/app/Console/Commands/RegenerateInfluences.php b/app/Console/Commands/RegenerateInfluences.php
@@ -5,7 +5,7 @@
 namespace Roxayl\MondeGC\Console\Commands;
 
 use Illuminate\Console\Command;
-use Roxayl\MondeGC\Services\RegenerateInfluenceService;
+use Roxayl\MondeGC\Services\Gameplay\RegenerateInfluenceService;
 
 class RegenerateInfluences extends Command
 {
diff --git a/app/Http/Controllers/BackOfficeController.php b/app/Http/Controllers/BackOfficeController.php
@@ -7,8 +7,8 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
+use Roxayl\MondeGC\Services\Gameplay\RegenerateInfluenceService;
 use Roxayl\MondeGC\Services\HelperService;
-use Roxayl\MondeGC\Services\RegenerateInfluenceService;
 use YlsIdeas\FeatureFlags\Manager;
 
 class BackOfficeController extends Controller
diff --git a/app/Http/Controllers/DataExporterController.php b/app/Http/Controllers/DataExporterController.php
@@ -7,7 +7,7 @@
 use Carbon\Carbon;
 use LogicException;
 use Roxayl\MondeGC\Models\Pays;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
diff --git a/app/Http/Controllers/MapController.php b/app/Http/Controllers/MapController.php
@@ -5,7 +5,7 @@
 namespace Roxayl\MondeGC\Http\Controllers;
 
 use Illuminate\Contracts\View\View;
-use Roxayl\MondeGC\Services\LegacyPageService;
+use Roxayl\MondeGC\Services\Legacy\LegacyPageService;
 
 class MapController extends Controller
 {
diff --git a/app/Http/Controllers/VersionController.php b/app/Http/Controllers/VersionController.php
@@ -11,7 +11,7 @@
 use Reliese\Database\Eloquent\Model;
 use Roxayl\MondeGC\Models\Traits\Versionable;
 use Roxayl\MondeGC\Models\Version;
-use Roxayl\MondeGC\Services\VersionDiffService;
+use Roxayl\MondeGC\Services\Version\VersionDiffService;
 
 class VersionController extends Controller
 {
diff --git a/app/Models/ChapterResourceable.php b/app/Models/ChapterResourceable.php
@@ -18,7 +18,7 @@
 use Roxayl\MondeGC\Models\Enums\Resource;
 use Roxayl\MondeGC\Models\Traits\DeletesInfluences;
 use Roxayl\MondeGC\Models\Traits\Influencable as GeneratesInfluence;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 
 /**
  * Class ChapterResourceable.
diff --git a/app/Models/DiscordNotification.php b/app/Models/DiscordNotification.php
@@ -9,7 +9,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Roxayl\MondeGC\Jobs\Contracts\NotifiesDiscord;
-use Roxayl\MondeGC\Services\DiscordWebhookService;
+use Roxayl\MondeGC\Services\Discord\DiscordWebhookService;
 
 /**
  * Class DiscordNotification.
diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
@@ -25,7 +25,7 @@
 use Roxayl\MondeGC\Models\Traits\Resourceable as HasResources;
 use Roxayl\MondeGC\Models\Traits\Roleplayable as ParticipatesInRoleplay;
 use Roxayl\MondeGC\Models\Traits\Versionable;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use Spatie\Searchable\Searchable;
 use Spatie\Searchable\SearchResult;
 
diff --git a/app/Models/Pays.php b/app/Models/Pays.php
@@ -28,7 +28,7 @@
 use Roxayl\MondeGC\Models\Traits\Resourceable as HasResources;
 use Roxayl\MondeGC\Models\Traits\Roleplayable as ParticipatesInRoleplay;
 use Roxayl\MondeGC\Models\Traits\Versionable;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use Spatie\Searchable\Searchable;
 use Spatie\Searchable\SearchResult;
 use YlsIdeas\FeatureFlags\Facades\Features;
diff --git a/app/Models/Traits/Roleplayable.php b/app/Models/Traits/Roleplayable.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Facades\DB;
 use Roxayl\MondeGC\Models\ChapterResourceable;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use YlsIdeas\FeatureFlags\Facades\Features;
 
 trait Roleplayable
diff --git a/app/Models/Ville.php b/app/Models/Ville.php
@@ -24,7 +24,7 @@
 use Roxayl\MondeGC\Models\Traits\Resourceable as HasResources;
 use Roxayl\MondeGC\Models\Traits\Roleplayable as ParticipatesInRoleplay;
 use Roxayl\MondeGC\Models\Traits\Versionable;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use Spatie\Searchable\Searchable;
 use Spatie\Searchable\SearchResult;
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -14,7 +14,7 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
 use Reliese\Coders\CodersServiceProvider;
-use Roxayl\MondeGC\Services\DiscordWebhookService;
+use Roxayl\MondeGC\Services\Discord\DiscordWebhookService;
 use Roxayl\MondeGC\Services\FakerProviders;
 use Roxayl\MondeGC\Services\StringBladeService;
 use YlsIdeas\FeatureFlags\Facades\Features;
diff --git a/app/Services/Discord/DiscordWebhookService.php b/app/Services/Discord/DiscordWebhookService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Roxayl\MondeGC\Services;
+namespace Roxayl\MondeGC\Services\Discord;
 
 class DiscordWebhookService
 {
diff --git a/app/Services/Gameplay/EconomyService.php b/app/Services/Gameplay/EconomyService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Roxayl\MondeGC\Services;
+namespace Roxayl\MondeGC\Services\Gameplay;
 
 use Illuminate\Database\Eloquent\Collection;
 use Roxayl\MondeGC\Models\Contracts\Influencable;
diff --git a/app/Services/Gameplay/RegenerateInfluenceService.php b/app/Services/Gameplay/RegenerateInfluenceService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Roxayl\MondeGC\Services;
+namespace Roxayl\MondeGC\Services\Gameplay;
 
 use Illuminate\Cache\CacheManager;
 use Illuminate\Database\DatabaseManager;
diff --git a/app/Services/Legacy/LegacyPageService.php b/app/Services/Legacy/LegacyPageService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Roxayl\MondeGC\Services;
+namespace Roxayl\MondeGC\Services\Legacy;
 
 use Roxayl\MondeGC\Http\Controllers\Legacy\LegacySiteController;
 
diff --git a/app/Services/Version/VersionDiffService.php b/app/Services/Version/VersionDiffService.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Roxayl\MondeGC\Services;
+namespace Roxayl\MondeGC\Services\Version;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
diff --git a/app/View/Components/Blocks/ResourceSelector.php b/app/View/Components/Blocks/ResourceSelector.php
@@ -7,7 +7,7 @@
 use Illuminate\View\Component;
 use Illuminate\View\View;
 use Roxayl\MondeGC\Models\Enums\Resource;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 
 class ResourceSelector extends Component
 {
diff --git a/database/factories/ChapterResourceableFactory.php b/database/factories/ChapterResourceableFactory.php
@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Roxayl\MondeGC\Models\ChapterResourceable;
 use Roxayl\MondeGC\Models\Pays;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 
 class ChapterResourceableFactory extends Factory
 {
diff --git a/legacy/Page-carte.php b/legacy/Page-carte.php
@@ -127,7 +127,7 @@
 }
 
 // Ressources
-$paysResources = \Roxayl\MondeGC\Services\EconomyService::getPaysResources();
+$paysResources = \Roxayl\MondeGC\Services\Gameplay\EconomyService::getPaysResources();
 
 ?>
 <!DOCTYPE html>
diff --git a/legacy/economie.php b/legacy/economie.php
@@ -1,7 +1,7 @@
 <?php
 
 use Roxayl\MondeGC\Models\Enums\Resource;
-use Roxayl\MondeGC\Services\EconomyService;
+use Roxayl\MondeGC\Services\Gameplay\EconomyService;
 use Illuminate\Support\Facades\Gate;
 
 //Connexion et deconnexion
diff --git a/resources/views/back-office/advanced-parameters.blade.php b/resources/views/back-office/advanced-parameters.blade.php
@@ -1,4 +1,4 @@
-@inject('legacyPageService', 'Roxayl\MondeGC\Services\LegacyPageService')
+@inject('legacyPageService', 'Roxayl\MondeGC\Services\Legacy\LegacyPageService')
 @inject('helperService', 'Roxayl\MondeGC\Services\HelperService')
 
 @extends('layouts.legacy')
diff --git a/resources/views/layouts/legacy.blade.php b/resources/views/layouts/legacy.blade.php
@@ -1,4 +1,4 @@
-@inject('legacyPageService', 'Roxayl\MondeGC\Services\LegacyPageService')
+@inject('legacyPageService', 'Roxayl\MondeGC\Services\Legacy\LegacyPageService')
 
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Roxayl\MondeGC\Console\Commands;`
`6`	`6`
`7`	`7`	`use Illuminate\Console\Command;`
`8`		`-use Roxayl\MondeGC\Services\RegenerateInfluenceService;`
	`8`	`+use Roxayl\MondeGC\Services\Gameplay\RegenerateInfluenceService;`
`9`	`9`
`10`	`10`	`class RegenerateInfluences extends Command`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Roxayl\MondeGC\Http\Controllers;`
`6`	`6`
`7`	`7`	`use Illuminate\Contracts\View\View;`
`8`		`-use Roxayl\MondeGC\Services\LegacyPageService;`
	`8`	`+use Roxayl\MondeGC\Services\Legacy\LegacyPageService;`
`9`	`9`
`10`	`10`	`class MapController extends Controller`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Reliese\Database\Eloquent\Model;`
`12`	`12`	`use Roxayl\MondeGC\Models\Traits\Versionable;`
`13`	`13`	`use Roxayl\MondeGC\Models\Version;`
`14`		`-use Roxayl\MondeGC\Services\VersionDiffService;`
	`14`	`+use Roxayl\MondeGC\Services\Version\VersionDiffService;`
`15`	`15`
`16`	`16`	`class VersionController extends Controller`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace Roxayl\MondeGC\Services;`
	`5`	`+namespace Roxayl\MondeGC\Services\Discord;`
`6`	`6`
`7`	`7`	`class DiscordWebhookService`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Illuminate\View\Component;`
`8`	`8`	`use Illuminate\View\View;`
`9`	`9`	`use Roxayl\MondeGC\Models\Enums\Resource;`
`10`		`-use Roxayl\MondeGC\Services\EconomyService;`
	`10`	`+use Roxayl\MondeGC\Services\Gameplay\EconomyService;`
`11`	`11`
`12`	`12`	`class ResourceSelector extends Component`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`6`	`6`	`use Roxayl\MondeGC\Models\ChapterResourceable;`
`7`	`7`	`use Roxayl\MondeGC\Models\Pays;`
`8`		`-use Roxayl\MondeGC\Services\EconomyService;`
	`8`	`+use Roxayl\MondeGC\Services\Gameplay\EconomyService;`
`9`	`9`
`10`	`10`	`class ChapterResourceableFactory extends Factory`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// Ressources`
`130`		`-$paysResources = \Roxayl\MondeGC\Services\EconomyService::getPaysResources();`
	`130`	`+$paysResources = \Roxayl\MondeGC\Services\Gameplay\EconomyService::getPaysResources();`
`131`	`131`
`132`	`132`	`?>`
`133`	`133`	`<!DOCTYPE html>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@inject('legacyPageService', 'Roxayl\MondeGC\Services\LegacyPageService')`
	`1`	`+@inject('legacyPageService', 'Roxayl\MondeGC\Services\Legacy\LegacyPageService')`
`2`	`2`	`@inject('helperService', 'Roxayl\MondeGC\Services\HelperService')`
`3`	`3`
`4`	`4`	`@extends('layouts.legacy')`