Use new generic user settings endpoint for MAIA notifications

biigle · Aug 11, 2020 · 17e0989 · 17e0989
1 parent c37639a
commit 17e0989
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 106 deletions.
diff --git a/src/Http/Controllers/Api/SettingsController.php b/src/Http/Controllers/Api/SettingsController.php
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -40,8 +40,4 @@
 
     $router->get('maia-jobs/{id}/images/{id2}/training-proposals', 'MaiaJobImagesController@indexTrainingProposals');
     $router->get('maia-jobs/{id}/images/{id2}/annotation-candidates', 'MaiaJobImagesController@indexAnnotationCandidates');
-
-    $router->post('users/my/settings/maia', [
-        'uses' => 'SettingsController@store',
-    ]);
 });
diff --git a/src/MaiaServiceProvider.php b/src/MaiaServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Biigle\Modules\Maia;
 
+use Biigle\Http\Requests\UpdateUserSettings;
 use Biigle\Modules\Maia\Events\MaiaJobContinued;
 use Biigle\Modules\Maia\Events\MaiaJobCreated;
 use Biigle\Modules\Maia\Events\MaiaJobDeleting;
@@ -53,6 +54,7 @@ public function boot(Modules $modules, Router $router)
 
         if (config('maia.notifications.allow_user_settings')) {
             $modules->registerViewMixin('maia', 'settings.notifications');
+            UpdateUserSettings::addRule('maia_notifications', 'filled|in:email,web');
         }
 
         Gate::policy(MaiaJob::class, Policies\MaiaJobPolicy::class);

diff --git a/src/resources/views/settings/notifications.blade.php b/src/resources/views/settings/notifications.blade.php
@@ -43,7 +43,7 @@
         watch: {
             settings: function (settings) {
                 this.startLoading();
-                this.$http.post('api/v1/users/my/settings/maia', {
+                this.$http.put('api/v1/users/my/settings', {
                         maia_notifications: this.settings,
                     })
                     .then(this.handleSuccess, this.handleError)

diff --git a/tests/Http/Controllers/Api/SettingsControllerTest.php b/tests/Http/Controllers/Api/SettingsControllerTest.php
diff --git a/tests/Http/Requests/UpdateUserSettingsTest.php b/tests/Http/Requests/UpdateUserSettingsTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Biigle\Tests\Modules\Maia\Http\Requests;
+
+use ApiTestCase;
+
+class UpdateUserSettingsTest extends ApiTestCase
+{
+    public function testUpdate()
+    {
+        $this->beUser();
+        $this->putJson("/api/v1/users/my/settings", ['maia_notifications' => 'test'])
+            ->assertStatus(422);
+
+        $this->assertNull($this->user()->fresh()->getSettings('maia_notifications'));
+
+        $this->putJson("/api/v1/users/my/settings", ['maia_notifications' => 'email'])
+            ->assertStatus(200);
+
+        $this->assertEquals('email', $this->user()->fresh()->getSettings('maia_notifications'));
+
+        $this->putJson("/api/v1/users/my/settings", ['maia_notifications' => 'web'])
+            ->assertStatus(200);
+
+        $this->assertEquals('web', $this->user()->fresh()->getSettings('maia_notifications'));
+    }
+}