Merge pull request #78 from unisoncomputing/cp/project-search-fixups

Project search fixups

Author: ChrisPenner

src/Share/Postgres/Queries.hs

@@ -170,10 +170,22 @@ searchProjects caller userIdFilter (Query query) limit = do
     SELECT p.id, p.owner_user_id, p.slug, p.summary, p.tags, p.private, p.created_at, p.updated_at, owner.handle
       FROM to_tsquery('english', #{queryToken}) AS tokenquery, projects AS p
         JOIN users AS owner ON p.owner_user_id = owner.id
-      WHERE (tokenquery @@ p.project_text_document OR p.slug ILIKE (like_escape(#{query}) || '%'))
+      WHERE (tokenquery @@ p.project_text_document OR p.slug ILIKE ('%' || like_escape(#{query}) || '%'))
       AND (NOT p.private OR (#{caller} IS NOT NULL AND EXISTS (SELECT FROM accessible_private_projects WHERE user_id = #{caller} AND project_id = p.id)))
       AND (#{userIdFilter} IS NULL OR p.owner_user_id = #{userIdFilter})
-      ORDER BY ts_rank_cd(p.project_text_document, tokenquery) DESC, p.slug ASC
+      ORDER BY
+        p.slug = #{query} DESC,
+        -- Prefer prefix matches
+        p.slug ILIKE (like_escape(#{query}) || '%') DESC,
+        -- Otherwise infix matches
+        p.slug ILIKE ('%' || like_escape(#{query}) || '%') DESC,
+        -- Prefer projects in the unison org
+        COALESCE(FALSE, p.owner_user_id = (SELECT unison.id FROM users unison WHERE unison.handle = 'unison'))  DESC,
+        -- Prefer projects in the catalog
+        EXISTS(SELECT FROM project_categories pc WHERE pc.project_id = p.id) DESC,
+        ts_rank_cd(p.project_text_document, tokenquery) DESC,
+        -- Lastly sort by name, just so results are deterministic
+        p.slug ASC
       LIMIT #{limit}
       |]
   pure (results <&> \(project PG.:. PG.Only handle) -> (project, handle))

transcripts/share-apis/code-browse/run.zsh

@@ -19,6 +19,6 @@ fetch "$transcripts_user" GET codebase-definition-by-hash-constructor "/users/tr
 fetch "$transcripts_user" GET codebase-find "/users/transcripts/projects/code-browse/branches/main/find?query=oranges.tw"
 fetch "$transcripts_user" GET codebase-namespace-by-name "/users/transcripts/projects/code-browse/branches/main/namespaces/by-name/names"
 fetch "$transcripts_user" GET codebase-namespace-by-name-root "/users/transcripts/projects/code-browse/branches/main/namespaces/by-name/"
-fetch "$transcripts_user" GET search "/search?query=te"
+fetch "$transcripts_user" GET search "/search?query=tes"
 fetch "$transcripts_user" GET account "/account"
 fetch "$transcripts_user" GET user-info "/user-info"

transcripts/share-apis/search/omni-search-projects.json

@@ -0,0 +1,15 @@
+{
+  "body": [
+    {
+      "projectRef": "@transcripts/search",
+      "summary": null,
+      "tag": "project",
+      "visibility": "private"
+    }
+  ],
+  "status": [
+    {
+      "status_code": 200
+    }
+  ]
+}

transcripts/share-apis/search/run.zsh

@@ -93,3 +93,5 @@ fetch "$transcripts_user" GET 'omni-search-orgs' '/search?query=%40uni'
 
 # Omni search should find regular users
 fetch "$transcripts_user" GET 'omni-search-users' '/search?query=%40tes'
+# Omni search should find projects by infix
+fetch "$transcripts_user" GET 'omni-search-projects' '/search?query=%40ear'