Add extended user

NDLANO · Nov 28, 2023 · f803254 · f803254
1 parent e793642
commit f803254
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/src/api/arenaApi.ts b/src/api/arenaApi.ts
@@ -14,6 +14,7 @@ import {
   GQLArenaTopic,
   GQLArenaUser,
   GQLBaseUser,
+  GQLFullArenaUser,
   GQLMutationNewArenaTopicArgs,
   GQLMutationReplyToTopicArgs,
   GQLQueryArenaCategoryArgs,
@@ -27,11 +28,16 @@ const toBaseUser = (user: any): Omit<GQLBaseUser, '__typename'> => ({
   id: user.uid,
   displayName: user.displayname,
   username: user.username,
-  location: user.location,
   profilePicture: user.picture,
   slug: user.userslug,
 });
 
+const toFullArenaUser = (user: any): GQLFullArenaUser => ({
+  ...toBaseUser(user),
+  location: user.location,
+  groupTitleArray: user.groupTitleArray,
+});
+
 const toArenaUser = (user: any): GQLArenaUser => ({
   ...toBaseUser(user),
   groupTitleArray: user.groupTitleArray,
@@ -131,13 +137,13 @@ export const fetchCsrfTokenForSession = async (
 export const fetchArenaUser = async (
   { username }: GQLQueryArenaUserArgs,
   context: Context,
-): Promise<GQLArenaUser> => {
+): Promise<GQLFullArenaUser> => {
   const response = await fetch(
     `/groups/api/user/username/${username}`,
     context,
   );
   const resolved: any = await resolveJson(response);
-  return toArenaUser(resolved);
+  return toFullArenaUser(resolved);
 };
 
 export const fetchArenaCategories = async (

diff --git a/src/resolvers/arenaResolvers.ts b/src/resolvers/arenaResolvers.ts
@@ -14,14 +14,13 @@ import {
   fetchArenaTopic,
   fetchArenaTopicsByUser,
   fetchArenaNotifications,
-  fetchCsrfTokenForSession,
   newTopic,
   replyToTopic,
 } from '../api/arenaApi';
 import {
   GQLArenaCategory,
-  GQLArenaUser,
   GQLArenaTopic,
+  GQLFullArenaUser,
   GQLQueryArenaCategoryArgs,
   GQLQueryArenaUserArgs,
   GQLQueryArenaTopicArgs,
@@ -47,7 +46,7 @@ export const Query: Pick<
     _: any,
     params: GQLQueryArenaUserArgs,
     context: ContextWithLoaders,
-  ): Promise<GQLArenaUser> {
+  ): Promise<GQLFullArenaUser> {
     return fetchArenaUser(params, context);
   },
   async arenaCategories(

diff --git a/src/resolvers/index.ts b/src/resolvers/index.ts
@@ -71,7 +71,6 @@ import {
 
 import {
   Query as ArenaQuery,
-  resolvers as ArenaResolvers,
   Mutations as ArenaMutations,
 } from './arenaResolvers';
 
@@ -113,7 +112,6 @@ export const resolvers = {
   ...uptimeResolvers,
   ...ImageResolvers,
   ...ProgrammeResolvers,
-  ...ArenaResolvers,
   TaxonomyEntity: {
     // Resolves TaxonomyEntity interface
     __resolveType(entity: any) {

diff --git a/src/schema.ts b/src/schema.ts
@@ -1199,7 +1199,7 @@ export const typeDefs = gql`
     slug: String!
   }
 
-  type ArenaUser implements BaseUser {
+  type FullArenaUser implements BaseUser {
     id: Int!
     displayName: String!
     username: String!
@@ -1209,6 +1209,15 @@ export const typeDefs = gql`
     groupTitleArray: [String!]!
   }
 
+  type ArenaUser implements BaseUser {
+    id: Int!
+    displayName: String!
+    username: String!
+    profilePicture: String
+    slug: String!
+    groupTitleArray: [String!]!
+  }
+
   type ArenaNotificationUser implements BaseUser {
     id: Int!
     displayName: String!
@@ -1392,7 +1401,7 @@ export const typeDefs = gql`
     resourceEmbeds(resources: [ResourceEmbedInput!]!): ResourceEmbed!
     arenaCategories: [ArenaCategory!]!
     arenaCategory(categoryId: Int!, page: Int!): ArenaCategory
-    arenaUser(username: String!): ArenaUser
+    arenaUser(username: String!): FullArenaUser
     arenaTopic(topicId: Int!, page: Int): ArenaTopic
     arenaRecentTopics: [ArenaTopic!]!
     arenaTopicsByUser(userSlug: String!): [ArenaTopic!]!

diff --git a/src/types/schema.d.ts b/src/types/schema.d.ts
@@ -99,7 +99,6 @@ export type GQLArenaUser = GQLBaseUser & {
   displayName: Scalars['String'];
   groupTitleArray: Array<Scalars['String']>;
   id: Scalars['Int'];
-  location?: Maybe<Scalars['String']>;
   profilePicture?: Maybe<Scalars['String']>;
   slug: Scalars['String'];
   username: Scalars['String'];
@@ -593,6 +592,17 @@ export type GQLFrontpageSearchResult = {
   subject: Scalars['String'];
 };
 
+export type GQLFullArenaUser = GQLBaseUser & {
+  __typename?: 'FullArenaUser';
+  displayName: Scalars['String'];
+  groupTitleArray: Array<Scalars['String']>;
+  id: Scalars['Int'];
+  location?: Maybe<Scalars['String']>;
+  profilePicture?: Maybe<Scalars['String']>;
+  slug: Scalars['String'];
+  username: Scalars['String'];
+};
+
 export type GQLGloss = {
   __typename?: 'Gloss';
   examples?: Maybe<Array<Array<GQLExamples>>>;
@@ -1156,7 +1166,7 @@ export type GQLQuery = {
   arenaRecentTopics: Array<GQLArenaTopic>;
   arenaTopic?: Maybe<GQLArenaTopic>;
   arenaTopicsByUser: Array<GQLArenaTopic>;
-  arenaUser?: Maybe<GQLArenaUser>;
+  arenaUser?: Maybe<GQLFullArenaUser>;
   article?: Maybe<GQLArticle>;
   articleResource?: Maybe<GQLResource>;
   audio?: Maybe<GQLAudio>;
@@ -1959,7 +1969,7 @@ export type GQLResolversTypes = {
   AudioLicense: ResolverTypeWrapper<GQLAudioLicense>;
   AudioSearch: ResolverTypeWrapper<GQLAudioSearch>;
   AudioSummary: ResolverTypeWrapper<GQLAudioSummary>;
-  BaseUser: GQLResolversTypes['ArenaNotificationUser'] | GQLResolversTypes['ArenaUser'];
+  BaseUser: GQLResolversTypes['ArenaNotificationUser'] | GQLResolversTypes['ArenaUser'] | GQLResolversTypes['FullArenaUser'];
   Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
   Breadcrumb: ResolverTypeWrapper<GQLBreadcrumb>;
   BrightcoveCustomFields: ResolverTypeWrapper<GQLBrightcoveCustomFields>;
@@ -2000,6 +2010,7 @@ export type GQLResolversTypes = {
   FrontpageMenu: ResolverTypeWrapper<GQLFrontpageMenu>;
   FrontpageSearch: ResolverTypeWrapper<GQLFrontpageSearch>;
   FrontpageSearchResult: ResolverTypeWrapper<GQLFrontpageSearchResult>;
+  FullArenaUser: ResolverTypeWrapper<GQLFullArenaUser>;
   Gloss: ResolverTypeWrapper<GQLGloss>;
   GlossLicense: ResolverTypeWrapper<GQLGlossLicense>;
   Grade: ResolverTypeWrapper<GQLGrade>;
@@ -2112,7 +2123,7 @@ export type GQLResolversParentTypes = {
   AudioLicense: GQLAudioLicense;
   AudioSearch: GQLAudioSearch;
   AudioSummary: GQLAudioSummary;
-  BaseUser: GQLResolversParentTypes['ArenaNotificationUser'] | GQLResolversParentTypes['ArenaUser'];
+  BaseUser: GQLResolversParentTypes['ArenaNotificationUser'] | GQLResolversParentTypes['ArenaUser'] | GQLResolversParentTypes['FullArenaUser'];
   Boolean: Scalars['Boolean'];
   Breadcrumb: GQLBreadcrumb;
   BrightcoveCustomFields: GQLBrightcoveCustomFields;
@@ -2153,6 +2164,7 @@ export type GQLResolversParentTypes = {
   FrontpageMenu: GQLFrontpageMenu;
   FrontpageSearch: GQLFrontpageSearch;
   FrontpageSearchResult: GQLFrontpageSearchResult;
+  FullArenaUser: GQLFullArenaUser;
   Gloss: GQLGloss;
   GlossLicense: GQLGlossLicense;
   Grade: GQLGrade;
@@ -2327,7 +2339,6 @@ export type GQLArenaUserResolvers<ContextType = any, ParentType extends GQLResol
   displayName?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   groupTitleArray?: Resolver<Array<GQLResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<GQLResolversTypes['Int'], ParentType, ContextType>;
-  location?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
   profilePicture?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
   slug?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   username?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
@@ -2478,7 +2489,7 @@ export type GQLAudioSummaryResolvers<ContextType = any, ParentType extends GQLRe
 };
 
 export type GQLBaseUserResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['BaseUser'] = GQLResolversParentTypes['BaseUser']> = {
-  __resolveType: TypeResolveFn<'ArenaNotificationUser' | 'ArenaUser', ParentType, ContextType>;
+  __resolveType: TypeResolveFn<'ArenaNotificationUser' | 'ArenaUser' | 'FullArenaUser', ParentType, ContextType>;
   displayName?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<GQLResolversTypes['Int'], ParentType, ContextType>;
   profilePicture?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
@@ -2813,6 +2824,17 @@ export type GQLFrontpageSearchResultResolvers<ContextType = any, ParentType exte
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type GQLFullArenaUserResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['FullArenaUser'] = GQLResolversParentTypes['FullArenaUser']> = {
+  displayName?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  groupTitleArray?: Resolver<Array<GQLResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<GQLResolversTypes['Int'], ParentType, ContextType>;
+  location?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
+  profilePicture?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
+  slug?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  username?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type GQLGlossResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Gloss'] = GQLResolversParentTypes['Gloss']> = {
   examples?: Resolver<Maybe<Array<Array<GQLResolversTypes['Examples']>>>, ParentType, ContextType>;
   gloss?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
@@ -3275,7 +3297,7 @@ export type GQLQueryResolvers<ContextType = any, ParentType extends GQLResolvers
   arenaRecentTopics?: Resolver<Array<GQLResolversTypes['ArenaTopic']>, ParentType, ContextType>;
   arenaTopic?: Resolver<Maybe<GQLResolversTypes['ArenaTopic']>, ParentType, ContextType, RequireFields<GQLQueryArenaTopicArgs, 'topicId'>>;
   arenaTopicsByUser?: Resolver<Array<GQLResolversTypes['ArenaTopic']>, ParentType, ContextType, RequireFields<GQLQueryArenaTopicsByUserArgs, 'userSlug'>>;
-  arenaUser?: Resolver<Maybe<GQLResolversTypes['ArenaUser']>, ParentType, ContextType, RequireFields<GQLQueryArenaUserArgs, 'username'>>;
+  arenaUser?: Resolver<Maybe<GQLResolversTypes['FullArenaUser']>, ParentType, ContextType, RequireFields<GQLQueryArenaUserArgs, 'username'>>;
   article?: Resolver<Maybe<GQLResolversTypes['Article']>, ParentType, ContextType, RequireFields<GQLQueryArticleArgs, 'id'>>;
   articleResource?: Resolver<Maybe<GQLResolversTypes['Resource']>, ParentType, ContextType, Partial<GQLQueryArticleResourceArgs>>;
   audio?: Resolver<Maybe<GQLResolversTypes['Audio']>, ParentType, ContextType, RequireFields<GQLQueryAudioArgs, 'id'>>;
@@ -3748,6 +3770,7 @@ export type GQLResolvers<ContextType = any> = {
   FrontpageMenu?: GQLFrontpageMenuResolvers<ContextType>;
   FrontpageSearch?: GQLFrontpageSearchResolvers<ContextType>;
   FrontpageSearchResult?: GQLFrontpageSearchResultResolvers<ContextType>;
+  FullArenaUser?: GQLFullArenaUserResolvers<ContextType>;
   Gloss?: GQLGlossResolvers<ContextType>;
   GlossLicense?: GQLGlossLicenseResolvers<ContextType>;
   Grade?: GQLGradeResolvers<ContextType>;