From 189b00b0176883f65547fe0891236ee0aea47cd3 Mon Sep 17 00:00:00 2001
From: bandhan-majumder <bandhanmajumder16@gmail.com>
Date: Sun, 3 Aug 2025 21:48:48 +0530
Subject: [PATCH 1/6] add: structured data for profile pages to improve
 visibility

---
 .../src/app/members/[memberKey]/layout.tsx    | 42 +++++++++-
 .../src/components/StructuredDataScript.tsx   | 19 +++++
 .../src/types/profilePageStructuredData.ts    | 35 +++++++++
 frontend/src/utils/structuredData.ts          | 78 +++++++++++++++++++
 4 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/components/StructuredDataScript.tsx
 create mode 100644 frontend/src/types/profilePageStructuredData.ts
 create mode 100644 frontend/src/utils/structuredData.ts

diff --git a/frontend/src/app/members/[memberKey]/layout.tsx b/frontend/src/app/members/[memberKey]/layout.tsx
index 8b79b5c936..5064142e22 100644
--- a/frontend/src/app/members/[memberKey]/layout.tsx
+++ b/frontend/src/app/members/[memberKey]/layout.tsx
@@ -1,8 +1,10 @@
 import { Metadata } from 'next'
 import React from 'react'
 import { apolloClient } from 'server/apolloClient'
-import { GET_USER_METADATA } from 'server/queries/userQueries'
+import { GET_USER_METADATA, GET_USER_DATA } from 'server/queries/userQueries'
 import { generateSeoMetadata } from 'utils/metaconfig'
+import { generateProfilePageStructuredData } from 'utils/structuredData'
+import StructuredDataScript from 'components/StructuredDataScript'
 
 export async function generateMetadata({
   params,
@@ -29,6 +31,40 @@ export async function generateMetadata({
     : null
 }
 
-export default function UserDetailsLayout({ children }: { children: React.ReactNode }) {
-  return children
+export default async function UserDetailsLayout({
+  children,
+  params,
+}: {
+  children: React.ReactNode
+  params: Promise<{ memberKey: string }>
+}) {
+  const { memberKey } = await params
+
+  try {
+    const { data } = await apolloClient.query({
+      query: GET_USER_DATA,
+      variables: {
+        key: memberKey,
+      },
+    })
+
+    const user = data?.user
+
+    if (!user) {
+      return children
+    }
+
+    if (user && user.login) {
+      const structuredData = generateProfilePageStructuredData(user)
+
+      return (
+        <>
+          <StructuredDataScript data={structuredData} />
+          {children}
+        </>
+      )
+    }
+  } catch {
+    return children
+  }
 }
diff --git a/frontend/src/components/StructuredDataScript.tsx b/frontend/src/components/StructuredDataScript.tsx
new file mode 100644
index 0000000000..08a74146f2
--- /dev/null
+++ b/frontend/src/components/StructuredDataScript.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+
+interface StructuredDataScriptProps {
+  data: Record<string, unknown>
+}
+
+// dangerouslySetInnerHTML injects the JSON data as a script tag.
+const StructuredDataScript: React.FC<StructuredDataScriptProps> = ({ data }) => {
+  return (
+    <script
+      type="application/ld+json"
+      dangerouslySetInnerHTML={{
+        __html: JSON.stringify(data, null, 2), // include everything with 2 spaces indentation
+      }}
+    />
+  )
+}
+
+export default StructuredDataScript
diff --git a/frontend/src/types/profilePageStructuredData.ts b/frontend/src/types/profilePageStructuredData.ts
new file mode 100644
index 0000000000..362a9e72dc
--- /dev/null
+++ b/frontend/src/types/profilePageStructuredData.ts
@@ -0,0 +1,35 @@
+export interface ProfilePageStructuredData {
+  '@context': string
+  '@type': string
+  mainEntity: {
+    '@type': string
+    name: string
+    description?: string
+    image?: string
+    url?: string
+    sameAs?: string[]
+    worksFor?: {
+      '@type': string
+      name: string
+    }
+    address?: {
+      '@type': string
+      addressLocality: string
+    }
+    knowsAbout?: string[]
+    hasOccupation?: {
+      '@type': string
+      name: string
+    }
+    memberOf?: {
+      '@type': string
+      name: string
+      url: string
+    }
+  }
+  interactionStatistic?: Array<{
+    '@type': string
+    interactionType: string
+    userInteractionCount: number
+  }>
+}
diff --git a/frontend/src/utils/structuredData.ts b/frontend/src/utils/structuredData.ts
new file mode 100644
index 0000000000..e49080e522
--- /dev/null
+++ b/frontend/src/utils/structuredData.ts
@@ -0,0 +1,78 @@
+import { ProfilePageStructuredData } from 'types/profilePageStructuredData'
+import type { UserDetails } from 'types/user'
+
+/**
+ * JSON-LD structure data for ProfilePage
+ * https://developers.google.com/search/docs/appearance/structured-data/profile-page
+ *
+ * - @context: "https://schema.org"
+ * - @type: "ProfilePage"
+ * - mainEntity: A Person or Organization (using type Person for OWASP community members)
+ *
+ */
+export function generateProfilePageStructuredData(
+  user: UserDetails,
+  baseUrl = 'https://nest.owasp.org'
+): ProfilePageStructuredData {
+  const profileUrl = `${baseUrl}/members/${user.login}`
+
+  const structuredData: ProfilePageStructuredData = {
+    '@context': 'https://schema.org',
+    '@type': 'ProfilePage',
+    mainEntity: {
+      '@type': 'Person',
+      name: user.name || user.login,
+      description: user.bio,
+      image: user.avatarUrl,
+      url: profileUrl,
+      sameAs: [user.url], // GitHub profile URL
+      memberOf: {
+        '@type': 'Organization',
+        name: 'OWASP',
+        url: 'https://owasp.org',
+      },
+    },
+  }
+
+  if (user.company) {
+    structuredData.mainEntity.worksFor = {
+      '@type': 'Organization',
+      name: user.company,
+    }
+  }
+
+  if (user.avatarUrl) {
+    structuredData.mainEntity.image = user.avatarUrl
+  }
+
+  if (user.location) {
+    structuredData.mainEntity.address = {
+      '@type': 'PostalAddress',
+      addressLocality: user.location,
+    }
+  }
+
+  structuredData.mainEntity.knowsAbout = [
+    'Application Security',
+    'OWASP',
+    'Cybersecurity',
+    'Software Security',
+  ]
+
+  structuredData.mainEntity.hasOccupation = {
+    '@type': 'Occupation',
+    name: 'OWASP Community Member',
+  }
+
+  if (user.followersCount > 0) {
+    structuredData.interactionStatistic = [
+      {
+        '@type': 'InteractionCounter',
+        interactionType: 'https://schema.org/FollowAction',
+        userInteractionCount: user.followersCount,
+      },
+    ]
+  }
+
+  return structuredData
+}

From 1e6e67e5bc28bc5d4f902ce0206273c1a35efde6 Mon Sep 17 00:00:00 2001
From: Bandhan Majumder <133476557+bandhan-majumder@users.noreply.github.com>
Date: Sun, 3 Aug 2025 22:36:18 +0530
Subject: [PATCH 2/6] Update structuredData.ts

---
 frontend/src/utils/structuredData.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/utils/structuredData.ts b/frontend/src/utils/structuredData.ts
index e49080e522..53ca3636c6 100644
--- a/frontend/src/utils/structuredData.ts
+++ b/frontend/src/utils/structuredData.ts
@@ -41,10 +41,6 @@ export function generateProfilePageStructuredData(
     }
   }
 
-  if (user.avatarUrl) {
-    structuredData.mainEntity.image = user.avatarUrl
-  }
-
   if (user.location) {
     structuredData.mainEntity.address = {
       '@type': 'PostalAddress',

From ab752f758810726a168d772f8b082aa809dd34a3 Mon Sep 17 00:00:00 2001
From: Bandhan Majumder <133476557+bandhan-majumder@users.noreply.github.com>
Date: Sun, 3 Aug 2025 23:22:02 +0530
Subject: [PATCH 3/6] Update StructuredDataScript.tsx

---
 frontend/src/components/StructuredDataScript.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/StructuredDataScript.tsx b/frontend/src/components/StructuredDataScript.tsx
index 08a74146f2..699a8d05e8 100644
--- a/frontend/src/components/StructuredDataScript.tsx
+++ b/frontend/src/components/StructuredDataScript.tsx
@@ -1,7 +1,8 @@
 import React from 'react'
+import { ProfilePageStructuredData } from 'types/profilePageStructuredData'
 
 interface StructuredDataScriptProps {
-  data: Record<string, unknown>
+  data: ProfilePageStructuredData
 }
 
 // dangerouslySetInnerHTML injects the JSON data as a script tag.

From bda01d3166c5d5889092afb90d12b9960e686636 Mon Sep 17 00:00:00 2001
From: bandhan-majumder <bandhanmajumder16@gmail.com>
Date: Tue, 5 Aug 2025 09:36:52 +0530
Subject: [PATCH 4/6] add suggestioins and test

---
 .../unit/utils/structuredData.test.ts         | 147 ++++++++++++++++++
 frontend/src/utils/structuredData.ts          |  61 +++-----
 2 files changed, 172 insertions(+), 36 deletions(-)
 create mode 100644 frontend/__tests__/unit/utils/structuredData.test.ts

diff --git a/frontend/__tests__/unit/utils/structuredData.test.ts b/frontend/__tests__/unit/utils/structuredData.test.ts
new file mode 100644
index 0000000000..6eb14b347d
--- /dev/null
+++ b/frontend/__tests__/unit/utils/structuredData.test.ts
@@ -0,0 +1,147 @@
+import type { UserDetails } from 'types/user'
+import { generateProfilePageStructuredData } from 'utils/structuredData'
+
+describe('generateProfilePageStructuredData', () => {
+  const mockUser: UserDetails = {
+    avatarUrl: 'https://example.com/avatar.jpg',
+    bio: 'Security researcher and OWASP contributor',
+    company: 'Security Corp',
+    contributionsCount: 150,
+    createdAt: '2020-01-01T00:00:00Z',
+    email: 'user@example.com',
+    followersCount: 500,
+    followingCount: 200,
+    key: 'testuser',
+    location: 'San Francisco, CA',
+    login: 'testuser',
+    name: 'Test User',
+    publicRepositoriesCount: 25,
+    url: 'https://github.com/testuser',
+  }
+
+  it('should generate valid ProfilePage structured data', () => {
+    const result = generateProfilePageStructuredData(mockUser)
+
+    expect(result).toEqual({
+      '@context': 'https://schema.org',
+      '@type': 'ProfilePage',
+      mainEntity: {
+        '@type': 'Person',
+        name: 'Test User',
+        description: 'Security researcher and OWASP contributor',
+        image: 'https://example.com/avatar.jpg',
+        url: 'https://nest.owasp.org/members/testuser',
+        sameAs: ['https://github.com/testuser'],
+        memberOf: {
+          '@type': 'Organization',
+          name: 'OWASP',
+          url: 'https://owasp.org',
+        },
+        hasOccupation: {
+          '@type': 'Occupation',
+          name: 'OWASP Community Member',
+        },
+        worksFor: {
+          '@type': 'Organization',
+          name: 'Security Corp',
+        },
+        address: {
+          '@type': 'PostalAddress',
+          addressLocality: 'San Francisco, CA',
+        },
+      },
+      interactionStatistic: [
+        {
+          '@type': 'InteractionCounter',
+          interactionType: 'https://schema.org/FollowAction',
+          userInteractionCount: 500,
+        },
+      ],
+    })
+  })
+
+  it('should handle user without optional fields', () => {
+    const minimalUser: UserDetails = {
+      avatarUrl: 'https://example.com/avatar.jpg',
+      contributionsCount: 0,
+      createdAt: '2020-01-01T00:00:00Z',
+      followersCount: 0,
+      followingCount: 0,
+      key: 'basicuser',
+      login: 'basicuser',
+      publicRepositoriesCount: 0,
+      url: 'https://github.com/basicuser',
+    }
+
+    const result = generateProfilePageStructuredData(minimalUser)
+
+    expect(result.mainEntity.name).toBe('basicuser')
+    expect(result.mainEntity.description).toBeUndefined()
+    expect(result.mainEntity.worksFor).toBeUndefined()
+    expect(result.mainEntity.address).toBeUndefined()
+    expect(result.interactionStatistic).toBeUndefined()
+
+    // These should always be present
+    expect(result.mainEntity.memberOf).toBeDefined()
+    expect(result.mainEntity.hasOccupation).toBeDefined()
+  })
+
+  it('should include interaction statistics only when followers count > 0', () => {
+    const userWithFollowers = { ...mockUser, followersCount: 100 }
+    const userWithoutFollowers = { ...mockUser, followersCount: 0 }
+
+    const resultWithFollowers = generateProfilePageStructuredData(userWithFollowers)
+    const resultWithoutFollowers = generateProfilePageStructuredData(userWithoutFollowers)
+
+    expect(resultWithFollowers.interactionStatistic).toBeDefined()
+    expect(resultWithFollowers.interactionStatistic?.[0].userInteractionCount).toBe(100)
+
+    expect(resultWithoutFollowers.interactionStatistic).toBeUndefined()
+  })
+
+  it('should use custom base URL when provided', () => {
+    const result = generateProfilePageStructuredData(mockUser, 'https://custom.example.com')
+
+    expect(result.mainEntity.url).toBe('https://custom.example.com/members/testuser')
+  })
+
+  it('should handle user with company but no location', () => {
+    const userWithCompanyOnly = {
+      ...mockUser,
+      company: 'Tech Corp',
+      location: undefined,
+    }
+
+    const result = generateProfilePageStructuredData(userWithCompanyOnly)
+
+    expect(result.mainEntity.worksFor).toEqual({
+      '@type': 'Organization',
+      name: 'Tech Corp',
+    })
+    expect(result.mainEntity.address).toBeUndefined()
+  })
+
+  it('should handle user with location but no company', () => {
+    const userWithLocationOnly = {
+      ...mockUser,
+      company: undefined,
+      location: 'New York, NY',
+    }
+
+    const result = generateProfilePageStructuredData(userWithLocationOnly)
+
+    expect(result.mainEntity.address).toEqual({
+      '@type': 'PostalAddress',
+      addressLocality: 'New York, NY',
+    })
+    expect(result.mainEntity.worksFor).toBeUndefined()
+  })
+
+  it('should fallback to login when name is not provided', () => {
+    const userWithoutName = { ...mockUser, name: undefined }
+
+    const result = generateProfilePageStructuredData(userWithoutName)
+
+    expect(result.mainEntity.name).toBe('testuser')
+  })
+})
diff --git a/frontend/src/utils/structuredData.ts b/frontend/src/utils/structuredData.ts
index 53ca3636c6..9f84067b1a 100644
--- a/frontend/src/utils/structuredData.ts
+++ b/frontend/src/utils/structuredData.ts
@@ -31,43 +31,32 @@ export function generateProfilePageStructuredData(
         name: 'OWASP',
         url: 'https://owasp.org',
       },
-    },
-  }
-
-  if (user.company) {
-    structuredData.mainEntity.worksFor = {
-      '@type': 'Organization',
-      name: user.company,
-    }
-  }
-
-  if (user.location) {
-    structuredData.mainEntity.address = {
-      '@type': 'PostalAddress',
-      addressLocality: user.location,
-    }
-  }
-
-  structuredData.mainEntity.knowsAbout = [
-    'Application Security',
-    'OWASP',
-    'Cybersecurity',
-    'Software Security',
-  ]
-
-  structuredData.mainEntity.hasOccupation = {
-    '@type': 'Occupation',
-    name: 'OWASP Community Member',
-  }
-
-  if (user.followersCount > 0) {
-    structuredData.interactionStatistic = [
-      {
-        '@type': 'InteractionCounter',
-        interactionType: 'https://schema.org/FollowAction',
-        userInteractionCount: user.followersCount,
+      hasOccupation: {
+        '@type': 'Occupation',
+        name: 'OWASP Community Member',
       },
-    ]
+      ...(user.company && {
+        worksFor: {
+          '@type': 'Organization',
+          name: user.company,
+        },
+      }),
+      ...(user.location && {
+        address: {
+          '@type': 'PostalAddress',
+          addressLocality: user.location,
+        },
+      }),
+    },
+    ...(user.followersCount > 0 && {
+      interactionStatistic: [
+        {
+          '@type': 'InteractionCounter',
+          interactionType: 'https://schema.org/FollowAction',
+          userInteractionCount: user.followersCount,
+        },
+      ],
+    }),
   }
 
   return structuredData

From a05774f21d1dff9e569db7ae43d2ea17a742c4be Mon Sep 17 00:00:00 2001
From: Bandhan Majumder <133476557+bandhan-majumder@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:44:10 +0530
Subject: [PATCH 5/6] Update StructuredDataScript.tsx

---
 frontend/src/components/StructuredDataScript.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/StructuredDataScript.tsx b/frontend/src/components/StructuredDataScript.tsx
index 699a8d05e8..3e70b99ad7 100644
--- a/frontend/src/components/StructuredDataScript.tsx
+++ b/frontend/src/components/StructuredDataScript.tsx
@@ -9,6 +9,7 @@ interface StructuredDataScriptProps {
 const StructuredDataScript: React.FC<StructuredDataScriptProps> = ({ data }) => {
   return (
     <script
+      id="profile-structured-data"
       type="application/ld+json"
       dangerouslySetInnerHTML={{
         __html: JSON.stringify(data, null, 2), // include everything with 2 spaces indentation

From 56da376011bf0e01325ca3c7831fa92f67b5203a Mon Sep 17 00:00:00 2001
From: Arkadii Yakovets <arkadii.yakovets@owasp.org>
Date: Tue, 5 Aug 2025 18:49:51 -0700
Subject: [PATCH 6/6] Update code

---
 .../unit/utils/structuredData.test.ts         | 54 +++++++++----------
 .../src/app/members/[memberKey]/layout.tsx    | 38 +++++--------
 frontend/src/server/queries/userQueries.ts    |  1 +
 .../src/types/profilePageStructuredData.ts    | 32 +++++------
 frontend/src/types/user.ts                    |  1 +
 frontend/src/utils/structuredData.ts          | 50 ++++++++---------
 6 files changed, 75 insertions(+), 101 deletions(-)

diff --git a/frontend/__tests__/unit/utils/structuredData.test.ts b/frontend/__tests__/unit/utils/structuredData.test.ts
index 6eb14b347d..27ba2d730e 100644
--- a/frontend/__tests__/unit/utils/structuredData.test.ts
+++ b/frontend/__tests__/unit/utils/structuredData.test.ts
@@ -12,10 +12,11 @@ describe('generateProfilePageStructuredData', () => {
     followersCount: 500,
     followingCount: 200,
     key: 'testuser',
-    location: 'San Francisco, CA',
+    location: 'San Francisco, CA, USA',
     login: 'testuser',
     name: 'Test User',
     publicRepositoriesCount: 25,
+    updatedAt: '2021-02-03T00:00:00Z',
     url: 'https://github.com/testuser',
   }
 
@@ -25,38 +26,34 @@ describe('generateProfilePageStructuredData', () => {
     expect(result).toEqual({
       '@context': 'https://schema.org',
       '@type': 'ProfilePage',
+      dateCreated: '1970-01-01T00:33:40.000Z',
+      dateModified: '1970-01-01T00:33:41.000Z',
       mainEntity: {
         '@type': 'Person',
-        name: 'Test User',
+        address: 'San Francisco, CA, USA',
         description: 'Security researcher and OWASP contributor',
+        identifier: 'testuser',
         image: 'https://example.com/avatar.jpg',
-        url: 'https://nest.owasp.org/members/testuser',
-        sameAs: ['https://github.com/testuser'],
+        interactionStatistic: [
+          {
+            '@type': 'InteractionCounter',
+            interactionType: 'https://schema.org/FollowAction',
+            userInteractionCount: 500,
+          },
+        ],
         memberOf: {
           '@type': 'Organization',
-          name: 'OWASP',
-          url: 'https://owasp.org',
-        },
-        hasOccupation: {
-          '@type': 'Occupation',
-          name: 'OWASP Community Member',
+          name: 'OWASP Community',
+          url: 'https://nest.owasp.org/members',
         },
+        name: 'Test User',
+        sameAs: ['https://github.com/testuser'],
+        url: 'https://nest.owasp.org/members/testuser',
         worksFor: {
           '@type': 'Organization',
           name: 'Security Corp',
         },
-        address: {
-          '@type': 'PostalAddress',
-          addressLocality: 'San Francisco, CA',
-        },
       },
-      interactionStatistic: [
-        {
-          '@type': 'InteractionCounter',
-          interactionType: 'https://schema.org/FollowAction',
-          userInteractionCount: 500,
-        },
-      ],
     })
   })
 
@@ -70,6 +67,7 @@ describe('generateProfilePageStructuredData', () => {
       key: 'basicuser',
       login: 'basicuser',
       publicRepositoriesCount: 0,
+      updatedAt: '2021-02-03T00:00:00Z',
       url: 'https://github.com/basicuser',
     }
 
@@ -79,11 +77,10 @@ describe('generateProfilePageStructuredData', () => {
     expect(result.mainEntity.description).toBeUndefined()
     expect(result.mainEntity.worksFor).toBeUndefined()
     expect(result.mainEntity.address).toBeUndefined()
-    expect(result.interactionStatistic).toBeUndefined()
+    expect(result.mainEntity.interactionStatistic).toBeUndefined()
 
     // These should always be present
     expect(result.mainEntity.memberOf).toBeDefined()
-    expect(result.mainEntity.hasOccupation).toBeDefined()
   })
 
   it('should include interaction statistics only when followers count > 0', () => {
@@ -93,10 +90,10 @@ describe('generateProfilePageStructuredData', () => {
     const resultWithFollowers = generateProfilePageStructuredData(userWithFollowers)
     const resultWithoutFollowers = generateProfilePageStructuredData(userWithoutFollowers)
 
-    expect(resultWithFollowers.interactionStatistic).toBeDefined()
-    expect(resultWithFollowers.interactionStatistic?.[0].userInteractionCount).toBe(100)
+    expect(resultWithFollowers.mainEntity.interactionStatistic).toBeDefined()
+    expect(resultWithFollowers.mainEntity.interactionStatistic?.[0].userInteractionCount).toBe(100)
 
-    expect(resultWithoutFollowers.interactionStatistic).toBeUndefined()
+    expect(resultWithoutFollowers.mainEntity.interactionStatistic).toBeUndefined()
   })
 
   it('should use custom base URL when provided', () => {
@@ -130,10 +127,7 @@ describe('generateProfilePageStructuredData', () => {
 
     const result = generateProfilePageStructuredData(userWithLocationOnly)
 
-    expect(result.mainEntity.address).toEqual({
-      '@type': 'PostalAddress',
-      addressLocality: 'New York, NY',
-    })
+    expect(result.mainEntity.address).toEqual('New York, NY')
     expect(result.mainEntity.worksFor).toBeUndefined()
   })
 
diff --git a/frontend/src/app/members/[memberKey]/layout.tsx b/frontend/src/app/members/[memberKey]/layout.tsx
index 5064142e22..bc78d19cdd 100644
--- a/frontend/src/app/members/[memberKey]/layout.tsx
+++ b/frontend/src/app/members/[memberKey]/layout.tsx
@@ -40,31 +40,21 @@ export default async function UserDetailsLayout({
 }) {
   const { memberKey } = await params
 
-  try {
-    const { data } = await apolloClient.query({
-      query: GET_USER_DATA,
-      variables: {
-        key: memberKey,
-      },
-    })
-
-    const user = data?.user
-
-    if (!user) {
-      return children
-    }
-
-    if (user && user.login) {
-      const structuredData = generateProfilePageStructuredData(user)
+  const { data } = await apolloClient.query({
+    query: GET_USER_DATA,
+    variables: {
+      key: memberKey,
+    },
+  })
 
-      return (
-        <>
-          <StructuredDataScript data={structuredData} />
-          {children}
-        </>
-      )
-    }
-  } catch {
+  if (!data?.user?.login) {
     return children
   }
+
+  return (
+    <>
+      <StructuredDataScript data={generateProfilePageStructuredData(data.user)} />
+      {children}
+    </>
+  )
 }
diff --git a/frontend/src/server/queries/userQueries.ts b/frontend/src/server/queries/userQueries.ts
index 7782a51c14..c171be9b4a 100644
--- a/frontend/src/server/queries/userQueries.ts
+++ b/frontend/src/server/queries/userQueries.ts
@@ -72,6 +72,7 @@ export const GET_USER_DATA = gql`
       name
       publicRepositoriesCount
       releasesCount
+      updatedAt
       url
     }
   }
diff --git a/frontend/src/types/profilePageStructuredData.ts b/frontend/src/types/profilePageStructuredData.ts
index 362a9e72dc..e48e56e0cd 100644
--- a/frontend/src/types/profilePageStructuredData.ts
+++ b/frontend/src/types/profilePageStructuredData.ts
@@ -1,35 +1,31 @@
 export interface ProfilePageStructuredData {
   '@context': string
   '@type': string
+  dateCreated?: string
+  dateModified?: string
   mainEntity: {
     '@type': string
-    name: string
+    address?: string
     description?: string
+    identifier?: string
     image?: string
-    url?: string
-    sameAs?: string[]
-    worksFor?: {
+    interactionStatistic?: Array<{
       '@type': string
-      name: string
-    }
-    address?: {
-      '@type': string
-      addressLocality: string
-    }
+      interactionType: string
+      userInteractionCount: number
+    }>
     knowsAbout?: string[]
-    hasOccupation?: {
+    memberOf?: {
       '@type': string
       name: string
+      url: string
     }
-    memberOf?: {
+    name: string
+    sameAs?: string[]
+    url?: string
+    worksFor?: {
       '@type': string
       name: string
-      url: string
     }
   }
-  interactionStatistic?: Array<{
-    '@type': string
-    interactionType: string
-    userInteractionCount: number
-  }>
 }
diff --git a/frontend/src/types/user.ts b/frontend/src/types/user.ts
index 92cc4dfa80..eeae8b7229 100644
--- a/frontend/src/types/user.ts
+++ b/frontend/src/types/user.ts
@@ -26,6 +26,7 @@ export type User<T = number> = {
   releases?: Release[]
   releasesCount?: number
   topRepositories?: RepositoryCardProps[]
+  updatedAt?: T
   url: string
 }
 
diff --git a/frontend/src/utils/structuredData.ts b/frontend/src/utils/structuredData.ts
index 9f84067b1a..a43f60f27b 100644
--- a/frontend/src/utils/structuredData.ts
+++ b/frontend/src/utils/structuredData.ts
@@ -14,50 +14,42 @@ export function generateProfilePageStructuredData(
   user: UserDetails,
   baseUrl = 'https://nest.owasp.org'
 ): ProfilePageStructuredData {
-  const profileUrl = `${baseUrl}/members/${user.login}`
-
-  const structuredData: ProfilePageStructuredData = {
+  return {
     '@context': 'https://schema.org',
     '@type': 'ProfilePage',
+    dateCreated: new Date(parseInt(user.createdAt) * 1000).toISOString(),
+    dateModified: new Date(parseInt(user.updatedAt) * 1000).toISOString(),
     mainEntity: {
       '@type': 'Person',
-      name: user.name || user.login,
+      ...(user.location && {
+        address: user.location,
+      }),
       description: user.bio,
+      identifier: user.login,
       image: user.avatarUrl,
-      url: profileUrl,
-      sameAs: [user.url], // GitHub profile URL
+      ...(user.followersCount > 0 && {
+        interactionStatistic: [
+          {
+            '@type': 'InteractionCounter',
+            interactionType: 'https://schema.org/FollowAction',
+            userInteractionCount: user.followersCount,
+          },
+        ],
+      }),
       memberOf: {
         '@type': 'Organization',
-        name: 'OWASP',
-        url: 'https://owasp.org',
-      },
-      hasOccupation: {
-        '@type': 'Occupation',
-        name: 'OWASP Community Member',
+        name: 'OWASP Community',
+        url: 'https://nest.owasp.org/members',
       },
+      name: user.name || user.login,
+      sameAs: [user.url],
+      url: `${baseUrl}/members/${user.login}`,
       ...(user.company && {
         worksFor: {
           '@type': 'Organization',
           name: user.company,
         },
       }),
-      ...(user.location && {
-        address: {
-          '@type': 'PostalAddress',
-          addressLocality: user.location,
-        },
-      }),
     },
-    ...(user.followersCount > 0 && {
-      interactionStatistic: [
-        {
-          '@type': 'InteractionCounter',
-          interactionType: 'https://schema.org/FollowAction',
-          userInteractionCount: user.followersCount,
-        },
-      ],
-    }),
   }
-
-  return structuredData
 }