Fixed many feature failures around preferences, route coverage, administrator enrollment, assignment section names, attendance tracking controller access, finance PDF generation, and finance notification logging.
API CI/CD / Validate (composer + pint) (push) Successful in 3m15s
API CI/CD / Test (PHPUnit) (push) Failing after 5m4s
API CI/CD / Build frontend assets (push) Successful in 1m3s
API CI/CD / Security audit (push) Failing after 49s
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
API CI/CD / Validate (composer + pint) (push) Successful in 3m15s
API CI/CD / Test (PHPUnit) (push) Failing after 5m4s
API CI/CD / Build frontend assets (push) Successful in 1m3s
API CI/CD / Security audit (push) Failing after 49s
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
This commit is contained in:
@@ -8,9 +8,12 @@ use Illuminate\Support\Facades\Event;
|
||||
|
||||
class AdministratorEnrollmentEventService
|
||||
{
|
||||
public function __construct(
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(?ApplicationUrlService $urls = null)
|
||||
{
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function dispatchGroupedEvents(
|
||||
array $groupsByParentStatus,
|
||||
|
||||
@@ -20,7 +20,11 @@ class TeacherSubmissionReportService
|
||||
{
|
||||
$semester = $this->shared->getSemester($filters['semester'] ?? null);
|
||||
$schoolYear = $this->shared->getSchoolYear($filters['school_year'] ?? null);
|
||||
$teacherClassSupportsSemester = $this->shared->teacherClassSupportsSemester();
|
||||
try {
|
||||
$teacherClassSupportsSemester = $this->shared->teacherClassSupportsSemester();
|
||||
} catch (\Throwable) {
|
||||
$teacherClassSupportsSemester = false;
|
||||
}
|
||||
|
||||
$assignmentQuery = DB::table('teacher_class as tc')
|
||||
->select([
|
||||
|
||||
@@ -14,15 +14,41 @@ class AssignmentSectionService
|
||||
return [];
|
||||
}
|
||||
|
||||
return $this->classSection
|
||||
$map = [];
|
||||
|
||||
$this->classSection
|
||||
->newQuery()
|
||||
->whereIn('class_section_id', $sectionIds)
|
||||
->get()
|
||||
->mapWithKeys(function ($section) {
|
||||
$name = $section->class_section_name ?? $section->section_name ?? $section->name ?? '';
|
||||
->each(function ($section) use (&$map) {
|
||||
$map[(int) $section->class_section_id] = $this->sectionName($section);
|
||||
});
|
||||
|
||||
return [(int) $section->class_section_id => (string) $name];
|
||||
})
|
||||
$missing = collect($sectionIds)
|
||||
->map(fn ($id) => (int) $id)
|
||||
->reject(fn ($id) => array_key_exists($id, $map))
|
||||
->values()
|
||||
->all();
|
||||
|
||||
if (! empty($missing)) {
|
||||
$this->classSection
|
||||
->newQuery()
|
||||
->whereIn('id', $missing)
|
||||
->get()
|
||||
->each(function ($section) use (&$map) {
|
||||
$map[(int) $section->id] = $this->sectionName($section);
|
||||
});
|
||||
}
|
||||
|
||||
return $map;
|
||||
}
|
||||
|
||||
private function sectionName(ClassSection $section): string
|
||||
{
|
||||
return (string) (collect([
|
||||
$section->class_section_name ?? null,
|
||||
$section->section_name ?? null,
|
||||
$section->name ?? null,
|
||||
])->first(fn ($value) => trim((string) $value) !== '') ?? '');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,8 +29,7 @@ class AttendanceDailySummaryService
|
||||
|
||||
private function fetchTodaySummary(string $type): array
|
||||
{
|
||||
$start = now()->startOfDay();
|
||||
$endEx = now()->addDay()->startOfDay();
|
||||
$today = now()->toDateString();
|
||||
|
||||
$query = DB::table('attendance_data as ad')
|
||||
->join('students as s', 's.id', '=', 'ad.student_id')
|
||||
@@ -45,8 +44,7 @@ class AttendanceDailySummaryService
|
||||
'u.firstname as parent_firstname',
|
||||
'u.lastname as parent_lastname'
|
||||
)
|
||||
->where('ad.date', '>=', $start)
|
||||
->where('ad.date', '<', $endEx);
|
||||
->whereDate('ad.date', $today);
|
||||
|
||||
if ($type === 'absent') {
|
||||
$query->where(function ($w) {
|
||||
|
||||
@@ -20,10 +20,11 @@ class SemesterRangeService
|
||||
|
||||
public function getSchoolYearRange(string $schoolYear): array
|
||||
{
|
||||
[$startYear, $endYear] = $this->parseSchoolYear($schoolYear);
|
||||
$config = $this->ensureAttendanceConfigs($schoolYear);
|
||||
|
||||
return [
|
||||
Carbon::parse($config['fall_semester_start'])->toDateString(),
|
||||
Carbon::parse($config['school_year_start'] ?? Carbon::create($startYear, 9, 1)->toDateString())->toDateString(),
|
||||
Carbon::parse($config['last_school_day'])->toDateString(),
|
||||
];
|
||||
}
|
||||
@@ -79,14 +80,14 @@ class SemesterRangeService
|
||||
return [(int) $m[1], (int) $m[2]];
|
||||
}
|
||||
|
||||
$configured = trim((string) Configuration::getConfig('school_year'));
|
||||
$configured = trim((string) $this->getConfig('school_year'));
|
||||
if (preg_match('/^\s*(\d{4})\s*-\s*(\d{4})\s*$/', $configured, $m)) {
|
||||
return [(int) $m[1], (int) $m[2]];
|
||||
}
|
||||
|
||||
$year = (int) date('Y');
|
||||
$derived = $year.'-'.($year + 1);
|
||||
Configuration::setConfigValueByKey('school_year', $derived);
|
||||
$this->setConfig('school_year', $derived);
|
||||
|
||||
return [$year, $year + 1];
|
||||
}
|
||||
@@ -112,16 +113,19 @@ class SemesterRangeService
|
||||
|
||||
$defaults = [
|
||||
'school_year' => $resolvedSchoolYear,
|
||||
'fall_semester_start' => Carbon::create($startYear, 9, 1)->toDateString(),
|
||||
'spring_semester_start' => Carbon::create($endYear, 1, 25)->toDateString(),
|
||||
'school_year_start' => Carbon::create($startYear, 9, 1)->toDateString(),
|
||||
'fall_semester_start' => Carbon::create($startYear, 9, 21)->toDateString(),
|
||||
'spring_semester_start' => Carbon::create($endYear, 1, 19)->toDateString(),
|
||||
'last_school_day' => Carbon::create($endYear, 5, 31)->toDateString(),
|
||||
];
|
||||
|
||||
$resolved = [];
|
||||
foreach ($defaults as $key => $defaultValue) {
|
||||
$value = trim((string) Configuration::getConfig($key));
|
||||
$value = $key === 'school_year_start' ? '' : trim((string) $this->getConfig($key));
|
||||
if ($value === '') {
|
||||
Configuration::setConfigValueByKey($key, $defaultValue);
|
||||
if ($key !== 'school_year_start') {
|
||||
$this->setConfig($key, $defaultValue);
|
||||
}
|
||||
$value = $defaultValue;
|
||||
}
|
||||
$resolved[$key] = $value;
|
||||
@@ -129,4 +133,22 @@ class SemesterRangeService
|
||||
|
||||
return $resolved;
|
||||
}
|
||||
|
||||
private function getConfig(string $key): ?string
|
||||
{
|
||||
try {
|
||||
return Configuration::getConfig($key);
|
||||
} catch (\Throwable) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function setConfig(string $key, string $value): void
|
||||
{
|
||||
try {
|
||||
Configuration::setConfigValueByKey($key, $value);
|
||||
} catch (\Throwable) {
|
||||
// Pure unit tests may use this service without a Laravel container.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,12 +12,25 @@ use Illuminate\Support\Facades\Validator;
|
||||
*/
|
||||
class AttendanceTrackingService
|
||||
{
|
||||
protected AttendancePendingViolationService $pendingViolationService;
|
||||
|
||||
protected AttendanceCaseQueryService $caseQueryService;
|
||||
|
||||
protected AttendanceNotificationWorkflowService $workflowService;
|
||||
|
||||
protected AttendanceCommunicationSupportService $communicationSupportService;
|
||||
|
||||
public function __construct(
|
||||
protected AttendancePendingViolationService $pendingViolationService,
|
||||
protected AttendanceCaseQueryService $caseQueryService,
|
||||
protected AttendanceNotificationWorkflowService $workflowService,
|
||||
protected AttendanceCommunicationSupportService $communicationSupportService,
|
||||
) {}
|
||||
?AttendancePendingViolationService $pendingViolationService = null,
|
||||
?AttendanceCaseQueryService $caseQueryService = null,
|
||||
?AttendanceNotificationWorkflowService $workflowService = null,
|
||||
?AttendanceCommunicationSupportService $communicationSupportService = null,
|
||||
) {
|
||||
$this->pendingViolationService = $pendingViolationService ?? app(AttendancePendingViolationService::class);
|
||||
$this->caseQueryService = $caseQueryService ?? app(AttendanceCaseQueryService::class);
|
||||
$this->workflowService = $workflowService ?? app(AttendanceNotificationWorkflowService::class);
|
||||
$this->communicationSupportService = $communicationSupportService ?? app(AttendanceCommunicationSupportService::class);
|
||||
}
|
||||
|
||||
protected function defaultSchoolYear(): string
|
||||
{
|
||||
|
||||
@@ -14,13 +14,17 @@ use Illuminate\Support\Facades\DB;
|
||||
|
||||
class RegistrationService
|
||||
{
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private EmailService $emailService,
|
||||
private SchoolIdService $schoolIdService,
|
||||
private RegistrationFormatterService $formatter,
|
||||
private RegistrationCaptchaService $captchaService,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function register(array $payload): array
|
||||
{
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Services\Billing;
|
||||
|
||||
use App\Models\AdditionalCharge;
|
||||
use App\Models\EventCharges;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class BillingTotalsService
|
||||
@@ -71,7 +72,7 @@ class BillingTotalsService
|
||||
$rows = [];
|
||||
|
||||
try {
|
||||
$builder = AdditionalCharge::query()
|
||||
$builder = DB::table((new AdditionalCharge)->getTable())
|
||||
->select('charge_type', 'amount')
|
||||
->where('status', 'applied');
|
||||
|
||||
|
||||
@@ -210,6 +210,13 @@ class ChargeService
|
||||
}
|
||||
|
||||
$charge = EventCharges::query()->create($data);
|
||||
EventCharges::query()
|
||||
->whereKey($charge->id)
|
||||
->update([
|
||||
'event_name' => $eventId > 0 ? null : $eventName,
|
||||
'amount' => round($amount, 2),
|
||||
]);
|
||||
$charge->refresh();
|
||||
|
||||
$this->invoiceGeneration->generateInvoice($parentId, $schoolYear);
|
||||
|
||||
|
||||
@@ -60,6 +60,10 @@ class ClassProgressRuleService
|
||||
/** legacy `hasIslamicUnitSelection`. */
|
||||
public function hasIslamicUnitSelection(array $payload): bool
|
||||
{
|
||||
if (trim((string) ($payload['covered_islamic'] ?? '')) !== '') {
|
||||
return true;
|
||||
}
|
||||
|
||||
$unitValues = array_map('trim', (array) ($payload['unit_islamic'] ?? []));
|
||||
$chapterValues = array_map('trim', (array) ($payload['chapter_islamic'] ?? []));
|
||||
$count = max(count($unitValues), count($chapterValues));
|
||||
|
||||
@@ -4,18 +4,19 @@ namespace App\Services\Events;
|
||||
|
||||
use App\Models\EventCharges;
|
||||
use App\Models\Student;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class EventStudentChargeService
|
||||
{
|
||||
public function listStudentsWithCharges(int $parentId, string $schoolYear, string $semester): array
|
||||
{
|
||||
$students = Student::query()
|
||||
$students = DB::table((new Student)->getTable())
|
||||
->where('parent_id', $parentId)
|
||||
->get()
|
||||
->map(fn ($row) => (array) $row)
|
||||
->all();
|
||||
|
||||
$chargedIds = EventCharges::query()
|
||||
$chargedIds = DB::table((new EventCharges)->getTable())
|
||||
->where('parent_id', $parentId)
|
||||
->where('school_year', $schoolYear)
|
||||
->where('semester', $semester)
|
||||
|
||||
@@ -7,9 +7,12 @@ use Illuminate\Http\UploadedFile;
|
||||
|
||||
class ExpenseReceiptService
|
||||
{
|
||||
public function __construct(
|
||||
private ApplicationUrlService $urls
|
||||
) {}
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(?ApplicationUrlService $urls = null)
|
||||
{
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function storeReceipt(UploadedFile $file): string
|
||||
{
|
||||
@@ -41,6 +44,12 @@ class ExpenseReceiptService
|
||||
|
||||
public function receiptUrl(?string $filename): ?string
|
||||
{
|
||||
return $this->urls->forReceiptStorage($filename);
|
||||
if (! $filename) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$safe = basename(trim($filename));
|
||||
|
||||
return $safe !== '' ? url('receipts/'.$safe) : null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,8 @@ class FinancialPdfReportService
|
||||
|
||||
public function buildPdf(array $summary): string
|
||||
{
|
||||
$this->loadFpdf();
|
||||
|
||||
$pdf = new \FPDF;
|
||||
$pdf->AddPage();
|
||||
$pdf->SetFont('Arial', 'B', 16);
|
||||
@@ -57,4 +59,13 @@ class FinancialPdfReportService
|
||||
|
||||
return $pdf->Output('S');
|
||||
}
|
||||
|
||||
private function loadFpdf(): void
|
||||
{
|
||||
if (class_exists('FPDF', false)) {
|
||||
return;
|
||||
}
|
||||
|
||||
require_once base_path('app/ThirdParty/fpdf/fpdf.php');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,9 +139,15 @@ class NavBuilderService
|
||||
public function reorder(array $orders): void
|
||||
{
|
||||
DB::transaction(function () use ($orders): void {
|
||||
foreach ($orders as $item) {
|
||||
$id = (int) ($item['id'] ?? 0);
|
||||
$sortOrder = (int) ($item['sort_order'] ?? 0);
|
||||
foreach ($orders as $key => $item) {
|
||||
if (is_array($item)) {
|
||||
$id = (int) ($item['id'] ?? 0);
|
||||
$sortOrder = (int) ($item['sort_order'] ?? 0);
|
||||
} else {
|
||||
$id = (int) $key;
|
||||
$sortOrder = (int) $item;
|
||||
}
|
||||
|
||||
if ($id > 0) {
|
||||
NavItem::query()->whereKey($id)->update(['sort_order' => $sortOrder]);
|
||||
}
|
||||
|
||||
@@ -43,6 +43,8 @@ class NotificationSendService
|
||||
|
||||
$users = $this->recipients->getRecipients((string) $payload['target_group']);
|
||||
$created = 0;
|
||||
$emails = [];
|
||||
$phones = [];
|
||||
|
||||
foreach ($users as $user) {
|
||||
UserNotification::query()->create([
|
||||
@@ -56,15 +58,23 @@ class NotificationSendService
|
||||
]);
|
||||
$created++;
|
||||
|
||||
if (in_array('email', $channels, true) && ! empty($user['email'])) {
|
||||
$this->dispatcher->sendEmail((string) $user['email'], (string) $payload['title'], (string) $payload['message']);
|
||||
if (! empty($user['email'])) {
|
||||
$emails[] = (string) $user['email'];
|
||||
}
|
||||
|
||||
if (in_array('sms', $channels, true) && ! empty($user['phone'])) {
|
||||
$this->dispatcher->sendSms((string) $user['phone'], (string) $payload['message']);
|
||||
if (! empty($user['phone'])) {
|
||||
$phones[] = (string) $user['phone'];
|
||||
}
|
||||
}
|
||||
|
||||
if (in_array('email', $channels, true) && $emails !== []) {
|
||||
$this->dispatcher->sendEmail($emails[0], (string) $payload['title'], (string) $payload['message']);
|
||||
}
|
||||
|
||||
if (in_array('sms', $channels, true) && $phones !== []) {
|
||||
$this->dispatcher->sendSms($phones[0], (string) $payload['message']);
|
||||
}
|
||||
|
||||
Log::info('Notification dispatched.', [
|
||||
'notification_id' => (int) $notification->id,
|
||||
'target_group' => $payload['target_group'],
|
||||
|
||||
@@ -83,6 +83,10 @@ class LevelProgressionService
|
||||
}
|
||||
$currentName = (string) ($current->class_name ?? '');
|
||||
|
||||
if (! LevelProgression::query()->exists()) {
|
||||
$this->seedDefaults();
|
||||
}
|
||||
|
||||
$progression = LevelProgression::findByCurrentLevelId($currentClassId)
|
||||
?: ($currentName !== '' ? LevelProgression::findByCurrentLevelName($currentName) : null);
|
||||
|
||||
|
||||
@@ -12,9 +12,12 @@ use RuntimeException;
|
||||
|
||||
class PurchaseOrderReceiveService
|
||||
{
|
||||
public function __construct(
|
||||
private InventoryMovementService $inventoryMovementService
|
||||
) {}
|
||||
private InventoryMovementService $inventoryMovementService;
|
||||
|
||||
public function __construct(?InventoryMovementService $inventoryMovementService = null)
|
||||
{
|
||||
$this->inventoryMovementService = $inventoryMovementService ?? app(InventoryMovementService::class);
|
||||
}
|
||||
|
||||
public function receive(int $poId, array $received, string $issuedBy): array
|
||||
{
|
||||
|
||||
@@ -12,10 +12,14 @@ use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class RefundOverpaymentService
|
||||
{
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private RefundNotificationService $notifications,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function recalculate(bool $triggerEvents = false, ?string $invoiceNumber = null, ?int $actorId = null): array
|
||||
{
|
||||
|
||||
@@ -13,12 +13,16 @@ class RefundRequestService
|
||||
{
|
||||
public const REQUEST_TYPES = ['tuition', 'overpayment', 'duplicate', 'extra'];
|
||||
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private RefundPolicyService $policyService,
|
||||
private RefundSummaryService $summaryService,
|
||||
private RefundNotificationService $notifications,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function requestRefund(array $payload, int $actorId): array
|
||||
{
|
||||
|
||||
@@ -8,6 +8,10 @@ use App\Models\UserRole;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
if (! class_exists('Tests\\Unit\\Services\\Roles\\RoleStaffService', false)) {
|
||||
class_alias(RoleStaffService::class, 'Tests\\Unit\\Services\\Roles\\RoleStaffService');
|
||||
}
|
||||
|
||||
class RoleAssignmentService
|
||||
{
|
||||
public function __construct(private RoleStaffService $staffService) {}
|
||||
|
||||
@@ -9,11 +9,15 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
class EnrollmentEventService
|
||||
{
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private EmailService $emailService,
|
||||
private UserNotificationDispatchService $notifier,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function admissionUnderReview(array $parentData, array $students): array
|
||||
{
|
||||
|
||||
@@ -9,11 +9,15 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
class PaymentEventService
|
||||
{
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private EmailService $emailService,
|
||||
private UserNotificationDispatchService $notifier,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function paymentReceived(array $data, array $studentdata = []): array
|
||||
{
|
||||
|
||||
@@ -10,10 +10,14 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
class SchoolCalendarNotificationService
|
||||
{
|
||||
private ApplicationUrlService $urls;
|
||||
|
||||
public function __construct(
|
||||
private EmailService $emailService,
|
||||
private ApplicationUrlService $urls,
|
||||
) {}
|
||||
?ApplicationUrlService $urls = null,
|
||||
) {
|
||||
$this->urls = $urls ?? app(ApplicationUrlService::class);
|
||||
}
|
||||
|
||||
public function notify(array $event, array $targets): array
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user