Taxonomy API development

- Add taxonCodes to output - Reduce complexity of taxonomy search endpoint
BioKIC · Jul 17, 2024 · 1435351 · 1435351
1 parent 8fb4ca5
commit 1435351
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/api/app/Http/Controllers/TaxonomyController.php b/api/app/Http/Controllers/TaxonomyController.php
@@ -55,7 +55,7 @@ public function showAllTaxa(Request $request){
 		$offset = $request->input('offset',0);
 
 		$fullCnt = Taxonomy::count();
-		$result = Taxonomy::skip($offset)->take($limit)->get();
+		$result = Taxonomy::with('taxonCodes')->skip($offset)->take($limit)->get();
 
 		$eor = false;
 		$retObj = [
@@ -134,32 +134,26 @@ public function showAllTaxaSearch(Request $request){
 
 		$type = $request->input('type', 'EXACT');
 
-		$fullCnt = 0;
-		$result = [];
+		$taxaModel = Taxonomy::with('taxonCodes');
 		if($type == 'START'){
-			$fullCnt = Taxonomy::where('sciname', 'like', $request->taxon . '%')->count();
-			$result = Taxonomy::where('sciname', 'like', $request->taxon . '%')->skip($offset)->take($limit)->get();
+			$taxaModel->where('sciname', 'like', $request->taxon . '%');
 		}
 		elseif($type == 'WILD'){
-			$fullCnt = Taxonomy::where('sciname', 'like', '%' . $request->taxon . '%')->count();
-			$result = Taxonomy::where('sciname', 'like', '%' . $request->taxon . '%')->skip($offset)->take($limit)->get();
+			$taxaModel->where('sciname', 'like', '%' . $request->taxon . '%');
 		}
 		elseif($type == 'WHOLEWORD'){
-			$fullCnt = Taxonomy::where('unitname1', $request->taxon)
+			$taxaModel->where('unitname1', $request->taxon)
 				->orWhere('unitname2', $request->taxon)
-				->orWhere('unitname3', $request->taxon)
-				->count();
-			$result = Taxonomy::where('unitname1', $request->taxon)
-				->orWhere('unitname2', $request->taxon)
-				->orWhere('unitname3', $request->taxon)
-				->skip($offset)->take($limit)->get();
+				->orWhere('unitname3', $request->taxon);
 		}
 		else{
 			//Exact match
-			$fullCnt = Taxonomy::where('sciname', $request->taxon)->count();
-			$result = Taxonomy::where('sciname', $request->taxon)->skip($offset)->take($limit)->get();
+			$taxaModel->where('sciname', $request->taxon);
 		}
 
+		$fullCnt = $taxaModel->count();
+		$result = $taxaModel->skip($offset)->take($limit)->get();
+
 		$eor = false;
 		$retObj = [
 			'offset' => (int)$offset,