From 363c4360b8fa2a3997daf5c968b6cd5c251c2470 Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Fri, 30 May 2025 00:32:34 +0200
Subject: [PATCH] Add Member filter to prevention settings

---
 app/Prevention/Actions/SettingStoreAction.php |  2 ++
 app/Prevention/PreventionSettings.php         |  2 ++
 ...create_prevention_yearly_mail_settings.php |  2 ++
 resources/js/views/member/VIndex.vue          |  4 +--
 resources/js/views/setting/Prevention.vue     |  1 +
 tests/Feature/Prevention/SettingTest.php      | 33 ++++++++++++++++---
 6 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/Prevention/Actions/SettingStoreAction.php b/app/Prevention/Actions/SettingStoreAction.php
index d7173f9e..1c1525a2 100644
--- a/app/Prevention/Actions/SettingStoreAction.php
+++ b/app/Prevention/Actions/SettingStoreAction.php
@@ -4,6 +4,7 @@ namespace App\Prevention\Actions;
 
 use App\Lib\Editor\EditorData;
 use App\Lib\Events\Succeeded;
+use App\Member\FilterScope;
 use App\Prevention\PreventionSettings;
 use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -34,6 +35,7 @@ class SettingStoreAction
         $settings->weeks = $request->weeks;
         $settings->freshRememberInterval = $request->freshRememberInterval;
         $settings->active = $request->active;
+        $settings->yearlyMemberFilter = FilterScope::from($request->yearlyMemberFilter);
         $settings->save();
 
         Succeeded::message('Einstellungen gespeichert.')->dispatch();
diff --git a/app/Prevention/PreventionSettings.php b/app/Prevention/PreventionSettings.php
index 186502d0..5340fbba 100644
--- a/app/Prevention/PreventionSettings.php
+++ b/app/Prevention/PreventionSettings.php
@@ -3,6 +3,7 @@
 namespace App\Prevention;
 
 use App\Lib\Editor\EditorData;
+use App\Member\FilterScope;
 use App\Setting\LocalSettings;
 
 class PreventionSettings extends LocalSettings
@@ -13,6 +14,7 @@ class PreventionSettings extends LocalSettings
     public int $weeks;
     public int $freshRememberInterval;
     public bool $active;
+    public FilterScope $yearlyMemberFilter;
 
     public static function group(): string
     {
diff --git a/database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php b/database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php
index bbf5ac9e..7d016a85 100644
--- a/database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php
+++ b/database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Member\FilterScope;
 use Spatie\LaravelSettings\Migrations\SettingsMigration;
 
 return new class extends SettingsMigration
@@ -10,5 +11,6 @@ return new class extends SettingsMigration
         $this->migrator->add('prevention.weeks', 8);
         $this->migrator->add('prevention.freshRememberInterval', 12);
         $this->migrator->add('prevention.active', false);
+        $this->migrator->add('prevention.yearlyMemberFilter', FilterScope::from([])->toArray());
     }
 };
diff --git a/resources/js/views/member/VIndex.vue b/resources/js/views/member/VIndex.vue
index 0a03a482..8faab25f 100644
--- a/resources/js/views/member/VIndex.vue
+++ b/resources/js/views/member/VIndex.vue
@@ -19,9 +19,7 @@
         </ui-popup>
         <page-filter>
             <template #fields>
-                <suspense>
-                    <member-filter-fields :model-value="filter" @update:model-value="setFilterObject($event)" />
-                </suspense>
+                <member-filter-fields :model-value="filter" @update:model-value="setFilterObject($event)" />
             </template>
             <template #buttons>
                 <f-text id="search" :model-value="filter.search" label="Suchen …" size="sm" @update:model-value="setFilterObject({...filter, search: $event})"></f-text>
diff --git a/resources/js/views/setting/Prevention.vue b/resources/js/views/setting/Prevention.vue
index 12bc7352..288930d9 100644
--- a/resources/js/views/setting/Prevention.vue
+++ b/resources/js/views/setting/Prevention.vue
@@ -20,6 +20,7 @@
                         <f-text id="fresh_remember_interval" v-model="data.freshRememberInterval" label="Bei Ablauf alle X Wochen erinnern" type="number" />
                     </div>
                     <f-editor v-if="active === 1" id="yearlymail" v-model="data.yearlymail" label="Jährliche Präventions-Erinnerung"></f-editor>
+                    <f-member-filter id="yearly_member_filter" v-model="data.yearlyMemberFilter" label="nur für folgende Mitglieder erlauben" />
                 </div>
             </form>
         </setting-layout>
diff --git a/tests/Feature/Prevention/SettingTest.php b/tests/Feature/Prevention/SettingTest.php
index f0508fc5..f8bb48a0 100644
--- a/tests/Feature/Prevention/SettingTest.php
+++ b/tests/Feature/Prevention/SettingTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Prevention;
 
+use App\Member\FilterScope;
 use App\Prevention\PreventionSettings;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\RequestFactories\EditorRequestFactory;
@@ -20,25 +21,47 @@ it('receives settings', function () {
 
     $text = EditorRequestFactory::new()->text(50, 'lorem ipsum')->toData();
     $yearlyMail = EditorRequestFactory::new()->text(50, 'lala dd')->toData();
-    app(PreventionSettings::class)->fill(['formmail' => $text, 'yearlymail' => $yearlyMail, 'weeks' => 9, 'freshRememberInterval' => 11, 'active' => true])->save();
+    app(PreventionSettings::class)->fill([
+        'formmail' => $text,
+        'yearlymail' => $yearlyMail,
+        'weeks' => 9,
+        'freshRememberInterval' => 11,
+        'active' => true,
+        'yearlyMemberFilter' => FilterScope::from([
+            'memberships' => [['group_ids' => [33]]],
+            'search' => 'searchstring',
+        ]),
+    ])->save();
 
     test()->get('/api/prevention')
         ->assertJsonPath('data.formmail.blocks.0.data.text', 'lorem ipsum')
         ->assertJsonPath('data.yearlymail.blocks.0.data.text', 'lala dd')
         ->assertJsonPath('data.weeks', '9')
         ->assertJsonPath('data.active', true)
-        ->assertJsonPath('data.freshRememberInterval', '11');
+        ->assertJsonPath('data.freshRememberInterval', '11')
+        ->assertJsonPath('data.yearlyMemberFilter.search', 'searchstring')
+        ->assertJsonPath('data.yearlyMemberFilter.memberships.0.group_ids.0', 33);
 });
 
 it('testItStoresSettings', function () {
     test()->login()->loginNami();
 
-    $formmail = EditorRequestFactory::new()->text(50, 'new lorem')->create();
-    $yearlyMail = EditorRequestFactory::new()->text(50, 'lala dd')->create();
-    test()->post('/api/prevention', ['formmail' => $formmail, 'yearlymail' => $yearlyMail, 'weeks' => 9, 'freshRememberInterval' => 11, 'active' => true])->assertOk();
+    test()->post('/api/prevention', [
+        'formmail' => EditorRequestFactory::new()->text(50, 'new lorem')->create(),
+        'yearlymail' => EditorRequestFactory::new()->text(50, 'lala dd')->create(),
+        'weeks' => 9,
+        'freshRememberInterval' => 11,
+        'active' => true,
+        'yearlyMemberFilter' => [
+            'memberships' => [['group_ids' => 33]],
+            'search' => 'searchstring',
+        ],
+    ])->assertOk();
     test()->assertTrue(app(PreventionSettings::class)->formmail->hasAll(['new lorem']));
     test()->assertTrue(app(PreventionSettings::class)->yearlymail->hasAll(['lala dd']));
     test()->assertEquals(9, app(PreventionSettings::class)->weeks);
     test()->assertEquals(11, app(PreventionSettings::class)->freshRememberInterval);
     test()->assertTrue(app(PreventionSettings::class)->active);
+    test()->assertEquals([['group_ids' => 33]], app(PreventionSettings::class)->yearlyMemberFilter->memberships);
+    test()->assertEquals('searchstring', app(PreventionSettings::class)->yearlyMemberFilter->search);
 });