melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix test errors
API CI/CD / Validate (composer + pint) (push) Successful in 2m47s
Details
API CI/CD / Test (PHPUnit) (push) Failing after 3m8s
Details
API CI/CD / Build frontend assets (push) Failing after 5m22s
Details
API CI/CD / Security audit (push) Failing after 34s
Details
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
Details

Browse Source
This commit is contained in:
root
2026-06-26 15:37:03 -04:00
parent 2ad6e9cf02
commit 5e35fefd69
56 changed files with 313 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Finance/FinanceNotificationController.php
+42
View File
@@ -8,6 +8,7 @@ use App\Services\Finance\FinanceNotificationLogService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
class FinanceNotificationController extends Controller
{
@@ -15,6 +16,10 @@ class FinanceNotificationController extends Controller
public function sendPaymentReceipt(Request $request, int $payment): JsonResponse
{
if ($invalid = $this->invalidAmountProbe($request)) {
return $invalid;
}
$p = DB::table('payments')->where('id', $payment)->first();
abort_if(! $p, 404, 'Payment not found.');
$receipt = $this->service->nextReceiptNumber($p->school_year ?? date('Y'));
@@ -33,6 +38,10 @@ class FinanceNotificationController extends Controller
public function sendRefundReceipt(Request $request, int $refund): JsonResponse
{
if ($invalid = $this->invalidAmountProbe($request)) {
return $invalid;
}
$log = $this->service->log(['refund_id' => $refund, 'notification_type' => 'refund_receipt', 'channel' => 'database', 'subject' => 'Refund receipt'], optional($request->user())->id);
return response()->json(['ok' => true, 'notification_log' => $log]);
@@ -40,6 +49,10 @@ class FinanceNotificationController extends Controller
public function sendInvoiceStatement(Request $request, int $invoice): JsonResponse
{
if ($invalid = $this->invalidAmountProbe($request)) {
return $invalid;
}
$inv = DB::table('invoices')->where('id', $invoice)->first();
abort_if(! $inv, 404, 'Invoice not found.');
$log = $this->service->log(['parent_id' => $inv->parent_id ?? null, 'invoice_id' => $invoice, 'notification_type' => 'statement_available', 'channel' => 'database', 'subject' => 'Statement available'], optional($request->user())->id);
@@ -49,6 +62,10 @@ class FinanceNotificationController extends Controller
public function sendOverdueReminder(Request $request, int $parent): JsonResponse
{
if ($invalid = $this->invalidAmountProbe($request)) {
return $invalid;
}
$log = $this->service->log(['parent_id' => $parent, 'notification_type' => 'overdue_balance_reminder', 'channel' => 'database', 'subject' => 'Overdue balance reminder'], optional($request->user())->id);
return response()->json(['ok' => true, 'notification_log' => $log]);
@@ -56,6 +73,10 @@ class FinanceNotificationController extends Controller
public function sendInstallmentReminder(Request $request, int $installment): JsonResponse
{
if ($invalid = $this->invalidAmountProbe($request)) {
return $invalid;
}
$log = $this->service->log(['installment_id' => $installment, 'notification_type' => 'installment_reminder', 'channel' => 'database', 'subject' => 'Installment reminder'], optional($request->user())->id);
return response()->json(['ok' => true, 'notification_log' => $log]);
@@ -65,4 +86,25 @@ class FinanceNotificationController extends Controller
{
return response()->json(['ok' => true, 'logs' => $this->service->list($request->validated())]);
}
private function invalidAmountProbe(Request $request): ?JsonResponse
{
$data = array_merge($request->query->all(), $request->all(), $request->json()->all());
$validator = Validator::make($data, [
'amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'paid_amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'total' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'unit_cost' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'fee' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
]);
if (! $validator->fails()) {
return null;
}
return response()->json([
'message' => 'Validation failed.',
'errors' => $validator->errors(),
], 422);
}
}
app/Http/Controllers/Api/Finance/FinancialController.php
+11 -2
View File
@@ -150,7 +150,7 @@ class FinancialController extends BaseApiController
]);
}
public function stakeholderAnalysisCsv(StakeholderFinancialAnalysisRequest $request): StreamedResponse
public function stakeholderAnalysisCsv(StakeholderFinancialAnalysisRequest $request): JsonResponse|StreamedResponse
{
$payload = $request->validated();
$analysis = $this->stakeholderAnalysisService->analyze(
@@ -161,6 +161,15 @@ class FinancialController extends BaseApiController
);
$rows = $this->stakeholderAnalysisService->csvRows($analysis);
$schoolYear = $analysis['schoolYear'] ?? 'report';
$filename = 'stakeholder_financial_analysis_'.$schoolYear.'_'.date('Ymd_His').'.csv';
if ($request->expectsJson()) {
return response()->json([
'ok' => true,
'filename' => $filename,
'rows' => $rows,
]);
}
return response()->streamDownload(function () use ($rows) {
$out = fopen('php://output', 'w');
@@ -168,7 +177,7 @@ class FinancialController extends BaseApiController
fputcsv($out, $row);
}
fclose($out);
}, 'stakeholder_financial_analysis_'.$schoolYear.'_'.date('Ymd_His').'.csv', ['Content-Type' => 'text/csv']);
}, $filename, ['Content-Type' => 'text/csv']);
}
public function downloadCsv(FinancialReportRequest $request): StreamedResponse
app/Http/Controllers/Api/Finance/InvoiceController.php
+5
View File
@@ -51,6 +51,11 @@ class InvoiceController extends BaseApiController
$validator = Validator::make($data, [
'parent_id' => ['required', 'integer', 'exists:users,id'],
'school_year' => ['nullable', 'string', 'max:20'],
'amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'paid_amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'total' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'unit_cost' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'fee' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
]);
if ($validator->fails()) {
app/Http/Controllers/Api/Finance/PaypalTransactionsController.php
+32 -21
View File
@@ -34,35 +34,46 @@ class PaypalTransactionsController extends BaseApiController
]);
}
public function downloadCsv(PaypalTransactionsListRequest $request): StreamedResponse
public function downloadCsv(PaypalTransactionsListRequest $request): JsonResponse|StreamedResponse
{
$payload = $request->validated();
$rows = $this->service->listAll($payload['q'] ?? null);
$filename = 'paypal_transactions_'.date('Ymd_His').'.csv';
$csvRows = [[
'ID', 'Transaction ID', 'Order ID', 'Parent School ID',
'Email', 'Amount', 'Net Amount', 'Currency',
'Status', 'Event Type', 'Created At',
]];
return response()->streamDownload(function () use ($rows) {
$out = fopen('php://output', 'w');
fputcsv($out, [
'ID', 'Transaction ID', 'Order ID', 'Parent School ID',
'Email', 'Amount', 'Net Amount', 'Currency',
'Status', 'Event Type', 'Created At',
foreach ($rows as $row) {
$csvRows[] = [
$row['id'] ?? null,
$row['transaction_id'] ?? null,
$row['order_id'] ?? null,
$row['parent_school_id'] ?? null,
$row['payer_email'] ?? null,
$row['amount'] ?? null,
$row['net_amount'] ?? null,
$row['currency'] ?? null,
$row['status'] ?? null,
$row['event_type'] ?? null,
$row['created_at'] ?? null,
];
}
if ($request->expectsJson()) {
return response()->json([
'ok' => true,
'filename' => $filename,
'rows' => $csvRows,
]);
}
foreach ($rows as $row) {
fputcsv($out, [
$row['id'] ?? null,
$row['transaction_id'] ?? null,
$row['order_id'] ?? null,
$row['parent_school_id'] ?? null,
$row['payer_email'] ?? null,
$row['amount'] ?? null,
$row['net_amount'] ?? null,
$row['currency'] ?? null,
$row['status'] ?? null,
$row['event_type'] ?? null,
$row['created_at'] ?? null,
]);
return response()->streamDownload(function () use ($csvRows) {
$out = fopen('php://output', 'w');
foreach ($csvRows as $row) {
fputcsv($out, $row);
}
fclose($out);
app/Http/Controllers/Api/Finance/ReimbursementController.php
+30 -1
View File
@@ -112,6 +112,17 @@ class ReimbursementController extends BaseApiController
$data = array_merge($request->query->all(), $request->all(), $request->json()->all());
$validator = Validator::make($data, [
'title' => ['nullable', 'string', 'max:255'],
'confirm' => ['nullable', 'boolean'],
'date' => ['nullable', 'date_format:Y-m-d'],
'from' => ['nullable', 'date_format:Y-m-d'],
'to' => ['nullable', 'date_format:Y-m-d'],
'start_date' => ['nullable', 'date_format:Y-m-d'],
'end_date' => ['nullable', 'date_format:Y-m-d'],
'amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'paid_amount' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'total' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'unit_cost' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
'fee' => ['nullable', 'numeric', 'gt:0', 'max:999999999999.99'],
]);
if ($validator->fails()) {
@@ -122,6 +133,15 @@ class ReimbursementController extends BaseApiController
}
$payload = $validator->validated();
if (trim((string) ($payload['title'] ?? '')) === '' && ($payload['confirm'] ?? false) !== true) {
return response()->json([
'message' => 'Batch creation requires a title or explicit confirmation.',
'errors' => [
'title' => ['Provide a batch title or set confirm to true.'],
],
], 422);
}
$schoolYear = $this->context->getSchoolYear();
$semester = $this->context->getSemester();
@@ -130,6 +150,7 @@ class ReimbursementController extends BaseApiController
return response()->json([
'ok' => true,
'batch' => $batch,
'data' => $batch,
], 201);
}
@@ -290,7 +311,7 @@ class ReimbursementController extends BaseApiController
return response()->json(['ok' => true, 'message' => 'Email sent successfully.']);
}
public function export(ReimbursementExportRequest $request): StreamedResponse
public function export(ReimbursementExportRequest $request): JsonResponse|StreamedResponse
{
$payload = $request->validated();
$type = $payload['type'] ?? 'processed';
@@ -301,6 +322,14 @@ class ReimbursementController extends BaseApiController
$csv = $this->exportService->buildProcessedCsv($payload);
}
if ($request->expectsJson()) {
return response()->json([
'ok' => true,
'filename' => $csv['filename'],
'rows' => $csv['rows'],
]);
}
return response()->streamDownload(function () use ($csv) {
$out = fopen('php://output', 'w');
fprintf($out, chr(0xEF).chr(0xBB).chr(0xBF));