src/PrayerTracker.Data/DataAccess.fs

@@ -8,6 +8,22 @@ open PrayerTracker.Entities
 open System.Collections.Generic
 open System.Linq
 
+[<AutoOpen>]
+module private Helpers =
+  
+  /// Central place to append sort criteria for prayer request queries
+  let reqSort sort (query : IQueryable<PrayerRequest>) =
+    match sort with
+    | "D" ->
+        query.OrderByDescending(fun pr -> pr.updatedDate)
+          .ThenByDescending(fun pr -> pr.enteredDate)
+          .ThenBy(fun pr -> pr.requestor)
+    | _ ->
+        query.OrderBy(fun pr -> pr.requestor)
+          .ThenByDescending(fun pr -> pr.updatedDate)
+          .ThenByDescending(fun pr -> pr.enteredDate)
+
+
 type AppDbContext with
   
   (*-- DISCONNECTED DATA EXTENSIONS --*)
@@ -79,7 +95,6 @@ type AppDbContext with
     upcast (
       this.PrayerRequests.AsNoTracking().Where(fun pr -> pr.smallGroupId = grp.smallGroupId)
       |> function
-      // Filter
       | query when activeOnly ->
           let asOf = theDate.AddDays(-(float grp.preferences.daysToExpire)).Date
           query.Where(fun pr ->
@@ -89,16 +104,7 @@ type AppDbContext with
                   || RequestType.Expecting = pr.requestType)
               && not pr.isManuallyExpired)
       | query -> query
-      |> function
+      |> reqSort grp.preferences.requestSort)
-      // Sort
-      | query when grp.preferences.requestSort = "D" ->
-          query.OrderByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate)
-              .ThenBy(fun pr -> pr.requestor)
-      | query ->
-          query.OrderBy(fun pr -> pr.requestor)
-              .ThenByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate))
 
   /// Count prayer requests for the given small group Id
   member this.CountRequestsBySmallGroup gId =
@@ -110,24 +116,14 @@ type AppDbContext with
 
   /// Get all (or active) requests for a small group as of now or the specified date
   member this.SearchRequestsForSmallGroup (grp : SmallGroup) (searchTerm : string) pageNbr : PrayerRequest seq =
-    let skip = (pageNbr - 1) * 100
+    let pgSz = grp.preferences.pageSize
+    let skip = (pageNbr - 1) * pgSz
+    let sql  = RawSqlString """SELECT * FROM pt."PrayerRequest" WHERE "SmallGroupId" = {0} AND "Text" ILIKE {1}"""
+    let like = sprintf "%%%s%%"
     upcast (
-      this.PrayerRequests
+      this.PrayerRequests.FromSql(sql, grp.smallGroupId, like searchTerm).AsNoTracking ()
-        .AsNoTracking()
+      |> reqSort grp.preferences.requestSort
-        .Where(fun pr -> pr.smallGroupId = grp.smallGroupId && pr.text.Contains(searchTerm.ToLowerInvariant()))
+      |> function query -> (query.Skip skip).Take pgSz)
-      |> function
-      // Sort
-      | query when grp.preferences.requestSort = "D" ->
-          query.OrderByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate)
-              .ThenBy(fun pr -> pr.requestor)
-      | query ->
-          query.OrderBy(fun pr -> pr.requestor)
-              .ThenByDescending(fun pr -> pr.updatedDate)
-              .ThenByDescending(fun pr -> pr.enteredDate)
-      |> function
-      // Pagination
-      | query -> query.Skip(skip).Take(100))
 
   (*-- SMALL GROUP EXTENSIONS --*)
 

src/PrayerTracker.UI/Resources/Common.es.resx

@@ -819,4 +819,10 @@
   <data name="Click for Help on This Page" xml:space="preserve">
     <value>Haga Clic para Obtener Ayuda en Esta Página</value>
   </data>
+  <data name="Search" xml:space="preserve">
+    <value>Buscar</value>
+  </data>
+  <data name="Search requests..." xml:space="preserve">
+    <value>Busca las peticiones...</value>
+  </data>
 </root>

src/PrayerTracker/PrayerRequest.fs

@@ -201,8 +201,7 @@ let maintain onlyActive : HttpHandler =
     task {
       let reqs = 
         match ctx.GetQueryStringValue "search" with
-        | Ok srch ->
+        | Ok srch -> db.SearchRequestsForSmallGroup grp srch 1
-            Seq.empty
         | Error _ -> db.AllRequestsForSmallGroup grp (ctx.GetService<IClock> ()) None onlyActive
       return!
         { viewInfo ctx startTicks with helpLink = Some Help.maintainRequests }