fix apply the plan docs/alrahma_api_fix_plan_school_year_only_v7
API CI/CD / Validate (composer + pint) (push) Successful in 3m10s
API CI/CD / Test (PHPUnit) (push) Failing after 6m49s
API CI/CD / Build frontend assets (push) Successful in 1m3s
API CI/CD / Security audit (push) Failing after 1m0s
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
API CI/CD / Validate (composer + pint) (push) Successful in 3m10s
API CI/CD / Test (PHPUnit) (push) Failing after 6m49s
API CI/CD / Build frontend assets (push) Successful in 1m3s
API CI/CD / Security audit (push) Failing after 1m0s
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
This commit is contained in:
@@ -8,6 +8,7 @@ use App\Http\Requests\SchoolYears\PreviewCloseSchoolYearRequest;
|
||||
use App\Http\Requests\SchoolYears\SaveSchoolYearRequest;
|
||||
use App\Services\SchoolYears\SchoolYearClosureService;
|
||||
use App\Services\SchoolYears\SchoolYearContextService;
|
||||
use App\Services\SchoolYears\SelectedSchoolYearContextService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
@@ -17,7 +18,8 @@ class SchoolYearController extends BaseApiController
|
||||
{
|
||||
public function __construct(
|
||||
private SchoolYearClosureService $service,
|
||||
private SchoolYearContextService $context
|
||||
private SchoolYearContextService $context,
|
||||
private SelectedSchoolYearContextService $selectedSchoolYear
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
@@ -71,11 +73,28 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function updateSelected(SaveSchoolYearRequest $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->updateYear($selected->id, $request->validated(), $this->getCurrentUserId()),
|
||||
]);
|
||||
}
|
||||
|
||||
public function summary(int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json(['ok' => true, 'data' => $this->service->summary($schoolYear)]);
|
||||
}
|
||||
|
||||
public function summarySelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json(['ok' => true, 'data' => $this->service->summaryByYearName($selected->name)]);
|
||||
}
|
||||
|
||||
public function validateClose(PreviewCloseSchoolYearRequest $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -84,6 +103,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function validateCloseSelected(PreviewCloseSchoolYearRequest $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'validation' => $this->service->validateCloseByYearName($selected->name, $request->validated()),
|
||||
]);
|
||||
}
|
||||
|
||||
public function previewClose(PreviewCloseSchoolYearRequest $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -92,6 +121,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function previewCloseSelected(PreviewCloseSchoolYearRequest $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->previewCloseByYearName($selected->name, $request->validated()),
|
||||
]);
|
||||
}
|
||||
|
||||
public function close(CloseSchoolYearRequest $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
try {
|
||||
@@ -108,6 +147,24 @@ class SchoolYearController extends BaseApiController
|
||||
return response()->json(['ok' => true, 'data' => $result]);
|
||||
}
|
||||
|
||||
public function closeSelected(CloseSchoolYearRequest $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
try {
|
||||
$result = $this->service->closeByYearName($selected->name, $request->validated(), $this->getCurrentUserId());
|
||||
} catch (ValidationException $e) {
|
||||
throw $e;
|
||||
} catch (\Throwable $e) {
|
||||
return response()->json([
|
||||
'ok' => false,
|
||||
'message' => $e->getMessage(),
|
||||
], Response::HTTP_CONFLICT);
|
||||
}
|
||||
|
||||
return response()->json(['ok' => true, 'data' => $result]);
|
||||
}
|
||||
|
||||
public function reopen(Request $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -116,6 +173,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function reopenSelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->reopenByYearName($selected->name, $this->getCurrentUserId()),
|
||||
]);
|
||||
}
|
||||
|
||||
public function parentBalances(Request $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -124,6 +191,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function parentBalancesSelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->parentBalancesByYearName($selected->name, $request->query('to_school_year')),
|
||||
]);
|
||||
}
|
||||
|
||||
public function promotionPreview(Request $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -132,6 +209,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function promotionPreviewSelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->promotionPreviewByYearName($selected->name, $request->query('to_school_year')),
|
||||
]);
|
||||
}
|
||||
|
||||
public function closingReport(int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -140,6 +227,16 @@ class SchoolYearController extends BaseApiController
|
||||
]);
|
||||
}
|
||||
|
||||
public function closingReportSelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->closingReportByYearName($selected->name),
|
||||
]);
|
||||
}
|
||||
|
||||
public function archive(Request $request, int $schoolYear): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
@@ -147,4 +244,14 @@ class SchoolYearController extends BaseApiController
|
||||
'data' => $this->service->archive($schoolYear, $this->getCurrentUserId()),
|
||||
]);
|
||||
}
|
||||
|
||||
public function archiveSelected(Request $request): JsonResponse
|
||||
{
|
||||
$selected = $this->selectedSchoolYear->fromRequest($request);
|
||||
|
||||
return response()->json([
|
||||
'ok' => true,
|
||||
'data' => $this->service->archiveByYearName($selected->name, $this->getCurrentUserId()),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user