Refactor of issue and release GraphQL queries (#1268)

* Refactor of issue and release GraphQL queries

* Changes made after the recommendation of  coderabbitai

* Made changes on frontend test-cases

* Update code

* Update code

---------

Co-authored-by: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com>
Co-authored-by: Arkadii Yakovets <arkadii.yakovets@owasp.org>

Author: AbhayTopno

backend/apps/github/graphql/nodes/user.py

@@ -13,34 +13,11 @@ class RepositoryType(graphene.ObjectType):
     owner_key = graphene.String()
 
 
-class IssueType(graphene.ObjectType):
-    """GitHub issue type."""
-
-    created_at = graphene.Float()
-    comments_count = graphene.Int()
-    repository = graphene.Field(RepositoryType)
-    title = graphene.String()
-    url = graphene.String()
-
-
-class ReleaseType(graphene.ObjectType):
-    """GitHub release type."""
-
-    is_pre_release = graphene.Boolean()
-    name = graphene.String()
-    published_at = graphene.Float()
-    repository = graphene.Field(RepositoryType)
-    tag_name = graphene.String()
-    url = graphene.String()
-
-
 class UserNode(BaseNode):
     """GitHub user node."""
 
     created_at = graphene.Float()
-    issues = graphene.List(IssueType)
     issues_count = graphene.Int()
-    releases = graphene.List(ReleaseType)
     releases_count = graphene.Int()
     updated_at = graphene.Float()
     url = graphene.String()
@@ -65,18 +42,10 @@ def resolve_created_at(self, info):
         """Resolve created at."""
         return self.idx_created_at
 
-    def resolve_issues(self, info):
-        """Resolve issues."""
-        return self.idx_issues
-
     def resolve_issues_count(self, info):
         """Resolve issues count."""
         return self.idx_issues_count
 
-    def resolve_releases(self, info):
-        """Resolve releases."""
-        return self.idx_releases
-
     def resolve_releases_count(self, info):
         """Resolve releases count."""
         return self.idx_releases_count

backend/apps/github/graphql/queries/issue.py

@@ -13,12 +13,12 @@ class IssueQuery(BaseQuery):
 
     recent_issues = graphene.List(
         IssueNode,
-        limit=graphene.Int(default_value=15),
+        limit=graphene.Int(default_value=5),
         distinct=graphene.Boolean(default_value=False),
         login=graphene.String(required=False),
     )
 
-    def resolve_recent_issues(root, info, limit=15, distinct=False, login=None):
+    def resolve_recent_issues(root, info, limit, distinct=False, login=None):
         """Resolve recent issues with optional filtering.
 
         Args:

backend/apps/github/graphql/queries/pull_request.py

@@ -13,7 +13,7 @@ class PullRequestQuery(BaseQuery):
 
     recent_pull_requests = graphene.List(
         PullRequestNode,
-        limit=graphene.Int(default_value=6),
+        limit=graphene.Int(default_value=5),
         distinct=graphene.Boolean(default_value=False),
         login=graphene.String(required=False),
     )

backend/apps/github/graphql/queries/release.py

@@ -13,18 +13,20 @@ class ReleaseQuery(BaseQuery):
 
     recent_releases = graphene.List(
         ReleaseNode,
-        limit=graphene.Int(default_value=15),
+        limit=graphene.Int(default_value=6),
         distinct=graphene.Boolean(default_value=False),
+        login=graphene.String(required=False),
     )
 
-    def resolve_recent_releases(root, info, limit=15, distinct=False):
+    def resolve_recent_releases(root, info, limit, distinct=False, login=None):
         """Resolve recent releases with optional distinct filtering.
 
         Args:
             root (Any): The root query object.
             info (ResolveInfo): The GraphQL execution context.
             limit (int): Maximum number of releases to return.
             distinct (bool): Whether to return unique releases per author and repository.
+            login (str): Optional GitHub username for filtering releases.
 
         Returns:
             QuerySet: Queryset containing the filtered list of releases.
@@ -36,6 +38,11 @@ def resolve_recent_releases(root, info, limit=15, distinct=False):
             published_at__isnull=False,
         ).order_by("-published_at")
 
+        if login:
+            queryset = queryset.filter(
+                author__login=login,
+            )
+
         if distinct:
             latest_release_per_author = (
                 queryset.filter(author_id=OuterRef("author_id"))

backend/tests/apps/github/graphql/nodes/user_test.py

@@ -25,13 +25,11 @@ def test_meta_configuration(self):
             "following_count",
             "id",
             "issues_count",
-            "issues",
             "location",
             "login",
             "name",
             "public_repositories_count",
             "releases_count",
-            "releases",
             "updated_at",
             "url",
         }

frontend/__tests__/unit/data/mockUserDetails.ts

@@ -12,24 +12,24 @@ export const mockUserDetailsData = {
     followingCount: 5,
     publicRepositoriesCount: 3,
     createdAt: 1723002473,
-    issues: [
-      {
-        title: 'Test Issue',
-        createdAt: 1723002473,
-        commentsCount: 5,
-        url: 'https://github.com/OWASP/Nest/issues/798',
-      },
-    ],
-    releases: [
-      {
-        isPreRelease: false,
-        name: 'v1.0.0',
-        publishedAt: 1723002473,
-        tagName: '1.0.0',
-        url: 'https://github.com/testuser/test-repo/releases/tag/1.0.0',
-      },
-    ],
   },
+  recentIssues: [
+    {
+      title: 'Test Issue',
+      createdAt: 1723002473,
+      commentsCount: 5,
+      url: 'https://github.com/OWASP/Nest/issues/798',
+    },
+  ],
+  recentReleases: [
+    {
+      isPreRelease: false,
+      name: 'v1.0.0',
+      publishedAt: 1723002473,
+      tagName: '1.0.0',
+      url: 'https://github.com/testuser/test-repo/releases/tag/1.0.0',
+    },
+  ],
   recentPullRequests: [
     {
       createdAt: 1723002473,

frontend/__tests__/unit/pages/About.test.tsx

@@ -230,6 +230,27 @@ describe('About Component', () => {
     })
   })
 
+  test('shows fallback when user data is missing', async () => {
+    ;(useQuery as jest.Mock).mockImplementation((query, options) => {
+      if (options?.variables?.key === 'nest') {
+        return mockProjectData
+      } else if (options?.variables?.key === 'arkid15r') {
+        return { data: null, loading: false, error: false }
+      } else if (options?.variables?.key === 'kasya') {
+        return mockUserData('kasya')
+      } else if (options?.variables?.key === 'mamicidal') {
+        return mockUserData('mamicidal')
+      }
+      return { loading: true }
+    })
+
+    render(<About />)
+
+    await waitFor(() => {
+      expect(screen.getByText(/No data available for arkid15r/i)).toBeInTheDocument()
+    })
+  })
+
   test('renders top contributors section correctly', async () => {
     render(<About />)
 

frontend/__tests__/unit/pages/UserDetails.test.tsx

@@ -285,15 +285,17 @@ describe('UserDetailsPage', () => {
   test('handles no recent issues gracefully', async () => {
     const noIssuesData = {
       ...mockUserDetailsData,
-      user: { ...mockUserDetailsData.user, issues: [] },
+      recentIssues: [],
     }
+
     ;(useQuery as jest.Mock).mockReturnValue({
       data: noIssuesData,
       loading: false,
       error: null,
     })
 
     render(<UserDetailsPage />)
+
     await waitFor(() => {
       expect(screen.getByText('Recent Issues')).toBeInTheDocument()
       expect(screen.queryByText('Test Issue')).not.toBeInTheDocument()

frontend/src/api/queries/userQueries.ts

@@ -2,11 +2,24 @@ import { gql } from '@apollo/client'
 
 export const GET_USER_DATA = gql`
   query GetUser($key: String!) {
-    recentPullRequests(login: $key) {
+    recentIssues(limit: 5, login: $key) {
+      commentsCount
       createdAt
       title
       url
     }
+    recentPullRequests(limit: 5, login: $key) {
+      createdAt
+      title
+      url
+    }
+    recentReleases(limit: 6, login: $key) {
+      isPreRelease
+      name
+      publishedAt
+      tagName
+      url
+    }
     topContributedRepositories(login: $key) {
       contributorsCount
       forksCount
@@ -25,24 +38,11 @@ export const GET_USER_DATA = gql`
       email
       followersCount
       followingCount
-      issues {
-        commentsCount
-        createdAt
-        title
-        url
-      }
       issuesCount
       location
       login
       name
       publicRepositoriesCount
-      releases {
-        isPreRelease
-        name
-        publishedAt
-        tagName
-        url
-      }
       releasesCount
       url
     }

frontend/src/pages/UserDetails.tsx

@@ -23,8 +23,10 @@ import { toaster } from 'components/ui/toaster'
 const UserDetailsPage: React.FC = () => {
   const { userKey } = useParams()
   const [user, setUser] = useState<UserDetailsProps | null>()
+  const [issues, setIssues] = useState<ProjectIssuesType[]>([])
   const [topRepositories, setTopRepositories] = useState<RepositoryCardProps[]>([])
   const [pullRequests, setPullRequests] = useState<PullRequestsType[]>([])
+  const [releases, setReleases] = useState<ProjectReleaseType[]>([])
   const [data, setData] = useState<HeatmapData | null>(null)
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [username, setUsername] = useState('')
@@ -40,7 +42,9 @@ const UserDetailsPage: React.FC = () => {
   useEffect(() => {
     if (graphQLData) {
       setUser(graphQLData?.user)
+      setIssues(graphQLData?.recentIssues)
       setPullRequests(graphQLData?.recentPullRequests)
+      setReleases(graphQLData?.recentReleases)
       setTopRepositories(graphQLData?.topContributedRepositories)
       setIsLoading(false)
     }
@@ -101,7 +105,7 @@ const UserDetailsPage: React.FC = () => {
 
   const formattedIssues: ProjectIssuesType[] = useMemo(() => {
     return (
-      user?.issues?.map((issue) => ({
+      issues?.map((issue) => ({
         commentsCount: issue.commentsCount,
         createdAt: issue.createdAt,
         title: issue.title,
@@ -114,7 +118,7 @@ const UserDetailsPage: React.FC = () => {
         url: issue.url,
       })) || []
     )
-  }, [user])
+  }, [issues, user])
 
   const formattedPullRequest: ItemCardPullRequests[] = useMemo(() => {
     return (
@@ -134,7 +138,7 @@ const UserDetailsPage: React.FC = () => {
 
   const formattedReleases: ProjectReleaseType[] = useMemo(() => {
     return (
-      user?.releases?.map((release) => ({
+      releases?.map((release) => ({
         isPreRelease: release.isPreRelease,
         name: release.name,
         publishedAt: release.publishedAt,
@@ -148,7 +152,7 @@ const UserDetailsPage: React.FC = () => {
         url: release.url,
       })) || []
     )
-  }, [user])
+  }, [releases, user])
 
   if (isLoading) {
     return <LoadingSpinner />