RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sort combines ingredient picker results

This commit is contained in:
Christopher C. Wells 2021-02-24 18:42:56 -08:00
parent 0bc6c3582f
commit a7d89290b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/IngredientPickerController.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Models\Food; use App\Models\Food;
use App\Models\Recipe; use App\Models\Recipe;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -14,12 +15,12 @@ class IngredientPickerController extends Controller
*/ */
public function search(Request $request): JsonResponse public function search(Request $request): JsonResponse
{ {
$results = []; $results = new Collection();
$term = $request->query->get('term'); $term = $request->query->get('term');
if (!empty($term)) { if (!empty($term)) {
$results = Food::search($term)->get(); $results = $results->merge(Food::search($term)->get());
$results = $results->merge(Recipe::search($term)->get()); $results = $results->merge(Recipe::search($term)->get());
} }
return response()->json($results); return response()->json($results->sortBy('name')->values());
} }
} }