More paging logic fixes

Author: ChrisPenner

share-api/src/Share/Postgres/Causal/Queries.hs

@@ -1003,9 +1003,9 @@ pagedCausalAncestors ::
 pagedCausalAncestors rootCausalId limit mayCursor =
   do
     let (filter, ordering, maybeReverse) = case mayCursor of
-          Nothing -> mempty
-          Just (Cursor (hash, depth) Next) -> ([sql| WHERE (h.causal_depth, h.hash) > (#{depth}, #{hash}) |], [sql| ORDER BY h.causal_depth DESC, h.hash ASC |], id)
-          Just (Cursor (hash, depth) Previous) -> ([sql| WHERE (h.causal_depth, h.hash) < (#{depth}, #{hash}) |], [sql| ORDER BY h.causal_depth ASC, h.hash DESC |], reverse)
+          Nothing -> (mempty, [sql| ORDER BY (h.causal_depth, h.causal_hash) DESC |], id)
+          Just (Cursor (hash, depth) Next) -> ([sql| WHERE (h.causal_depth, h.causal_hash) < (#{depth}, #{hash}) |], [sql| ORDER BY (h.causal_depth, h.causal_hash) DESC  |], id)
+          Just (Cursor (hash, depth) Previous) -> ([sql| WHERE (h.causal_depth, h.causal_hash) > (#{depth}, #{hash}) |], [sql| ORDER BY (h.causal_depth , h.causal_hash) ASC |], reverse)
     rawResults <-
       queryListRows @(CausalHash, CausalDepth)
         [sql|
@@ -1022,8 +1022,8 @@ pagedCausalAncestors rootCausalId limit mayCursor =
           JOIN causal_depth cd ON c.id = cd.causal_id
   ) SELECT h.causal_hash, h.causal_depth
       FROM history h
-      ^{ordering}
       ^{filter}
+      ^{ordering}
       LIMIT #{limit + 1}
     |]
     let hasPrevPage = case mayCursor of
@@ -1036,6 +1036,7 @@ pagedCausalAncestors rootCausalId limit mayCursor =
           Just (Cursor _ Previous) -> True
     pure rawResults
       <&> maybeReverse
+      <&> take (fromIntegral (getLimit limit))
       <&> pagedOn id
       <&> guardPaged hasPrevPage hasNextPage
       <&> fmap fst

share-api/src/Share/Web/Share/Branches/Impl.hs

@@ -50,6 +50,7 @@ import Share.Web.Share.Projects.Types (projectToAPI)
 import Share.Web.Share.Types
 import U.Codebase.HashTags (CausalHash)
 import Unison.Codebase.Path qualified as Path
+import Unison.Debug qualified as Debug
 import Unison.HashQualified qualified as HQ
 import Unison.Name (Name)
 import Unison.NameSegment.Internal (NameSegment (..))
@@ -507,11 +508,13 @@ branchHistoryEndpoint (AuthN.MaybeAuthedUserID callerUserId) userHandle projectS
   let codebaseLoc = Codebase.codebaseLocationForProjectBranchCodebase projectOwnerUserId contributorId
   let codebase = Codebase.codebaseEnv authZReceipt codebaseLoc
   causalId <- resolveRootHash codebase branchHead Nothing
+  Debug.debugM Debug.Temp "branchHistoryEndpoint Resolved causalId: " causalId
   PG.runTransaction do
     history <-
       CausalQ.pagedCausalAncestors causalId limit mayCursor
         <&> fmap \(causalHash) ->
           BranchHistoryCausalEntry (BranchHistoryCausal {causalHash})
+    Debug.debugM Debug.Temp "branchHistoryEndpoint Retrieved history entries: " (history)
     pure $
       BranchHistoryResponse
         { projectRef,

transcripts/share-apis/branches/out/branch-history.json

@@ -0,0 +1,16 @@
+{
+  "body": {
+    "branchRef": "main",
+    "history": {
+      "items": [],
+      "nextCursor": null,
+      "prevCursor": null
+    },
+    "projectRef": "@transcripts/branch-with-history"
+  },
+  "status": [
+    {
+      "status_code": 200
+    }
+  ]
+}

transcripts/share-apis/branches/prelude.md

@@ -1,7 +1,3 @@
-```ucm
-branch-with-history/main> builtins.merge builtins
-```
-
 ```unison
 x1 = 1
 ```
@@ -17,6 +13,7 @@ branch-with-history/main> alias.term x6 x7
 branch-with-history/main> alias.term x7 x8
 branch-with-history/main> alias.term x8 x9
 branch-with-history/main> alias.term x9 x10
+branch-with-history/main> history
 branch-with-history/main> push @transcripts/branch-with-history/main
 ```
 

transcripts/share-apis/branches/run.zsh

@@ -59,4 +59,4 @@ fetch "$test_user" GET branch-details-deleted '/users/test/projects/publictestpr
 # Add some history to a branch.
 transcript_ucm transcript prelude.md
 
-fetch "$transcripts_user" GET branch-history '/users/transcripts/projects/branch-browse/branches/main/history?limit=3'
+fetch "$transcripts_user" GET branch-history '/users/transcripts/projects/branch-with-history/branches/main/history?limit=3'