Dedupe info from user endpoints that's included in the displayInfo

Author: ChrisPenner

src/Share/Web/Share/Impl.hs

@@ -288,29 +288,27 @@ namespacesByNameEndpoint (AuthN.MaybeAuthedUserID callerUserId) userHandle (from
 
 getUserProfileEndpoint :: Maybe UserId -> UserHandle -> WebApp DescribeUserProfile
 getUserProfileEndpoint callerUserId userHandle = do
-  (UserProfile {user_name, avatar_url, bio, website, location, twitterHandle, pronouns}, kind, permissions) <- PG.runTransactionOrRespondError do
+  PG.runTransactionOrRespondError do
     User {user_id} <- UserQ.userByHandle userHandle `whenNothingM` throwError (EntityMissing (ErrorID "no-user-for-handle") $ "User not found for handle: " <> IDs.toText userHandle)
-    profile <- UsersQ.userProfileById user_id `whenNothingM` throwError (EntityMissing (ErrorID "no-user-for-handle") $ "User not found for handle: " <> IDs.toText userHandle)
+    displayInfo <- DisplayInfoQ.unifiedDisplayInfoForUserOf id user_id
+    UserProfile {bio, website, location, twitterHandle, pronouns} <- UsersQ.userProfileById user_id `whenNothingM` throwError (EntityMissing (ErrorID "no-user-for-handle") $ "User not found for handle: " <> IDs.toText userHandle)
     (kind, permissions) <-
       OrgQ.orgByUserId user_id >>= \case
         Just (Org {orgId}) -> do
           permissionsWithinOrg <- AuthZQ.permissionsForOrg callerUserId orgId
           pure (OrgKind, permissionsWithinOrg)
         Nothing -> pure (UserKind, mempty)
-    pure (profile, kind, permissions)
-  pure $
-    DescribeUserProfile
-      { handle = userHandle,
-        name = user_name,
-        avatarUrl = avatar_url,
-        bio = bio,
-        website = website,
-        location = location,
-        twitterHandle = twitterHandle,
-        pronouns = pronouns,
-        kind,
-        permissions
-      }
+    pure $
+      DescribeUserProfile
+        { bio = bio,
+          website = website,
+          location = location,
+          twitterHandle = twitterHandle,
+          pronouns = pronouns,
+          kind,
+          permissions,
+          displayInfo = displayInfo
+        }
 
 updateUserEndpoint :: UserHandle -> UserId -> UpdateUserRequest -> WebApp DescribeUserProfile
 updateUserEndpoint userHandle callerUserId (UpdateUserRequest {name, avatarUrl, bio, website, location, twitterHandle, pronouns}) = do
@@ -480,19 +478,15 @@ searchDefinitionsEndpoint callerUserId (Query query) mayLimit userFilter project
 
 accountInfoEndpoint :: Session -> WebApp UserAccountInfo
 accountInfoEndpoint Session {sessionUserId} = do
-  User {user_name, avatar_url, user_email, handle, user_id} <- PGO.expectUserById sessionUserId
+  User {user_email, user_id} <- PGO.expectUserById sessionUserId
   PG.runTransaction $ do
     completedTours <- Q.getCompletedToursForUser user_id
     organizationMemberships <- Q.organizationMemberships user_id
     isSuperadmin <- AuthZQ.isSuperadmin user_id
     displayInfo <- DisplayInfoQ.unifiedDisplayInfoForUserOf id user_id
     pure $
       UserAccountInfo
-        { handle = handle,
-          name = user_name,
-          avatarUrl = avatar_url,
-          userId = user_id,
-          primaryEmail = user_email,
+        { primaryEmail = user_email,
           completedTours,
           organizationMemberships,
           isSuperadmin,

src/Share/Web/Share/Types.hs

@@ -50,32 +50,28 @@ instance ToJSON UserKind where
     OrgKind -> "org"
 
 data DescribeUserProfile = DescribeUserProfile
-  { handle :: UserHandle,
-    name :: Maybe Text,
-    avatarUrl :: Maybe URIParam,
-    bio :: Maybe Text,
+  { bio :: Maybe Text,
     website :: Maybe Text,
     location :: Maybe Text,
     twitterHandle :: Maybe Text,
     pronouns :: Maybe Text,
     kind :: UserKind,
-    permissions :: Set RolePermission
+    permissions :: Set RolePermission,
+    displayInfo :: UnifiedDisplayInfo
   }
   deriving (Show)
 
 instance ToJSON DescribeUserProfile where
-  toJSON (DescribeUserProfile handle name avatarUrl bio website location twitterHandle pronouns kind permissions) =
+  toJSON (DescribeUserProfile bio website location twitterHandle pronouns kind permissions displayInfo) =
     Aeson.object
-      [ "handle" .= fromId @UserHandle @Text handle,
-        "name" .= name,
-        "avatarUrl" .= avatarUrl,
-        "bio" .= bio,
+      [ "bio" .= bio,
         "website" .= website,
         "location" .= location,
         "twitterHandle" .= twitterHandle,
         "pronouns" .= pronouns,
         "kind" .= kind,
-        "permissions" Aeson..= permissions
+        "permissions" Aeson..= permissions,
+        "displayInfo" .= displayInfo
       ]
 
 data ReadmeResponse = ReadmeResponse
@@ -133,11 +129,7 @@ instance ToJSON SearchResult where
         ]
 
 data UserAccountInfo = UserAccountInfo
-  { handle :: UserHandle,
-    name :: Maybe Text,
-    avatarUrl :: Maybe URIParam,
-    userId :: UserId,
-    primaryEmail :: Maybe Email,
+  { primaryEmail :: Maybe Email,
     -- List of tours which the user has completed.
     completedTours :: [TourId],
     organizationMemberships :: [UserHandle],
@@ -149,11 +141,7 @@ data UserAccountInfo = UserAccountInfo
 instance ToJSON UserAccountInfo where
   toJSON UserAccountInfo {..} =
     Aeson.object
-      [ "handle" .= fromId @UserHandle @Text handle,
-        "name" .= name,
-        "avatarUrl" .= avatarUrl,
-        "primaryEmail" .= primaryEmail,
-        "userId" .= userId,
+      [ "primaryEmail" .= primaryEmail,
         "completedTours" .= completedTours,
         "organizationMemberships" .= organizationMemberships,
         "isSuperadmin" .= isSuperadmin,