Skip to content

Feature/four 19267 #7424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
Original file line number Diff line number Diff line change
Expand Up @@ -839,4 +839,43 @@ public function endEventDestination(ProcessRequest $request)

return response()->json(['message' => __('End event found'), 'data' => $data]);
}

/**
* This endpoint returns requests by case number
*
* @param Request $request
*
* @return ApiCollection
*/
public function getRequestsByCase(Request $request, User $user = null)
{
if (!$user) {
$user = Auth::user();
}

// Validate the inputs, including optional ones
$request->validate([
'case_number' => 'required|integer',
'order_by' => 'nullable|string|in:id,name,status,user_id,initiated_at,participants',
'order_direction' => 'nullable|string|in:asc,desc',
'page' => 'nullable|integer|min:1',
'per_page' => 'nullable|integer',
]);

$query = ProcessRequest::forUser($user);

// Filter by case_number
$query->filterByCaseNumber($request);

// Apply ordering only if a valid order_by field is provided
$query->applyOrdering($request);
$response = $query->applyPagination($request);

// Get activeTasks and participants
$response = $response->map(function ($processRequest) use ($request) {
return new ProcessRequestResource($processRequest);
});

return new ApiCollection($response);
}
}
32 changes: 32 additions & 0 deletions ProcessMaker/Models/ProcessRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1089,4 +1089,36 @@ public function getElementDestination(): ?array

return $endEvents->first()->elementDestination;
}

/**
* Scope apply order
*/
public function scopeApplyOrdering($query, $request)
{
$orderBy = $request->input('order_by', 'name');
$orderDirection = $request->input('order_direction', 'asc');

return $query->orderBy($orderBy, $orderDirection);
}

/**
* Scope apply pagination
*/
public function scopeApplyPagination($query, $request)
{
$page = $request->input('page', 1);
$perPage = $request->input('per_page', 10);

return $query->paginate($perPage);
}

/**
* Scope to filter by case_number
*/
public function scopeFilterByCaseNumber($query, $request)
{
$caseNumber = $request->input('case_number');

return $query->where('case_number', $caseNumber);
}
}
1 change: 1 addition & 0 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@

// Cases
//Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index');
Route::get('requests-by-case', [ProcessRequestController::class, 'getRequestsByCase'])->name('requests.getRequestsByCase');
// Requests
Route::get('requests', [ProcessRequestController::class, 'index'])->name('requests.index'); // Already filtered in controller
Route::get('requests/{process}/count', [ProcessRequestController::class, 'getCount'])->name('requests.count');
Expand Down
41 changes: 41 additions & 0 deletions tests/Feature/Api/ProcessRequestsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class ProcessRequestsTest extends TestCase
public $withPermissions = true;

const API_TEST_URL = '/requests';
const API_REQUESTS_BY_CASE = '/requests-by-case';

const STRUCTURE = [
'id',
Expand Down Expand Up @@ -986,4 +987,44 @@ public function testScreenRequested()
$data = $response->json()['data'];
$this->assertEmpty($data);
}

/**
* Get a list of Requests by Cases.
*/
public function testRequestByCase()
{
ProcessRequest::query()->delete();
$request = ProcessRequest::factory()->create();
ProcessRequest::factory()->count(9)->create([
'parent_request_id' => $request->id,
]);

$url = self::API_REQUESTS_BY_CASE . '?case_number=' . $request->case_number;

$response = $this->apiCall('GET', $url);

//Validate the header status code
$response->assertStatus(200);

// Verify structure
$response->assertJsonStructure([
'data' => ['*' => self::STRUCTURE],
'meta',
]);

// Verify count
$this->assertEquals(10, $response->json()['meta']['total']);
}

/**
* Get a list of Requests by Cases.
*/
public function testRequestByCaseWithoutCaseNumber()
{
$response = $this->apiCall('GET', self::API_REQUESTS_BY_CASE);

//Validate the header status code
$response->assertStatus(422);
$this->assertEquals('The Case number field is required.', $response->json()['message']);
}
}
Loading