add tests batch 20
This commit is contained in:
@@ -13,7 +13,8 @@ class EnrollmentEventService
|
||||
private EmailService $emailService,
|
||||
private UserNotificationDispatchService $notifier,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
) {
|
||||
}
|
||||
|
||||
public function admissionUnderReview(array $parentData, array $students): array
|
||||
{
|
||||
@@ -178,7 +179,7 @@ class EnrollmentEventService
|
||||
'parentName' => $parentName,
|
||||
'studentName' => $studentName,
|
||||
'withdrawalDate' => $parentData['withdrawal_date'] ?? ($parentData['date'] ?? ''),
|
||||
'withdrawals' => ! empty($withdrawals) ? $withdrawals : null,
|
||||
'withdrawals' => !empty($withdrawals) ? $withdrawals : null,
|
||||
'portalLink' => $parentData['portalLink'] ?? $this->urls->webLoginUrl(),
|
||||
'title' => 'Withdrawal Confirmed',
|
||||
];
|
||||
@@ -277,16 +278,16 @@ class EnrollmentEventService
|
||||
|
||||
private function parentName(array $parentData): string
|
||||
{
|
||||
return trim((string) ($parentData['firstname'] ?? '').' '.(string) ($parentData['lastname'] ?? ''));
|
||||
return trim((string) ($parentData['firstname'] ?? '') . ' ' . (string) ($parentData['lastname'] ?? ''));
|
||||
}
|
||||
|
||||
private function studentNameData(array $studentdata, array $parentData)
|
||||
{
|
||||
$names = [];
|
||||
foreach ($studentdata as $s) {
|
||||
$nm = ! empty($s['name'])
|
||||
$nm = !empty($s['name'])
|
||||
? trim((string) $s['name'])
|
||||
: trim((string) ($s['firstname'] ?? '').' '.(string) ($s['lastname'] ?? ''));
|
||||
: trim((string) ($s['firstname'] ?? '') . ' ' . (string) ($s['lastname'] ?? ''));
|
||||
if ($nm !== '') {
|
||||
$names[] = $nm;
|
||||
}
|
||||
@@ -298,7 +299,6 @@ class EnrollmentEventService
|
||||
if (count($names) === 1) {
|
||||
return $names[0];
|
||||
}
|
||||
|
||||
return $names;
|
||||
}
|
||||
|
||||
@@ -306,9 +306,9 @@ class EnrollmentEventService
|
||||
{
|
||||
$names = [];
|
||||
foreach ($studentdata as $s) {
|
||||
$nm = ! empty($s['name'])
|
||||
$nm = !empty($s['name'])
|
||||
? trim((string) $s['name'])
|
||||
: trim((string) ($s['firstname'] ?? '').' '.(string) ($s['lastname'] ?? ''));
|
||||
: trim((string) ($s['firstname'] ?? '') . ' ' . (string) ($s['lastname'] ?? ''));
|
||||
if ($nm !== '') {
|
||||
$names[] = $nm;
|
||||
}
|
||||
@@ -321,20 +321,19 @@ class EnrollmentEventService
|
||||
return $names[0];
|
||||
}
|
||||
if (count($names) === 2) {
|
||||
return $names[0].' and '.$names[1];
|
||||
return $names[0] . ' and ' . $names[1];
|
||||
}
|
||||
$last = array_pop($names);
|
||||
|
||||
return implode(', ', $names).', and '.$last;
|
||||
return implode(', ', $names) . ', and ' . $last;
|
||||
}
|
||||
|
||||
private function studentDetails(array $studentdata): array
|
||||
{
|
||||
$details = [];
|
||||
foreach ($studentdata as $s) {
|
||||
$nm = ! empty($s['name'])
|
||||
$nm = !empty($s['name'])
|
||||
? trim((string) $s['name'])
|
||||
: trim((string) ($s['firstname'] ?? '').' '.(string) ($s['lastname'] ?? ''));
|
||||
: trim((string) ($s['firstname'] ?? '') . ' ' . (string) ($s['lastname'] ?? ''));
|
||||
if ($nm === '') {
|
||||
continue;
|
||||
}
|
||||
@@ -346,7 +345,6 @@ class EnrollmentEventService
|
||||
'startDate' => $s['start_date'] ?? '',
|
||||
];
|
||||
}
|
||||
|
||||
return $details;
|
||||
}
|
||||
|
||||
@@ -354,9 +352,9 @@ class EnrollmentEventService
|
||||
{
|
||||
$withdrawals = [];
|
||||
foreach ($studentdata as $s) {
|
||||
$nm = ! empty($s['name'])
|
||||
$nm = !empty($s['name'])
|
||||
? trim((string) $s['name'])
|
||||
: trim((string) ($s['firstname'] ?? '').' '.(string) ($s['lastname'] ?? ''));
|
||||
: trim((string) ($s['firstname'] ?? '') . ' ' . (string) ($s['lastname'] ?? ''));
|
||||
if ($nm === '') {
|
||||
continue;
|
||||
}
|
||||
@@ -368,7 +366,6 @@ class EnrollmentEventService
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
return $withdrawals;
|
||||
}
|
||||
|
||||
@@ -376,9 +373,9 @@ class EnrollmentEventService
|
||||
{
|
||||
$rows = [];
|
||||
foreach ($studentdata as $s) {
|
||||
$nm = ! empty($s['name'])
|
||||
$nm = !empty($s['name'])
|
||||
? trim((string) $s['name'])
|
||||
: trim((string) ($s['firstname'] ?? '').' '.(string) ($s['lastname'] ?? ''));
|
||||
: trim((string) ($s['firstname'] ?? '') . ' ' . (string) ($s['lastname'] ?? ''));
|
||||
if ($nm === '') {
|
||||
continue;
|
||||
}
|
||||
@@ -387,7 +384,6 @@ class EnrollmentEventService
|
||||
'reason' => $s['reason'] ?? null,
|
||||
];
|
||||
}
|
||||
|
||||
return $rows;
|
||||
}
|
||||
|
||||
@@ -403,15 +399,13 @@ class EnrollmentEventService
|
||||
{
|
||||
if ($to === '') {
|
||||
Log::warning('Enrollment event: missing recipient email', ['subject' => $subject]);
|
||||
|
||||
return ['ok' => false, 'message' => 'Missing recipient email.'];
|
||||
}
|
||||
|
||||
$ok = $this->emailService->send($to, $subject, $html, $fromKey);
|
||||
if (! $ok) {
|
||||
if (!$ok) {
|
||||
Log::error('Enrollment event email failed', ['to' => $to, 'subject' => $subject]);
|
||||
}
|
||||
|
||||
return ['ok' => $ok];
|
||||
}
|
||||
|
||||
@@ -419,6 +413,6 @@ class EnrollmentEventService
|
||||
{
|
||||
Log::debug('Skipping Blade email template', ['view' => $viewName]);
|
||||
|
||||
return '<p>'.e($fallbackTitle).'</p>';
|
||||
return '<p>' . e($fallbackTitle) . '</p>';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user