From 2333b52d683b8b73c7eb2932edaca4dec9b9bd8f Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Tue, 20 Jul 2021 17:27:18 +0200
Subject: [PATCH] controller refactoring part 12

---
 .../js/components/Others/UserImageInput.vue   |  2 +-
 resources/js/views/User/Settings.vue          | 18 ++--
 routes/maintenance.php                        | 12 +--
 routes/user.php                               |  8 +-
 .../Controllers/MaintenanceController.php     | 83 -------------------
 .../Controllers/MaintenanceModeController.php | 42 ++++++++++
 .../Controllers/UpgradeDatabaseController.php | 32 +++++++
 .../UpgradeTranslationsController.php         | 25 ++++++
 tests/App/Users/UserAccountTest.php           |  4 +-
 tests/Domain/Admin/AdminTest.php              |  2 +-
 10 files changed, 123 insertions(+), 105 deletions(-)
 delete mode 100644 src/Domain/Maintenance/Controllers/MaintenanceController.php
 create mode 100644 src/Domain/Maintenance/Controllers/MaintenanceModeController.php
 create mode 100644 src/Domain/Maintenance/Controllers/UpgradeDatabaseController.php
 create mode 100644 src/Domain/Maintenance/Controllers/UpgradeTranslationsController.php

diff --git a/resources/js/components/Others/UserImageInput.vue b/resources/js/components/Others/UserImageInput.vue
index 52e06679..d26c5ef0 100644
--- a/resources/js/components/Others/UserImageInput.vue
+++ b/resources/js/components/Others/UserImageInput.vue
@@ -52,7 +52,7 @@
                     reader.readAsDataURL(file)
 
                     // Update user avatar
-                    this.$updateImage('/user/relationships/settings', 'avatar', event.target.files[0])
+                    this.$updateImage('/user/settings', 'avatar', event.target.files[0])
                 } else {
                     alert( this.$t('validation_errors.wrong_image') )
                 }
diff --git a/resources/js/views/User/Settings.vue b/resources/js/views/User/Settings.vue
index 787b6335..44d5f3ee 100644
--- a/resources/js/views/User/Settings.vue
+++ b/resources/js/views/User/Settings.vue
@@ -33,7 +33,7 @@
                 <div class="block-wrapper">
                     <label>GMT:</label>
                     <div class="input-wrapper">
-                        <SelectInput @input="$updateText('/user/relationships/settings', 'timezone', userInfo.timezone)"
+                        <SelectInput @input="$updateText('/user/settings', 'timezone', userInfo.timezone)"
                                     v-model="userInfo.timezone"
                                     :default="userInfo.timezone"
                                     :options="timezones"
@@ -49,7 +49,7 @@
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.name') }}:</label>
                     <div class="input-wrapper">
-                        <input @keyup="$updateText('/user/relationships/settings', 'name', billingInfo.name)"
+                        <input @keyup="$updateText('/user/settings', 'name', billingInfo.name)"
                                v-model="billingInfo.name"
                                :placeholder="$t('user_settings.name_plac')"
                                type="text"
@@ -60,7 +60,7 @@
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.address') }}:</label>
                     <div class="input-wrapper">
-                        <input @keyup="$updateText('/user/relationships/settings', 'address', billingInfo.address)"
+                        <input @keyup="$updateText('/user/settings', 'address', billingInfo.address)"
                                v-model="billingInfo.address"
                                :placeholder="$t('user_settings.address_plac')"
                                type="text"
@@ -72,7 +72,7 @@
                     <div class="block-wrapper">
                         <label>{{ $t('user_settings.city') }}:</label>
                         <div class="input-wrapper">
-                            <input @keyup="$updateText('/user/relationships/settings', 'city', billingInfo.city)"
+                            <input @keyup="$updateText('/user/settings', 'city', billingInfo.city)"
                                    v-model="billingInfo.city"
                                    :placeholder="$t('user_settings.city_plac')"
                                    type="text"
@@ -83,7 +83,7 @@
                     <div class="block-wrapper">
                         <label>{{ $t('user_settings.postal_code') }}:</label>
                         <div class="input-wrapper">
-                            <input @keyup="$updateText('/user/relationships/settings', 'postal_code', billingInfo.postal_code)"
+                            <input @keyup="$updateText('/user/settings', 'postal_code', billingInfo.postal_code)"
                                    v-model="billingInfo.postal_code"
                                    :placeholder="$t('user_settings.postal_code_plac')"
                                    type="text"
@@ -95,7 +95,7 @@
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.country') }}:</label>
                     <div class="input-wrapper">
-                        <SelectInput @input="$updateText('/user/relationships/settings', 'country', billingInfo.country)"
+                        <SelectInput @input="$updateText('/user/settings', 'country', billingInfo.country)"
                                      v-model="billingInfo.country"
                                      :default="billingInfo.country"
                                      :options="countries"
@@ -106,7 +106,7 @@
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.state') }}:</label>
                     <div class="input-wrapper">
-                        <input @keyup="$updateText('/user/relationships/settings', 'state', billingInfo.state)"
+                        <input @keyup="$updateText('/user/settings', 'state', billingInfo.state)"
                                v-model="billingInfo.state"
                                :placeholder="$t('user_settings.state_plac')"
                                type="text"
@@ -120,7 +120,7 @@
                 <div class="block-wrapper">
                     <label>{{ $t('user_settings.phone_number') }}:</label>
                     <div class="input-wrapper">
-                        <input @keyup="$updateText('/user/relationships/settings', 'phone_number', billingInfo.phone_number)"
+                        <input @keyup="$updateText('/user/settings', 'phone_number', billingInfo.phone_number)"
                                v-model="billingInfo.phone_number"
                                :placeholder="$t('user_settings.phone_number_plac')"
                                type="text"
@@ -178,7 +178,7 @@
         methods: {
             changeUserName() {
                 this.$store.commit('UPDATE_NAME', this.userInfo.name)
-                this.$updateText('/user/relationships/settings', 'name', this.userInfo.name)
+                this.$updateText('/user/settings', 'name', this.userInfo.name)
             }
         },
         created() {
diff --git a/routes/maintenance.php b/routes/maintenance.php
index 6c86577f..592985d4 100644
--- a/routes/maintenance.php
+++ b/routes/maintenance.php
@@ -1,13 +1,15 @@
 <?php
 
-use Domain\Maintenance\Controllers\MaintenanceController;
+use Domain\Maintenance\Controllers\MaintenanceModeController;
+use Domain\Maintenance\Controllers\UpgradeDatabaseController;
+use Domain\Maintenance\Controllers\UpgradeTranslationsController;
 
 Route::group(['middleware' => ['auth:sanctum']], function () {
-    Route::get('/down', [MaintenanceController::class, 'down']);
-    Route::get('/up', [MaintenanceController::class, 'up']);
+    Route::get('/down', [MaintenanceModeController::class, 'down']);
+    Route::get('/up', [MaintenanceModeController::class, 'up']);
 
     Route::group(['prefix' => 'upgrade'], function () {
-        Route::get('/translations', [MaintenanceController::class, 'upgrade_translations']);
-        Route::get('/database', [MaintenanceController::class, 'upgrade_database']);
+        Route::get('/translations', UpgradeTranslationsController::class);
+        Route::get('/database', UpgradeDatabaseController::class);
     });
 });
diff --git a/routes/user.php b/routes/user.php
index 59286898..f9a680d3 100644
--- a/routes/user.php
+++ b/routes/user.php
@@ -27,15 +27,15 @@ Route::post('/email/verify/resend', ResendVerificationEmail::class)
     ->name('verification.send');
 
 Route::group(['middleware' => ['auth:sanctum']], function () {
+    // User Access Token
+    Route::apiResource('/tokens', AccountAccessTokenController::class);
+    
     // Account
-    Route::patch('/relationships/settings', UpdateProfileSettingsController::class);
+    Route::patch('/settings', UpdateProfileSettingsController::class);
     Route::post('/password', UpdatePasswordController::class);
     Route::get('/storage', StorageCapacityController::class);
     Route::get('/', AccountDetailsController::class);
 
-    // User Access Token
-    Route::apiResource('/tokens', AccountAccessTokenController::class);
-
     // Subscription
     Route::group(['prefix' => 'subscription'], function () {
         Route::get('/setup-intent', GetSetupIntentController::class);
diff --git a/src/Domain/Maintenance/Controllers/MaintenanceController.php b/src/Domain/Maintenance/Controllers/MaintenanceController.php
deleted file mode 100644
index 4108d623..00000000
--- a/src/Domain/Maintenance/Controllers/MaintenanceController.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-namespace Domain\Maintenance\Controllers;
-
-use Gate;
-use Artisan;
-use Illuminate\Http\Response;
-use App\Http\Controllers\Controller;
-use Illuminate\Contracts\Foundation\Application;
-use Domain\Localization\Services\LanguageService;
-use Illuminate\Contracts\Routing\ResponseFactory;
-
-class MaintenanceController extends Controller
-{
-    /**
-     *  Start maintenance mode
-     */
-    public function up()
-    {
-        // Check admin permission
-        Gate::authorize('maintenance');
-
-        $command = Artisan::call('up');
-
-        if ($command === 0) {
-            echo 'System is in production mode';
-        }
-    }
-
-    /**
-     *  End maintenance mode
-     */
-    public function down()
-    {
-        // Check admin permission
-        Gate::authorize('maintenance');
-
-        $command = Artisan::call('down');
-
-        if ($command === 0) {
-            echo 'System is in maintenance mode';
-        }
-    }
-
-    /**
-     * Get new language translations from default translations
-     * and insert it into database
-     *
-     * @return Application|ResponseFactory|Response
-     */
-    public function upgrade_translations()
-    {
-        // Check admin permission
-        Gate::authorize('maintenance');
-
-        resolve(LanguageService::class)
-            ->upgrade_language_translations();
-
-        return response('Done.', 201);
-    }
-
-    /**
-     * @return int|mixed
-     */
-    public function upgrade_database()
-    {
-        // Check admin permission
-        Gate::authorize('maintenance');
-
-        $command = Artisan::call('migrate', [
-            '--force' => true,
-        ]);
-
-        if ($command === 0) {
-            echo 'Operation was successful.';
-        }
-
-        if ($command === 1) {
-            echo 'Operation failed.';
-        }
-
-        return $command;
-    }
-}
diff --git a/src/Domain/Maintenance/Controllers/MaintenanceModeController.php b/src/Domain/Maintenance/Controllers/MaintenanceModeController.php
new file mode 100644
index 00000000..09a7ba15
--- /dev/null
+++ b/src/Domain/Maintenance/Controllers/MaintenanceModeController.php
@@ -0,0 +1,42 @@
+<?php
+
+
+namespace Domain\Maintenance\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Artisan;
+use Gate;
+
+class MaintenanceModeController extends Controller
+{
+    /**
+     *  Start maintenance mode
+     */
+    public function up()
+    {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
+        $command = Artisan::call('up');
+
+        if ($command === 0) {
+            echo 'System is in production mode';
+        }
+    }
+
+    /**
+     *  End maintenance mode
+     */
+    public function down()
+    {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
+        $command = Artisan::call('down');
+
+        if ($command === 0) {
+            echo 'System is in maintenance mode';
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Domain/Maintenance/Controllers/UpgradeDatabaseController.php b/src/Domain/Maintenance/Controllers/UpgradeDatabaseController.php
new file mode 100644
index 00000000..5235f9aa
--- /dev/null
+++ b/src/Domain/Maintenance/Controllers/UpgradeDatabaseController.php
@@ -0,0 +1,32 @@
+<?php
+
+
+namespace Domain\Maintenance\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Artisan;
+use Gate;
+
+class UpgradeDatabaseController extends Controller
+{
+    public function __invoke(): mixed
+    {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
+        $command = Artisan::call('migrate', [
+            '--force' => true,
+        ]);
+
+        if ($command === 0) {
+            echo 'Operation was successful.';
+        }
+
+        if ($command === 1) {
+            echo 'Operation failed.';
+        }
+
+        return $command;
+    }
+}
\ No newline at end of file
diff --git a/src/Domain/Maintenance/Controllers/UpgradeTranslationsController.php b/src/Domain/Maintenance/Controllers/UpgradeTranslationsController.php
new file mode 100644
index 00000000..e6e307fe
--- /dev/null
+++ b/src/Domain/Maintenance/Controllers/UpgradeTranslationsController.php
@@ -0,0 +1,25 @@
+<?php
+namespace Domain\Maintenance\Controllers;
+
+use Gate;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Domain\Localization\Services\LanguageService;
+
+class UpgradeTranslationsController extends Controller
+{
+    /**
+     * Get new language translations from default translations
+     * and insert it into database
+     */
+    public function __invoke(): Response
+    {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
+        resolve(LanguageService::class)
+            ->upgrade_language_translations();
+
+        return response('Done.', 201);
+    }
+}
diff --git a/tests/App/Users/UserAccountTest.php b/tests/App/Users/UserAccountTest.php
index 50b31b11..1c8f7771 100644
--- a/tests/App/Users/UserAccountTest.php
+++ b/tests/App/Users/UserAccountTest.php
@@ -68,7 +68,7 @@ class UserAccountTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson('/api/user/relationships/settings', [
+            ->patchJson('/api/user/settings', [
                 'name'  => 'address',
                 'value' => 'Jantar',
             ])->assertStatus(204);
@@ -91,7 +91,7 @@ class UserAccountTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson('/api/user/relationships/settings', [
+            ->patchJson('/api/user/settings', [
                 'avatar' => $avatar,
             ])->assertStatus(204);
 
diff --git a/tests/Domain/Admin/AdminTest.php b/tests/Domain/Admin/AdminTest.php
index e4550ba1..a5096a79 100644
--- a/tests/Domain/Admin/AdminTest.php
+++ b/tests/Domain/Admin/AdminTest.php
@@ -365,7 +365,7 @@ class AdminTest extends TestCase
         $avatar = UploadedFile::fake()
             ->image('fake-image.jpg');
 
-        $this->patchJson('/api/user/relationships/settings', [
+        $this->patchJson('/api/user/settings', [
             'avatar' => $avatar,
         ])->assertStatus(204);