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

Lint LetterRepository
continuous-integration/drone/push Build is passing Details

This commit is contained in:
philipp lang 2022-12-06 22:16:37 +01:00
parent 7ee4fe5166
commit b0f76b0ae2
3 changed files with 35 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Letter/Actions/LetterSendAction.php
View File

@ -32,7 +32,7 @@ class LetterSendAction
public function handle(): int
{
foreach (app(DocumentFactory::class)->types as $type) {
$letters = app(DocumentFactory::class)->repoCollection($type, 'E-Mail');
$letters = app(DocumentFactory::class)->letterCollection($type, 'E-Mail');
foreach ($letters as $letter) {
$letterPath = Storage::path(Tex::compile($letter)->storeIn('/tmp', 'local'));

68
app/Letter/DocumentFactory.php
View File

@ -34,16 +34,16 @@ class DocumentFactory
*/
public function fromSingleRequest(string $type, Member $member): ?Letter
{
$members = $this->singleMemberCollection($member, $type);
$members = $this->singleMemberPages($member, $type);
if ($members->isEmpty()) {
return null;
}
$repo = $this->resolve($type, $members);
$repo->setFilename(Str::slug("{$repo->getSubject()} für {$members->first()->singleName}"));
return $repo;
return tap(
$this->resolve($type, $members),
fn ($repo) => $repo->setFilename(Str::slug("{$repo->getSubject()} für {$members->first()->singleName}"))
);
}
/**
@ -51,32 +51,13 @@ class DocumentFactory
*/
public function forAll(string $type, string $billKind): ?Letter
{
$members = $this->toPages($this->allMemberCollection($type, $billKind));
$pages = $this->allMemberPages($type, $billKind);
if ($members->isEmpty()) {
if ($pages->isEmpty()) {
return null;
}
return $this->resolve($type, $members)->setFilename('alle-rechnungen');
}
/**
* @param class-string<Letter> $type
*
* @return Collection<int, Letter>
*/
public function repoCollection(string $type, string $billKind): Collection
{
$pages = $this->toPages($this->allMemberCollection($type, $billKind));
return $pages->map(fn ($page) => $this->resolve($type, collect([$page])));
}
public function afterSingle(Letter $repo): void
{
foreach ($repo->allPayments() as $payment) {
$repo->afterSingle($payment);
}
return tap($this->resolve($type, $pages), fn ($repo) => $repo->setFilename('alle-rechnungen'));
}
/**
@ -84,10 +65,27 @@ class DocumentFactory
*/
public function afterAll(string $type, string $billKind): void
{
$members = $this->allMemberCollection($type, $billKind);
$repo = $this->resolve($type, $this->toPages($members));
$letter = $this->forAll($type, $billKind);
$this->afterSingle($letter);
}
$this->afterSingle($repo);
/**
* @param class-string<Letter> $type
*
* @return Collection<int, Letter>
*/
public function letterCollection(string $type, string $billKind): Collection
{
$pages = $this->allMemberPages($type, $billKind);
return $pages->map(fn ($page) => $this->resolve($type, collect([$page])));
}
public function afterSingle(Letter $letter): void
{
foreach ($letter->allPayments() as $payment) {
$letter->afterSingle($payment);
}
}
/**
@ -95,7 +93,7 @@ class DocumentFactory
*
* @return Collection<int, Page>
*/
public function singleMemberCollection(Member $member, string $type): Collection
private function singleMemberPages(Member $member, string $type): Collection
{
$members = Member::where($member->only(['lastname', 'address', 'zip', 'location']))
->with([
@ -111,17 +109,19 @@ class DocumentFactory
/**
* @param class-string<Letter> $type
*
* @return EloquentCollection<Member>
* @return Collection<int, Page>
*/
private function allMemberCollection(string $type, string $billKind): Collection
private function allMemberPages(string $type, string $billKind): Collection
{
return Member::whereHas('billKind', fn (Builder $q) => $q->where('name', $billKind))
$members = Member::whereHas('billKind', fn (Builder $q) => $q->where('name', $billKind))
->with([
'payments' => fn ($query) => $type::paymentsQuery($query)
->orderByRaw('nr, member_id'),
])
->get()
->filter(fn (Member $member) => $member->payments->count() > 0);
return $this->toPages($members);
}
/**

30
phpstan.neon
View File

@ -414,36 +414,6 @@ parameters:
count: 1
path: tests/Feature/Member/StoreTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:generatorProvider\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:setupMembers\\(\\) has parameter \\$members with no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:testItGeneratesAPdf\\(\\) has parameter \\$members with no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:testItGeneratesAPdf\\(\\) has parameter \\$output with no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:testItGeneratesTheLayout\\(\\) has parameter \\$members with no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^Method Tests\\\\Feature\\\\Pdf\\\\GenerateTest\\:\\:testItGeneratesTheLayout\\(\\) has parameter \\$output with no value type specified in iterable type array\\.$#"
count: 1
path: tests/Feature/Pdf/GenerateTest.php
-
message: "#^PHPDoc tag @param has invalid value \\(\\<class\\-string\\> \\$class\\)\\: Unexpected token \"\\<\", expected type at offset 18$#"
count: 1