final

Author: Nisreen Oweidat

src/routes/pokemon.js

@@ -24,6 +24,30 @@ router.get("/hp", (req, res) => {
 
 
 
+
+router.get("/type/:type", (req, res, next) => {
+  const queryType = req.params.type.toLowerCase();
+  
+  const pokemon = pokedex.filter(p => {
+    if (Array.isArray(p.type)) {
+      return p.type.some(t => t.toLowerCase() === queryType);
+    } else {
+      return p.type.toLowerCase() === queryType;
+    }
+  });
+
+  if (pokemon.length === 0) {
+    res.status(404).json({ error: "Pokemon not found" });
+    return;
+  }
+  res.status(200).json(pokemon);
+  return;
+});
+
+
+
+
+
 //
 router.get("/name/:name",  (req, res, next) =>  {
 
@@ -52,17 +76,5 @@ router.get("/:id",  (req, res, next) => {
 
 
 //
-router.get("/type/:type", (req, res, next) => {
-  
-  const queryType = req.params.type.toLowerCase();
-  const pokemon = pokedex.filter(p => p.type.toLowerCase() === queryType);
-  
-  if (!pokemon) {
-   res.status(404).json({ error: "Pokemon not found" });
-   return;
-  }
-  res.status(200).json(pokemon);
-  return;
-});
 
 module.exports = router;