Merge pull request #6 from Favo02/toilets-and-reviews

Toilets and reviews

backend/src/common/middlewares.ml

@@ -30,3 +30,5 @@ let verify_expiration =
   Rock.Middleware.create ~filter: verify_expiration ~name: "verify expiration"
 
 let logger = Opium.Middleware.logger
+
+let allow_cors = Opium.Middleware.allow_cors ()

backend/src/handlers/reviews.ml

@@ -15,7 +15,8 @@ module Query = struct
       r.rating, r.description, r.paper, r.soap, r.dryer, r.hotwater, r.clean, r.temperature
     FROM reviews r
     INNER JOIN toilets t ON r.toilet = t.id
-    INNER JOIN users u ON r.author = u.id"
+    INNER JOIN users u ON r.author = u.id
+    ORDER BY date DESC"
 
   let create =
     tup3

backend/src/handlers/toilets.ml

@@ -31,7 +31,8 @@ module Query = struct
     FROM toilets t
     INNER JOIN users u ON t.creator = u.id
     LEFT JOIN reviews r ON t.id = r.toilet
-    GROUP BY t.id, u.username"
+    GROUP BY t.id, u.username
+    ORDER BY reviews_count DESC"
 
   let create =
     tup2

backend/src/main.ml

@@ -27,7 +27,7 @@ let auth = Web.choose ~scope: "/api" ~middlewares: [ require_login; verify_expir
   Web.post  "/reviews/create"   Handlers.Reviews.create;
 ]
 
-let router = Web.choose ~middlewares: [ logger; Opium.Middleware.allow_cors (); ] [
+let router = Web.choose ~middlewares: [ logger; allow_cors; ] [
   public;
   no_auth;
   auth;