silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 106 Wiki Activity

--wip-- [skip ci]

This commit is contained in:
philipp lang 2025-05-26 14:26:24 +02:00
parent 7c656afce8
commit 65a6614831
11 changed files with 184 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/Member/Member.php
View File

@ -2,6 +2,7 @@
namespace App\Member;
use stdClass;
use App\Confession;
use App\Country;
use App\Course\Models\CourseMember;
@ -13,6 +14,7 @@ use App\Nami\HasNamiField;
use App\Nationality;
use App\Payment\Subscription;
use App\Pdf\Sender;
use App\Prevention\Contracts\YearlyPreventable;
use App\Region;
use App\Setting\NamiSettings;
use Carbon\Carbon;
@ -40,7 +42,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
* @property string $subscription_name
* @property int $pending_payment
*/
class Member extends Model implements Geolocatable
class Member extends Model implements Geolocatable, YearlyPreventable
{
use Notifiable;
use HasNamiField;
@ -191,7 +193,7 @@ class Member extends Model implements Geolocatable
protected function getAusstand(): int
{
return (int) $this->invoicePositions()->whereHas('invoice', fn ($query) => $query->whereNeedsPayment())->sum('price');
return (int) $this->invoicePositions()->whereHas('invoice', fn($query) => $query->whereNeedsPayment())->sum('price');
}
// ---------------------------------- Relations ----------------------------------
@ -339,7 +341,7 @@ class Member extends Model implements Geolocatable
return $query->addSelect([
'pending_payment' => InvoicePosition::selectRaw('SUM(price)')
->whereColumn('invoice_positions.member_id', 'members.id')
->whereHas('invoice', fn ($query) => $query->whereNeedsPayment()),
->whereHas('invoice', fn($query) => $query->whereNeedsPayment()),
]);
}
@ -350,7 +352,7 @@ class Member extends Model implements Geolocatable
*/
public function scopeWhereHasPendingPayment(Builder $query): Builder
{
return $query->whereHas('invoicePositions', fn ($q) => $q->whereHas('invoice', fn ($q) => $q->whereNeedsPayment()));
return $query->whereHas('invoicePositions', fn($q) => $q->whereHas('invoice', fn($q) => $q->whereNeedsPayment()));
}
/**
@ -499,7 +501,7 @@ class Member extends Model implements Geolocatable
'name' => $this->fullname,
'address' => $this->address,
'zipLocation' => $this->zip . ' ' . $this->location,
'mglnr' => Lazy::create(fn () => 'Mglnr.: ' . $this->nami_id),
'mglnr' => Lazy::create(fn() => 'Mglnr.: ' . $this->nami_id),
]);
}
@ -508,7 +510,7 @@ class Member extends Model implements Geolocatable
*/
public static function forSelect(): array
{
return static::select(['id', 'firstname', 'lastname'])->get()->map(fn ($member) => ['id' => $member->id, 'name' => $member->fullname])->toArray();
return static::select(['id', 'firstname', 'lastname'])->get()->map(fn($member) => ['id' => $member->id, 'name' => $member->fullname])->toArray();
}
// -------------------------------- Geolocation --------------------------------
@ -567,7 +569,24 @@ class Member extends Model implements Geolocatable
'age_group_icon' => $this->ageGroupMemberships->first()?->subactivity->slug,
'is_leader' => $this->leaderMemberships()->count() > 0,
'memberships' => $this->memberships()->active()->get()
->map(fn ($membership) => [...$membership->only('activity_id', 'subactivity_id'), 'both' => $membership->activity_id . '|' . $membership->subactivity_id, 'with_group' => $membership->group_id . '|' . $membership->activity_id . '|' . $membership->subactivity_id]),
->map(fn($membership) => [...$membership->only('activity_id', 'subactivity_id'), 'both' => $membership->activity_id . '|' . $membership->subactivity_id, 'with_group' => $membership->group_id . '|' . $membership->activity_id . '|' . $membership->subactivity_id]),
];
}
// -------------------------------- Prevention ---------------------------------
// *****************************************************************************
public function preventableSubject(): string
{
return 'Nachweise erforderlich';
}
public function preventableLayout(): string
{
return 'mail.prevention.prevention-remember-participant';
}
public function getMailRecipient(): stdClass
{
return (object) ['name' => $this->fullname, 'email' => $this->email];
}
}

2
app/Prevention/Actions/SettingStoreAction.php
View File

@ -19,6 +19,7 @@ class SettingStoreAction
{
return [
'formmail' => 'array',
'yearlymail' => 'array',
];
}
@ -26,6 +27,7 @@ class SettingStoreAction
{
$settings = app(PreventionSettings::class);
$settings->formmail = EditorData::from($request->formmail);
$settings->yearlymail = EditorData::from($request->yearlymail);
$settings->save();
Succeeded::message('Einstellungen gespeichert.')->dispatch();

20
app/Prevention/Contracts/YearlyPreventable.php Normal file
View File

@ -0,0 +1,20 @@
<?php
namespace App\Prevention\Contracts;
use App\Prevention\Enums\Prevention;
use stdClass;
interface YearlyPreventable
{
public function preventableLayout(): string;
public function preventableSubject(): string;
/**
* @return array<int, Prevention>
*/
public function preventions(): array;
public function getMailRecipient(): stdClass;
}

65
app/Prevention/Mails/YearlyMail.php Normal file
View File

@ -0,0 +1,65 @@
<?php
namespace App\Prevention\Mails;
use App\Invoice\InvoiceSettings;
use App\Lib\Editor\EditorData;
use App\Prevention\Contracts\Preventable;
use App\Prevention\Contracts\YearlyPreventable;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Attachment;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
class YearlyMail extends Mailable
{
use Queueable, SerializesModels;
public InvoiceSettings $settings;
/**
* Create a new message instance.
*/
public function __construct(public YearlyPreventable $preventable, public EditorData $bodyText)
{
$this->settings = app(InvoiceSettings::class);
$this->bodyText = $this->bodyText
->replaceWithList('wanted', collect($preventable->preventions())->map(fn($prevention) => $prevention->text())->toArray());
}
/**
* Get the message envelope.
*
* @return \Illuminate\Mail\Mailables\Envelope
*/
public function envelope()
{
return (new Envelope(
subject: $this->preventable->preventableSubject(),
))->to($this->preventable->getMailRecipient()->email, $this->preventable->getMailRecipient()->name);
}
/**
* Get the message content definition.
*
* @return \Illuminate\Mail\Mailables\Content
*/
public function content()
{
return new Content(
markdown: $this->preventable->preventableLayout(),
);
}
/**
* Get the attachments for the message.
*
* @return array<int, Attachment>
*/
public function attachments(): array
{
return [];
}
}

1
app/Prevention/PreventionSettings.php
View File

@ -9,6 +9,7 @@ class PreventionSettings extends LocalSettings
{
public EditorData $formmail;
public EditorData $yearlymail;
public static function group(): string
{

11
database/settings/2025_05_24_202013_create_prevention_yearly_mail_settings.php Normal file
View File

@ -0,0 +1,11 @@
<?php
use Spatie\LaravelSettings\Migrations\SettingsMigration;
return new class extends SettingsMigration
{
public function up(): void
{
$this->migrator->add('prevention.yearlymail', ['time' => 1, 'blocks' => [], 'version' => '1.0']);
}
};

4
docker-compose.yml
View File

@ -91,6 +91,8 @@ services:
- ./data/db:/var/lib/mysql
socketi:
ports:
- '6001:6001'
image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
environment:
SOKETI_DEFAULT_APP_ID: adremaid
@ -103,6 +105,8 @@ services:
- ./data/redis:/data
meilisearch:
ports:
- '7700:7700'
image: getmeili/meilisearch:v1.6
volumes:
- ./data/meilisearch:/meili_data

14
resources/js/components/ui/Tabs.vue
View File

@ -1,9 +1,15 @@
<template>
<div class="flex-none w-maxc flex flex-col justify-between border-b-2 group-[.is-popup]:border-zinc-500 mb-3">
<div class="flex-none w-maxc flex flex-col justify-between border-b-2 border-gray-500 group-[.is-popup]:border-zinc-500 mb-3">
<div class="flex space-x-1 px-2">
<a v-for="(item, index) in entries" :key="index" href="#" class="rounded-t-lg py-1 px-3 text-zinc-300"
:class="index === modelValue ? `group-[.is-popup]:bg-zinc-600` : ''" @click.prevent="openMenu(index)"
v-text="item.title"></a>
<a
v-for="(item, index) in entries"
:key="index"
href="#"
class="rounded-t-lg py-1 px-3 text-zinc-300"
:class="index === modelValue ? `bg-gray-700 group-[.is-popup]:bg-zinc-600` : ''"
@click.prevent="openMenu(index)"
v-text="item.title"
></a>
</div>
</div>
</template>

15
resources/js/views/setting/Prevention.vue
View File

@ -3,24 +3,31 @@
<template #right>
<f-save-button form="preventionform"></f-save-button>
</template>
<setting-layout v-if="loaded">
<form id="preventionform" class="grow p-6" @submit.prevent="submit">
<div class="col-span-full text-gray-100 mb-3">
<p class="text-sm">Hier kannst du Einstellungen zu Prävention setzen.</p>
</div>
<div class="grid gap-4 mt-2">
<f-editor id="frommail" v-model="data.formmail" label="E-Mail für Veranstaltungs-TN"></f-editor>
</div>
<ui-tabs v-model="active" class="mt-2" :entries="tabs"></ui-tabs>
<f-editor v-if="active === 0" id="formmail" v-model="data.formmail" label="E-Mail für Veranstaltungs-TN"></f-editor>
<f-editor v-if="active === 1" id="yearlymail" v-model="data.yearlymail" label="Jährliche Präventions-Erinnerung"></f-editor>
</form>
</setting-layout>
</page-layout>
</template>
<script lang="js" setup>
import { ref } from 'vue';
import { reactive, ref } from 'vue';
import { useApiIndex } from '../../composables/useApiIndex.js';
import SettingLayout from '../setting/Layout.vue';
const tabs = [
{ title: 'für Veranstaltungen' },
{ title: 'Jährlich' },
];
const active = ref(0);
const { axios, data, reload } = useApiIndex('/api/prevention', 'prevention');
const loaded = ref(false);

12
tests/Feature/Member/PreventionTest.php
View File

@ -13,6 +13,7 @@ use App\Lib\Editor\Condition;
use App\Prevention\Mails\PreventionRememberMail;
use App\Member\Member;
use App\Member\Membership;
use App\Prevention\Mails\YearlyMail;
use App\Prevention\PreventionSettings;
use Generator;
use Illuminate\Foundation\Testing\DatabaseTransactions;
@ -43,6 +44,11 @@ function createParticipant(Form $form): Participant
])->for(Member::factory()->defaults()->has(Membership::factory()->inLocal('€ LeiterIn', 'Wölfling')))->create();
}
function createMember(array $attributes): Member
{
return Member::factory()->defaults()->has(Membership::factory()->inLocal('€ LeiterIn', 'Wölfling'))->create($attributes);
}
dataset('attributes', fn() => [
[
['has_vk' => true, 'efz' => null, 'ps_at' => now()],
@ -280,3 +286,9 @@ it('testItDisplaysBodyTextInMail', function () {
$mail = new PreventionRememberMail($participant, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData());
$mail->assertSeeInText('ggtt');
});
it('displays text in yearly mail', function () {
$member = createMember([]);
$mail = new YearlyMail($member, EditorRequestFactory::new()->paragraphs(['ggtt'])->toData());
$mail->assertSeeInText('ggtt');
});

47
tests/Feature/Prevention/SettingTest.php
View File

@ -5,36 +5,33 @@ namespace Tests\Feature\Prevention;
use App\Prevention\PreventionSettings;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\RequestFactories\EditorRequestFactory;
use Tests\TestCase;
class SettingTest extends TestCase
{
uses(DatabaseTransactions::class);
use DatabaseTransactions;
it('testItOpensSettingsPage', function () {
test()->login()->loginNami();
public function testItOpensSettingsPage(): void
{
$this->login()->loginNami();
test()->get('/setting/prevention')->assertComponent('setting/Prevention')->assertOk();
});
$this->get('/setting/prevention')->assertComponent('setting/Prevention')->assertOk();
}
it('receives settings', function () {
test()->login()->loginNami();
public function testItReceivesSettings(): void
{
$this->login()->loginNami();
$text = EditorRequestFactory::new()->text(50, 'lorem ipsum')->toData();
$yearlyMail = EditorRequestFactory::new()->text(50, 'lala dd')->toData();
app(PreventionSettings::class)->fill(['formmail' => $text, 'yearlymail' => $yearlyMail])->save();
$text = EditorRequestFactory::new()->text(50, 'lorem ipsum')->toData();
app(PreventionSettings::class)->fill(['formmail' => $text])->save();
test()->get('/api/prevention')
->assertJsonPath('data.formmail.blocks.0.data.text', 'lorem ipsum')
->assertJsonPath('data.yearlymail.blocks.0.data.text', 'lala dd');
});
$this->get('/api/prevention')
->assertJsonPath('data.formmail.blocks.0.data.text', 'lorem ipsum');
}
it('testItStoresSettings', function () {
test()->login()->loginNami();
public function testItStoresSettings(): void
{
$this->login()->loginNami();
$this->post('/api/prevention', ['formmail' => EditorRequestFactory::new()->text(50, 'new lorem')->create()])->assertOk();
$this->assertTrue(app(PreventionSettings::class)->formmail->hasAll(['new lorem']));
}
}
$formmail = EditorRequestFactory::new()->text(50, 'new lorem')->create();
$yearlyMail = EditorRequestFactory::new()->text(50, 'lala dd')->create();
test()->post('/api/prevention', ['formmail' => $formmail, 'yearlymail' => $yearlyMail])->assertOk();
test()->assertTrue(app(PreventionSettings::class)->formmail->hasAll(['new lorem']));
test()->assertTrue(app(PreventionSettings::class)->yearlymail->hasAll(['lala dd']));
});