update for optimization and bug fix

cofacts · Feb 10, 2025 · 06793bf · 06793bf
1 parent ca9c1ee
commit 06793bf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 30 deletions.
diff --git a/src/adm/handlers/moderation/__tests__/awardBadge.js b/src/adm/handlers/moderation/__tests__/awardBadge.js
@@ -31,14 +31,6 @@ describe('awardBadge', () => {
     );
   });
 
-  /**
-   * Asserts the document in database is the same as in the fixture,
-   * i.e. the document is not modified
-   *
-   * @param {string} fixtureKey
-   * @param {{index: string; id: string;}} clientGetArgs - Arguments for client.get()
-   */
-
   it('correctly sets the awarded badge id when authorized', async () => {
     const result = await awardBadge({
       userId: 'user-to-award-badge',

diff --git a/src/graphql/dataLoaders/index.ts b/src/graphql/dataLoaders/index.ts
@@ -10,7 +10,6 @@ import repliedArticleCountLoaderFactory from './repliedArticleCountLoaderFactory
 import votedArticleReplyCountLoaderFactory from './votedArticleReplyCountLoaderFactory';
 import userLevelLoaderFactory from './userLevelLoaderFactory';
 import userLoaderFactory from './userLoaderFactory';
-import badgeLoaderFactory from './badgeLoaderFactory';
 import contributionsLoaderFactory from './contributionsLoaderFactory';
 
 const LOADER_FACTORY_MAP = {
@@ -25,7 +24,6 @@ const LOADER_FACTORY_MAP = {
   repliedArticleCountLoader: repliedArticleCountLoaderFactory,
   votedArticleReplyCountLoader: votedArticleReplyCountLoaderFactory,
   userLoader: userLoaderFactory,
-  badgeLoader: badgeLoaderFactory,
   userLevelLoader: userLevelLoaderFactory,
   analyticsLoader: analyticsLoaderFactory,
   contributionsLoader: contributionsLoaderFactory,
@@ -66,9 +64,6 @@ export default class DataLoaders {
   get userLoader() {
     return this._checkOrSetLoader('userLoader');
   }
-  get badgeLoader() {
-    return this._checkOrSetLoader('badgeLoader');
-  }
   get userLevelLoader() {
     return this._checkOrSetLoader('userLevelLoader');
   }

diff --git a/src/graphql/models/Badge.js b/src/graphql/models/Badge.js
@@ -3,14 +3,14 @@ import { GraphQLObjectType, GraphQLString } from 'graphql';
 export default new GraphQLObjectType({
   name: 'Badge',
   fields: () => ({
-    name: { type: GraphQLString },
-    displayName: { type: GraphQLString },
-    description: { type: GraphQLString },
-    link: { type: GraphQLString },
-    icon: { type: GraphQLString },
-    borderImage: { type: GraphQLString },
-    issuers: { type: GraphQLString },
-    createdAt: { type: GraphQLString },
+    name: { type: new GraphQLNonNull(GraphQLString) },
+    displayName: { type: new GraphQLNonNull(GraphQLString) },
+    description: { type: new GraphQLNonNull(GraphQLString) },
+    link: { type: new GraphQLNonNull(GraphQLString) },
+    icon: { type: new GraphQLNonNull(GraphQLString) },
+    borderImage: { type: new GraphQLNonNull(GraphQLString) },
+    issuers: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
+    createdAt: { type: new GraphQLNonNull(GraphQLString) },
     updatedAt: { type: GraphQLString },
   }),
 });
diff --git a/src/graphql/models/User.js b/src/graphql/models/User.js
@@ -161,15 +161,15 @@ const User = new GraphQLObjectType({
     },
 
     badges: {
-      type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Badge))),
+      type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(UserAwardedBadge))),
       description: 'Badges awarded to the user.',
       resolve: (user) => user.badges || [],
     },
 
     majorBadgeBorderUrl: {
       type: GraphQLString,
       description: 'returns badge background image url',
-      resolve: async (user, atgs, { loaders }) => {
+      resolve: async (user, args, { loaders }) => {
         const displayItem = user.badges.find({ isDisplay: true });
         if (displayItem == null) {
           return null;
@@ -186,7 +186,7 @@ const User = new GraphQLObjectType({
     majorBadgeImageUrl: {
       type: GraphQLString,
       description: 'returns badge background image url',
-      resolve: async (user, atgs, { loaders }) => {
+      resolve: async (user, args, { loaders }) => {
         const displayItem = user.badges.find({ isDisplay: true });
         if (displayItem == null) {
           return null;
@@ -203,7 +203,7 @@ const User = new GraphQLObjectType({
     majorBadgeName: {
       type: GraphQLString,
       description: 'returns badge background image url',
-      resolve: async (user, atgs, { loaders }) => {
+      resolve: async (user, args, { loaders }) => {
         const displayItem = user.badges.find({ isDisplay: true });
         if (displayItem == null) {
           return null;

diff --git a/src/graphql/models/UserAwardedBadge.js b/src/graphql/models/UserAwardedBadge.js
@@ -3,10 +3,10 @@ import { GraphQLBoolean, GraphQLObjectType, GraphQLString } from 'graphql';
 export default new GraphQLObjectType({
   name: 'UserAwardedBadge',
   fields: () => ({
-    badgeId: { type: GraphQLString },
-    badgeMetaData: { type: GraphQLString },
-    isDisplayed: { type: GraphQLBoolean },
-    createdAt: { type: GraphQLString },
-    updatedAt: { type: GraphQLString },
+    badgeId: { type: new GraphQLNonNull(GraphQLString) },
+    badgeMetaData: { type: new GraphQLNonNull(GraphQLString) },
+    isDisplayed: { type: new GraphQLNonNull(GraphQLBoolean) },
+    createdAt: { type: new GraphQLNonNull(GraphQLString) },
+    updatedAt: { type: new GraphQLNonNull(GraphQLString) },
   }),
 });