Moved /repositories under organization

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

@@ -36,6 +36,7 @@ class Meta:
             "license",
             "name",
             "open_issues_count",
+            "organization",
             "size",
             "stars_count",
             "subscribers_count",

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

@@ -3,6 +3,7 @@
 import graphene
 
 from apps.common.graphql.nodes import BaseNode
+from apps.github.graphql.nodes.organization import OrganizationNode
 from apps.github.models.user import User
 
 
@@ -18,6 +19,7 @@ class UserNode(BaseNode):
 
     created_at = graphene.Float()
     issues_count = graphene.Int()
+    organization = graphene.Field(OrganizationNode)
     releases_count = graphene.Int()
     updated_at = graphene.Float()
     url = graphene.String()
@@ -46,6 +48,10 @@ def resolve_issues_count(self, info):
         """Resolve issues count."""
         return self.idx_issues_count
 
+    def resolve_organization(self, info):
+        """Resolve organization."""
+        return self.organization
+
     def resolve_releases_count(self, info):
         """Resolve releases count."""
         return self.idx_releases_count

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

@@ -27,6 +27,7 @@ def test_meta_configuration(self):
             "license",
             "name",
             "open_issues_count",
+            "organization",
             "owner_key",
             "latest_release",
             "releases",

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

@@ -28,6 +28,7 @@ def test_meta_configuration(self):
             "location",
             "login",
             "name",
+            "organization",
             "public_repositories_count",
             "releases_count",
             "updated_at",

frontend/__tests__/e2e/pages/ProjectDetails.spec.ts

@@ -102,6 +102,6 @@ test.describe('Project Details Page', () => {
     await expect(page.getByText('Issues3', { exact: true })).toBeVisible()
 
     await page.getByText('Repo One').click()
-    await expect(page).toHaveURL('repositories/repo-1')
+    await expect(page).toHaveURL('organizations/OWASP/repositories/repo-1')
   })
 })

frontend/__tests__/e2e/pages/RepositoryDetails.spec.ts

@@ -17,7 +17,7 @@ test.describe('Repository Details Page', () => {
         path: '/',
       },
     ])
-    await page.goto('/repositories/test-repository')
+    await page.goto('organizations/OWASP/repositories/test-repository')
   })
 
   test('should have a heading and summary', async ({ page }) => {

frontend/__tests__/unit/data/mockProjectDetailsData.ts

@@ -55,6 +55,9 @@ export const mockProjectDetailsData = {
         key: 'repo-1',
         name: 'Repo One',
         openIssuesCount: 6,
+        organization: {
+          login: 'OWASP',
+        },
         starsCount: 95,
         subscribersCount: 15,
         url: 'https://github.com/example-project/repo-1',
@@ -65,6 +68,9 @@ export const mockProjectDetailsData = {
         key: 'repo-2',
         name: 'Repo Two',
         openIssuesCount: 3,
+        organization: {
+          login: 'OWASP',
+        },
         starsCount: 60,
         subscribersCount: 10,
         url: 'https://github.com/example-project/repo-2',

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

@@ -3,7 +3,7 @@ import { addToast } from '@heroui/toast'
 import { act, fireEvent, screen, waitFor, within } from '@testing-library/react'
 import { mockRepositoryData } from '@unit/data/mockRepositoryData'
 import { render } from 'wrappers/testUtil'
-import RepositoryDetailsPage from 'app/repositories/[repositoryKey]/page'
+import RepositoryDetailsPage from 'app/organizations/[organizationKey]/repositories/[repositoryKey]/page'
 
 jest.mock('@apollo/client', () => ({
   ...jest.requireActual('@apollo/client'),

frontend/src/components/RepositoriesCard.tsx

@@ -51,8 +51,9 @@ const RepositoriesCard: React.FC<RepositoriesCardProps> = ({ repositories }) =>
 const RepositoryItem = ({ details }: { details: RepositoryCardProps }) => {
   const router = useRouter()
   const handleClick = () => {
-    router.push('/repositories/' + details?.key)
+    router.push(`/organizations/${details.organization.login}/repositories/${details.key}`)
   }
+
   return (
     <div className="h-46 flex w-full flex-col gap-3 rounded-lg border p-4 shadow-sm ease-in-out hover:shadow-md dark:border-gray-700 dark:bg-gray-800">
       <button

frontend/src/server/queries/organizationQueries.ts

@@ -58,6 +58,9 @@ export const GET_ORGANIZATION_DATA = gql`
       key
       name
       openIssuesCount
+      organization {
+        login
+      }
       starsCount
       url
     }

frontend/src/server/queries/projectQueries.ts

@@ -42,6 +42,9 @@ export const GET_PROJECT_DATA = gql`
         key
         name
         openIssuesCount
+        organization {
+          login
+        }
         starsCount
         subscribersCount
         url

frontend/src/server/queries/userQueries.ts

@@ -28,6 +28,9 @@ export const GET_USER_DATA = gql`
       key
       name
       openIssuesCount
+      organization {
+        login
+      }
       starsCount
       subscribersCount
       url

frontend/src/types/project.ts

@@ -78,6 +78,9 @@ export interface RepositoryCardProps {
   key?: string
   name: string
   openIssuesCount: number
+  organization?: {
+    login: string
+  }
   starsCount: number
   subscribersCount: number
   url: string