Start rewriting display info

Author: ChrisPenner

share-api.cabal

@@ -148,7 +148,8 @@ library
       Share.Web.Share.DefinitionSearch
       Share.Web.Share.Diffs.Impl
       Share.Web.Share.Diffs.Types
-      Share.Web.Share.DisplayInfo
+      Share.Web.Share.DisplayInfo.Queries
+      Share.Web.Share.DisplayInfo.Types
       Share.Web.Share.Impl
       Share.Web.Share.Orgs.API
       Share.Web.Share.Orgs.Impl

src/Share/BackgroundJobs/Webhooks/Types.hs

@@ -15,7 +15,7 @@ import Data.Text qualified as Text
 import Share.Contribution (ContributionStatus)
 import Share.IDs
 import Share.Prelude
-import Share.Web.Share.DisplayInfo (UserDisplayInfo)
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo)
 
 data BranchPayload = BranchPayload
   { branchId :: BranchId,

src/Share/Postgres/Users/Queries.hs

@@ -48,7 +48,7 @@ import Share.Utils.Postgres
 import Share.Utils.URI (URIParam (..))
 import Share.Web.Authorization.Types qualified as AuthZ
 import Share.Web.Errors (EntityMissing (EntityMissing), ErrorID (..), ToServerError (..))
-import Share.Web.Share.DisplayInfo (UserDisplayInfo (..))
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo (..), UserLike (..))
 
 -- | Efficiently resolve User Display Info for UserIds within a structure.
 userDisplayInfoOf :: (PG.QueryA m) => Traversal s t UserId UserDisplayInfo -> s -> m t
@@ -274,20 +274,22 @@ findOrCreateGithubUser authZReceipt ghu@(GithubUser _login githubUserId _avatarU
     Nothing -> do
       New <$> createFromGithubUser authZReceipt ghu primaryEmail userHandle
 
-searchUsersByNameOrHandlePrefix :: Query -> Limit -> PG.Transaction e [(User, Maybe OrgId)]
+searchUsersByNameOrHandlePrefix :: Query -> Limit -> PG.Transaction e [(UserLike UserId Void OrgId)]
 searchUsersByNameOrHandlePrefix (Query prefix) (Limit limit) = do
   let q = likeEscape prefix <> "%"
-  PG.queryListRows @(User PG.:. (PG.Only (Maybe OrgId)))
+  PG.queryListRows @(UserId, Maybe OrgId)
     [PG.sql|
-    SELECT u.id, u.name, u.primary_email, u.avatar_url, u.handle, u.private, org.id
+    SELECT u.id, org.id
       FROM users u
       LEFT JOIN orgs org ON org.user_id = u.id
       WHERE (u.handle ILIKE #{q}
              OR u.name ILIKE #{q}
             ) AND NOT u.private
       LIMIT #{limit}
       |]
-    <&> fmap \(user PG.:. PG.Only mayOrgId) -> (user, mayOrgId)
+    <&> fmap \(userId, mayOrgId) -> case mayOrgId of
+      Just orgId -> UnifiedOrg orgId
+      Nothing -> UnifiedUser userId
 
 data UserCreationError
   = UserHandleTaken UserHandle

src/Share/Web/Authorization/Types.hs

@@ -48,7 +48,7 @@ import Share.IDs
 import Share.Postgres qualified as PG
 import Share.Prelude
 import Share.Utils.API (AtKey (..))
-import Share.Web.Share.DisplayInfo
+import Share.Web.Share.DisplayInfo.Types
 
 data SubjectKind = UserSubjectKind | OrgSubjectKind | TeamSubjectKind
   deriving (Show)

src/Share/Web/Share/Branches/Types.hs

@@ -14,7 +14,7 @@ import Share.IDs
 import Share.IDs qualified as IDs
 import Share.Postgres.IDs
 import Share.Web.Share.Contributions.Types (ShareContribution)
-import Share.Web.Share.DisplayInfo (UserDisplayInfo)
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo)
 import Share.Web.Share.Projects.Types
 
 branchToShareBranch :: BranchShortHand -> Branch CausalHash -> APIProject -> [ShareContribution UserDisplayInfo] -> ShareBranch

src/Share/Web/Share/Comments/API.hs

@@ -7,7 +7,7 @@ import Servant
 import Share.IDs
 import Share.Web.Share.Comments
 import Share.Web.Share.Comments.Types
-import Share.Web.Share.DisplayInfo (UserDisplayInfo)
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo)
 
 type CommentResourceServer = UpdateComment :<|> DeleteComment
 

src/Share/Web/Share/Comments/Impl.hs

@@ -21,7 +21,7 @@ import Share.Web.Authorization qualified as AuthZ
 import Share.Web.Errors
 import Share.Web.Share.Comments
 import Share.Web.Share.Comments.Types
-import Share.Web.Share.DisplayInfo (UserDisplayInfo (..))
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo (..))
 
 createCommentEndpoint ::
   Maybe Session ->

src/Share/Web/Share/Comments/Types.hs

@@ -9,7 +9,7 @@ module Share.Web.Share.Comments.Types where
 import Data.Aeson
 import Share.Prelude
 import Share.Web.Share.Comments (CommentEvent (..), RevisionNumber)
-import Share.Web.Share.DisplayInfo (UserDisplayInfo)
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo)
 
 data CreateCommentRequest = CreateCommentRequest
   { content :: Text

src/Share/Web/Share/Contributions/API.hs

@@ -14,7 +14,7 @@ import Share.Utils.Servant (RequiredQueryParam)
 import Share.Web.Share.Comments.API qualified as Comments
 import Share.Web.Share.Contributions.Types
 import Share.Web.Share.Diffs.Types (ShareNamespaceDiffResponse, ShareTermDiffResponse, ShareTypeDiffResponse)
-import Share.Web.Share.DisplayInfo (UserDisplayInfo)
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo)
 import Unison.Name (Name)
 
 type ContributionsByUserAPI = ListContributionsByUserEndpoint

src/Share/Web/Share/Contributions/Impl.hs

@@ -56,7 +56,7 @@ import Share.Web.Share.Contributions.MergeDetection qualified as MergeDetection
 import Share.Web.Share.Contributions.Types
 import Share.Web.Share.Diffs.Impl qualified as Diffs
 import Share.Web.Share.Diffs.Types (ShareNamespaceDiffResponse (..), ShareNamespaceDiffStatus (..), ShareTermDiffResponse (..), ShareTypeDiffResponse (..))
-import Share.Web.Share.DisplayInfo (UserDisplayInfo (..))
+import Share.Web.Share.DisplayInfo.Types (UserDisplayInfo (..))
 import Unison.Name (Name)
 import Unison.Server.Types
 import Unison.Syntax.Name qualified as Name