nitweb: use model filters

[nit.git] / src / web / api_model.nit

diff --git a/src/web/api_model.nit b/src/web/api_model.nit
index d81a3a7..b7c35c0 100644 (file)
--- a/src/web/api_model.nit
+++ b/src/web/api_model.nit
@@ -70,10 +70,19 @@ class APIList
                return mentities
        end
 
+       # Filter mentities based on the config view filters
+       fun filter_mentities(req: HttpRequest, mentities: Array[MEntity]): Array[MEntity] do
+               var res = new Array[MEntity]
+               for mentity in mentities do
+                       if config.view.filter.accept_mentity(mentity) then res.add mentity
+               end
+               return res
+       end
+
        # Sort mentities by lexicographic order
        #
        # TODO choose order from request
-       fun sort_mentities(req: HttpRequest, mentities: Array[MEntity]) : Array[MEntity] do
+       fun sort_mentities(req: HttpRequest, mentities: Array[MEntity]): Array[MEntity] do
                var sorted = mentities.to_a
                var sorter = new MEntityNameSorter
                sorter.sort(sorted)
@@ -104,13 +113,19 @@ class APISearch
        super APIList
 
        redef fun get(req, res) do
-               var q = req.string_arg("q")
-               if q == null then
-                       res.json new JsonArray
+               var query = req.string_arg("q")
+               if query == null then
+                       res.api_error(400, "Missing search string")
                        return
                end
-               var n = req.int_arg("n")
-               res.json new JsonArray.from(config.view.find(q, n))
+               var page = req.int_arg("p")
+               var limit = req.int_arg("n")
+               var response = new JsonArray.from(search(query, limit))
+               res.json paginate(response, response.length, page, limit)
+       end
+
+       fun search(query: String, limit: nullable Int): Array[MEntity] do
+               return config.view.find(query)
        end
 end
 
@@ -129,6 +144,7 @@ class APIRandom
 
        redef fun get(req, res) do
                var mentities = list_mentities(req)
+               mentities = filter_mentities(req, mentities)
                mentities = randomize_mentities(req, mentities)
                mentities = limit_mentities(req, mentities)
                res.json new JsonArray.from(mentities)
@@ -144,7 +160,7 @@ class APIEntity
        redef fun get(req, res) do
                var mentity = mentity_from_uri(req, res)
                if mentity == null then return
-               res.raw_json mentity.to_full_json
+               res.raw_json mentity.to_full_json(config.view.mainmodule)
        end
 end
 
@@ -210,19 +226,26 @@ class APIEntityDefs
        redef fun get(req, res) do
                var mentity = mentity_from_uri(req, res)
                if mentity == null then return
-               var mentities: Array[MEntity]
-               if mentity isa MModule then
-                       mentities = mentity.mclassdefs
+               var mentities = new Array[MEntity]
+               if mentity isa MPackage then
+                       mentities.add_all mentity.collect_mgroups(config.view)
+                       mentities.add_all mentity.collect_mmodules(config.view)
+               else if mentity isa MGroup then
+                       mentities.add_all mentity.collect_mgroups(config.view)
+                       mentities.add_all mentity.collect_mmodules(config.view)
+               else if mentity isa MModule then
+                       mentities.add_all mentity.collect_local_mclassdefs(config.view)
                else if mentity isa MClass then
-                       mentities = mentity.mclassdefs
+                       mentities.add_all mentity.collect_mclassdefs(config.view)
                else if mentity isa MClassDef then
-                       mentities = mentity.mpropdefs
+                       mentities.add_all mentity.collect_mpropdefs(config.view)
                else if mentity isa MProperty then
-                       mentities = mentity.mpropdefs
+                       mentities.add_all mentity.collect_mpropdefs(config.view)
                else
                        res.api_error(404, "No definition list for mentity `{mentity.full_name}`")
                        return
                end
+               mentities = filter_mentities(req, mentities)
                mentities = sort_mentities(req, mentities)
                mentities = limit_mentities(req, mentities)
                res.json new JsonArray.from(mentities)