Directus Data Reorganization for Team Page

frontend-next-migration/package.json

@@ -26,7 +26,7 @@
   },
   "lint-staged": {
     "*.{js,ts,tsx,scss,css,md}": [
-      "next lin:fix"
+      "next lint:fix"
     ]
   },
   "dependencies": {

frontend-next-migration/src/entities/About/api/aboutApi.ts

@@ -26,7 +26,7 @@ export const aboutApi = directusApi.injectEndpoints({
             queryFn: async () => {
                 try {
                     const members = await client.request<Member[]>(
-                        readItems('members', { limit: 500 }),
+                        readItems('members_v2', { limit: 500 }),
                     );
 
                     const normalize = (input: unknown) =>

frontend-next-migration/src/entities/Member/api/mappers.test.ts

@@ -1,13 +1,13 @@
 import { organizeMembers } from './mappers';
-import { Member, Team, Department } from '@/entities/Member/model/types/types';
+import { Member, Team, Department, MemberRole } from '@/entities/Member/model/types/types';
 
 const mockTeams: Team[] = [
     {
         id: 1,
         name: 'Development',
         translations: [
-            { id: 101, teams_id: 1, languages_code: 'en-US', team: 'Development' },
-            { id: 102, teams_id: 1, languages_code: 'fi-FI', team: 'Ohjelmistokehitys' },
+            { id: 101, teams_v2_id: 1, languages_code: 'en-US', name: 'Development' },
+            { id: 102, teams_v2_id: 1, languages_code: 'fi-FI', name: 'Ohjelmistokehitys' },
         ],
         members: [],
         departments: [],
@@ -16,8 +16,8 @@ const mockTeams: Team[] = [
         id: 2,
         name: 'Game Design',
         translations: [
-            { id: 103, teams_id: 2, languages_code: 'en-US', team: 'Game Design' },
-            { id: 104, teams_id: 2, languages_code: 'fi-FI', team: 'Pelisuunnittelu' },
+            { id: 103, teams_v2_id: 2, languages_code: 'en-US', name: 'Game Design' },
+            { id: 104, teams_v2_id: 2, languages_code: 'fi-FI', name: 'Pelisuunnittelu' },
         ],
         members: [],
         departments: [],
@@ -33,27 +33,32 @@ describe('organizeMembers', () => {
             github: 'https://github.com/Jonroi',
             linkedin: 'https://www.linkedin.com/in/joni-roine/',
             website: 'https://jonroi.netlify.app/',
-            team: mockTeams[0],
-            department: {
-                id: 10,
-                name: 'Website Developer',
-                translations: [
-                    {
-                        id: 110,
-                        departments_id: 10,
-                        languages_code: 'en-US',
-                        department: 'Website Developer',
-                    },
-                    {
-                        id: 111,
-                        departments_id: 10,
-                        languages_code: 'fi-FI',
-                        department: 'Verkkosivukehittäjä',
-                    },
-                ],
-                members: [],
-            } as Department,
-            translations: [],
+            roles: [
+                {
+                    id: 1,
+                    team: mockTeams[0],
+                    department: {
+                        id: 10,
+                        name: 'Website Developer',
+                        translations: [
+                            {
+                                id: 110,
+                                departments_v2_id: 10,
+                                languages_code: 'en-US',
+                                name: 'Website Developer',
+                            },
+                            {
+                                id: 111,
+                                departments_v2_id: 10,
+                                languages_code: 'fi-FI',
+                                name: 'Verkkosivukehittäjä',
+                            },
+                        ],
+                        members: [],
+                    } as Department,
+                    translations: [],
+                } as MemberRole,
+            ],
         },
         {
             id: 2,
@@ -62,27 +67,32 @@ describe('organizeMembers', () => {
             github: 'https://github.com/AliceSmith',
             linkedin: 'https://www.linkedin.com/in/alice-smith/',
             website: 'https://alicesmith.com/',
-            team: mockTeams[1],
-            department: {
-                id: 20,
-                name: 'Game Developer',
-                translations: [
-                    {
-                        id: 120,
-                        departments_id: 20,
-                        languages_code: 'en-US',
-                        department: 'Game Developer',
-                    },
-                    {
-                        id: 121,
-                        departments_id: 20,
-                        languages_code: 'fi-FI',
-                        department: 'Pelikehittäjä',
-                    },
-                ],
-                members: [],
-            } as Department,
-            translations: [],
+            roles: [
+                {
+                    id: 2,
+                    team: mockTeams[1],
+                    department: {
+                        id: 20,
+                        name: 'Game Developer',
+                        translations: [
+                            {
+                                id: 120,
+                                departments_v2_id: 20,
+                                languages_code: 'en-US',
+                                name: 'Game Developer',
+                            },
+                            {
+                                id: 121,
+                                departments_v2_id: 20,
+                                languages_code: 'fi-FI',
+                                name: 'Pelikehittäjä',
+                            },
+                        ],
+                        members: [],
+                    } as Department,
+                    translations: [],
+                } as MemberRole,
+            ],
         },
     ];