KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

DONE: drop table shoraka financings, and improve UI checking on shoraka order status

Browse Source
This commit is contained in:
ISMAIL MASSERAN
2026-10-26 15:04:43 +08:00
parent e3e7694b54
commit 8dd8def358
10 changed files with 95 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ShorakaController.php
+58
View File
@@ -12,6 +12,61 @@ use Throwable;
class ShorakaController extends Controller
{
public function index(Request $request)
{
$this->validate($request, [
'kodcaw' => 'nullable|string|max:30',
'norujukan' => 'nullable|string|max:100',
'status' => 'nullable|string|max:30',
'date_from' => 'nullable|date_format:Y-m-d',
'date_to' => 'nullable|date_format:Y-m-d',
'per_page' => 'nullable|integer|min:1|max:100',
'page' => 'nullable|integer|min:1',
'branch_scope' => 'nullable|string|max:30',
]);
$query = ShorakaTransaction::query();
foreach (['kodcaw', 'norujukan', 'status'] as $field) {
if ($request->filled($field)) {
$query->where($field, $request->input($field));
}
}
if ($request->filled('date_from')) {
$query->where('created_at', '>=', $request->input('date_from') . ' 00:00:00');
}
if ($request->filled('date_to')) {
$query->where('created_at', '<', Carbon::parse($request->input('date_to'))->addDay()->format('Y-m-d') . ' 00:00:00');
}
$records = $query->orderByDesc('created_at')->orderByDesc('id')
->paginate(min(100, max(1, (int) $request->input('per_page', 25))));
$payload = [
'data' => $records->getCollection()->map(function (ShorakaTransaction $record) {
return [
'id' => $record->id,
'kodcaw' => $record->kodcaw,
'norujukan' => $record->norujukan,
'teller' => $record->teller,
'status' => $record->status,
'order_id' => $record->order_id,
'created_at' => optional($record->created_at)->toDateTimeString(),
'updated_at' => optional($record->updated_at)->toDateTimeString(),
];
})->values(),
'total' => $records->total(),
'current_page' => $records->currentPage(),
'per_page' => $records->perPage(),
'last_page' => $records->lastPage(),
];
if ($request->input('with_branches')) {
$branches = ShorakaTransaction::query()->whereNotNull('kodcaw');
if ($request->filled('branch_scope')) {
$branches->where('kodcaw', $request->input('branch_scope'));
}
$payload['branches'] = $branches->distinct()->orderBy('kodcaw')->pluck('kodcaw')->values();
}
return response()->json($payload);
}
public function submit(Request $request, ShorakaService $shoraka)
{
$validated = $this->validate($request, [
@@ -20,6 +75,7 @@ class ShorakaController extends Controller
'order_amount' => 'required|numeric|min:0.01|max:9999999999999.99',
'murabaha_amount' => 'required|numeric|min:0.01|max:9999999999999.99',
'tenor_other' => 'required|integer|min:1',
'teller' => 'nullable|string|max:255',
]);
if (!$shoraka->configured()) {
return $this->unconfigured();
@@ -51,6 +107,7 @@ class ShorakaController extends Controller
$attributes = [
'norujukan' => $validated['norujukan'],
'kodcaw' => $request->attributes->get('shoraka_kodcaw'),
'teller' => $validated['teller'] ?? null,
'status' => 'PENDING',
'product_type' => $payload['product_type'],
'commodity_type' => $payload['commodity_type'],
@@ -185,6 +242,7 @@ class ShorakaController extends Controller
return [
'norujukan' => $transaction->norujukan,
'kodcaw' => $transaction->kodcaw,
'teller' => $transaction->teller,
'order_id' => $transaction->order_id,
'status' => $transaction->status,
'certificate_url' => $transaction->certificate_url,
app/Http/Controllers/ShorakaFinancingController.php
-168
View File
@@ -1,168 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\ShorakaFinancing;
use Carbon\Carbon;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
class ShorakaFinancingController extends Controller
{
public function index(Request $request)
{
$this->validate($request, [
'kodcaw' => 'nullable|string|max:30',
'norujukan' => 'nullable|string|max:100',
'state' => 'nullable|in:WAITING,PROCESSING,REVIEW,DONE',
'date_from' => 'nullable|date_format:Y-m-d',
'date_to' => 'nullable|date_format:Y-m-d',
'per_page' => 'nullable|integer|min:1|max:100',
'page' => 'nullable|integer|min:1',
'branch_scope' => 'nullable|string|max:30',
]);
try {
$query = ShorakaFinancing::query();
foreach (['kodcaw', 'norujukan', 'state'] as $field) {
if ($request->filled($field)) {
$query->where($field, $request->input($field));
}
}
if ($request->filled('date_from')) {
$query->where('created_at', '>=', $request->input('date_from') . ' 00:00:00');
}
if ($request->filled('date_to')) {
$query->where('created_at', '<', Carbon::parse($request->input('date_to'))->addDay()->format('Y-m-d') . ' 00:00:00');
}
$records = $query->orderByDesc('created_at')->orderByDesc('id')
->paginate(min(100, max(1, (int) $request->input('per_page', 25))));
$payload = [
'data' => $records->getCollection()->map(function (ShorakaFinancing $record) {
return $this->present($record, false);
})->values(),
'total' => $records->total(),
'current_page' => $records->currentPage(),
'per_page' => $records->perPage(),
'last_page' => $records->lastPage(),
];
if ($request->input('with_branches')) {
$branches = ShorakaFinancing::query();
if ($request->filled('branch_scope')) {
$branches->where('kodcaw', $request->input('branch_scope'));
}
$payload['branches'] = $branches->distinct()->orderBy('kodcaw')->pluck('kodcaw')->values();
}
return response()->json($payload);
} catch (QueryException $exception) {
return $this->unavailable();
}
}
public function show(string $kodcaw, string $norujukan)
{
try {
$record = $this->find($kodcaw, $norujukan);
} catch (QueryException $exception) {
return $this->unavailable();
}
if (!$record) {
return response()->json(['message' => 'Rekod pembiayaan tidak dijumpai.'], 404);
}
return response()->json(['data' => $this->present($record)]);
}
public function store(string $kodcaw, string $norujukan, Request $request)
{
$this->validate($request, [
'teller' => 'required|string|max:255',
'action' => 'required|string|max:30',
'context' => 'present|array',
]);
try {
$existing = $this->find($kodcaw, $norujukan);
if ($existing) {
return response()->json(['created' => false, 'data' => $this->present($existing)]);
}
$record = ShorakaFinancing::create([
'kodcaw' => $kodcaw,
'norujukan' => $norujukan,
'teller' => $request->input('teller'),
'action' => $request->input('action'),
'state' => 'WAITING',
'context' => $request->input('context'),
]);
return response()->json(['created' => true, 'data' => $this->present($record)], 201);
} catch (QueryException $exception) {
try {
$existing = $this->find($kodcaw, $norujukan);
} catch (QueryException $again) {
return $this->unavailable();
}
if ($existing) {
return response()->json(['created' => false, 'data' => $this->present($existing)]);
}
return $this->unavailable();
}
}
public function update(string $kodcaw, string $norujukan, Request $request)
{
$this->validate($request, [
'state' => 'required|in:WAITING,PROCESSING,REVIEW,DONE',
'expected_state' => 'nullable|in:WAITING,PROCESSING,REVIEW,DONE',
'context' => 'nullable|array',
]);
try {
$record = $this->find($kodcaw, $norujukan);
if (!$record) {
return response()->json(['message' => 'Rekod pembiayaan tidak dijumpai.'], 404);
}
if ($request->filled('expected_state')) {
$claimed = ShorakaFinancing::where('id', $record->id)
->where('state', $request->input('expected_state'))
->update(['state' => $request->input('state'), 'updated_at' => Carbon::now()]);
return response()->json([
'claimed' => $claimed === 1,
'data' => $this->present($record->fresh()),
]);
}
$fields = ['state' => $request->input('state')];
if ($request->exists('context')) {
$fields['context'] = $request->input('context') ?? [];
}
$record->update($fields);
return response()->json(['claimed' => true, 'data' => $this->present($record->fresh())]);
} catch (QueryException $exception) {
return $this->unavailable();
}
}
private function find(string $kodcaw, string $norujukan): ?ShorakaFinancing
{
return ShorakaFinancing::where('kodcaw', $kodcaw)->where('norujukan', $norujukan)->first();
}
private function present(ShorakaFinancing $record, bool $withContext = true): array
{
$data = [
'id' => $record->id,
'kodcaw' => $record->kodcaw,
'norujukan' => $record->norujukan,
'teller' => $record->teller,
'action' => $record->action,
'state' => $record->state,
'created_at' => optional($record->created_at)->toDateTimeString(),
'updated_at' => optional($record->updated_at)->toDateTimeString(),
];
if ($withContext) {
$data['context'] = $record->context ?? [];
}
return $data;
}
private function unavailable()
{
return response()->json(['message' => 'Rekod pembiayaan Shoraka tidak tersedia.'], 503);
}
}
app/Http/Controllers/ShorakaGadaiController.php
+10 -5
View File
@@ -12,7 +12,7 @@ class ShorakaGadaiController extends ShorakaController
public function readiness(ShorakaService $shoraka)
{
try {
\App\ShorakaFinancing::query()->limit(1)->exists();
\App\ShorakaTransaction::query()->limit(1)->exists();
$storeReady = true;
} catch (\Throwable $exception) {
$storeReady = false;
@@ -39,7 +39,7 @@ class ShorakaGadaiController extends ShorakaController
]);
}
public function submitGadai(string $kodcaw, string $norujukan, ShorakaGadaiService $gadaiService, ShorakaService $shoraka)
public function submitGadai(string $kodcaw, string $norujukan, Request $request, ShorakaGadaiService $gadaiService, ShorakaService $shoraka)
{
$gadai = $gadaiService->gadai($kodcaw, $norujukan);
$existing = $gadaiService->transaction($kodcaw, $norujukan);
@@ -51,9 +51,14 @@ class ShorakaGadaiController extends ShorakaController
|| $gadai->cetak || $gadai->sttebus) {
abort(409, 'Gadaian lama atau telah selesai tidak boleh dihantar sebagai order baharu.');
}
$request = new Request($gadaiService->payload($gadai));
$request->attributes->set('shoraka_kodcaw', $kodcaw);
return $this->submit($request, $shoraka);
$payload = $gadaiService->payload($gadai);
$teller = $request->input('teller');
if (is_string($teller) && $teller !== '') {
$payload['teller'] = $teller;
}
$submission = new Request($payload);
$submission->attributes->set('shoraka_kodcaw', $kodcaw);
return $this->submit($submission, $shoraka);
}
public function refreshGadai(string $kodcaw, string $norujukan, ShorakaGadaiService $gadaiService, ShorakaService $shoraka)