refactor/update-contract-schemas

src/app/layouts/SidebarLayout.tsx

@@ -1,4 +1,4 @@
-import { TeamSlugSync } from 'features/teams/active-team';
+import { TeamIdSync } from 'features/teams/active-team';
 import { ComponentProps } from 'react';
 import { Separator, SidebarInset, SidebarProvider, SidebarTrigger } from 'shared/ui';
 import { AppSidebar } from 'widgets/app-sidebar';
@@ -9,7 +9,7 @@ import { QuickCreate } from 'widgets/quick-create';
 export function SidebarLayout({ children, ...props }: ComponentProps<typeof SidebarProvider>) {
   return (
     <SidebarProvider {...props}>
-      <TeamSlugSync />
+      <TeamIdSync />
       <AppSidebar />
       <SidebarInset className="min-h-screen">
         <header className="bg-background sticky top-0 z-50 flex h-14 shrink-0 items-center justify-between gap-2 border-b px-4">

src/entities/project/api/http.ts

@@ -3,9 +3,9 @@ import * as SProject from '../model/schemas';
 import * as TProject from '../model/types';
 
 export class ProjectHttp {
-  static getProjects(teamSlug: string, signal?: AbortSignal) {
+  static getProjects(teamId: string, signal?: AbortSignal) {
     return api<TProject.ProjectListResponse>({
-      url: `/teams/${teamSlug}/projects`,
+      url: `/teams/${teamId}/projects`,
       method: 'GET',
       contracts: {
         response: SProject.ProjectListResponse,
@@ -14,9 +14,9 @@ export class ProjectHttp {
     });
   }
 
-  static getProject(teamSlug: string, id: string, token?: string, signal?: AbortSignal) {
+  static getProject(teamId: string, id: string, token?: string, signal?: AbortSignal) {
     return api<TProject.ProjectDetailResponse>({
-      url: `/teams/${teamSlug}/projects/${id}`,
+      url: `/teams/${teamId}/projects/${id}`,
       method: 'GET',
       params: token ? { token } : undefined,
       contracts: {
@@ -26,9 +26,9 @@ export class ProjectHttp {
     });
   }
 
-  static createProject(teamSlug: string, data: TProject.CreateProjectBody) {
+  static createProject(teamId: string, data: TProject.CreateProjectBody) {
     return api<TProject.CreateProjectResponse>({
-      url: `/teams/${teamSlug}/projects`,
+      url: `/teams/${teamId}/projects`,
       method: 'POST',
       data,
       contracts: {
@@ -38,9 +38,9 @@ export class ProjectHttp {
     });
   }
 
-  static updateProject(teamSlug: string, id: string, data: TProject.UpdateProjectBody) {
+  static updateProject(teamId: string, id: string, data: TProject.UpdateProjectBody) {
     return api<TProject.ActionResponse>({
-      url: `/teams/${teamSlug}/projects/${id}`,
+      url: `/teams/${teamId}/projects/${id}`,
       method: 'PATCH',
       data,
       contracts: {
@@ -50,29 +50,29 @@ export class ProjectHttp {
     });
   }
 
-  static removeProject(teamSlug: string, id: string) {
+  static removeProject(teamId: string, id: string) {
     return api<TProject.ActionResponse>({
-      url: `/teams/${teamSlug}/projects/${id}`,
+      url: `/teams/${teamId}/projects/${id}`,
       method: 'DELETE',
       contracts: {
         response: SProject.ActionResponse,
       },
     });
   }
 
-  static archiveProject(teamSlug: string, id: string) {
+  static archiveProject(teamId: string, id: string) {
     return api<TProject.ActionResponse>({
-      url: `/teams/${teamSlug}/projects/${id}/archive`,
+      url: `/teams/${teamId}/projects/${id}/archive`,
       method: 'POST',
       contracts: {
         response: SProject.ActionResponse,
       },
     });
   }
 
-  static createShareToken(teamSlug: string, id: string, data: TProject.CreateShareTokenBody = {}) {
+  static createShareToken(teamId: string, id: string, data: TProject.CreateShareTokenBody = {}) {
     return api<TProject.CreateShareTokenResponse>({
-      url: `/teams/${teamSlug}/projects/${id}/share`,
+      url: `/teams/${teamId}/projects/${id}/share`,
       method: 'POST',
       data,
       contracts: {

src/entities/project/api/queries.ts

@@ -3,18 +3,18 @@ import { projectFabricKeys } from '../model/const';
 import { ProjectHttp } from './http';
 
 export class ProjectQueries {
-  static getProjects(teamSlug: string) {
+  static getProjects(teamId: string) {
     return queryOptions({
-      queryKey: projectFabricKeys.list(teamSlug),
-      queryFn: async ({ signal }) => ProjectHttp.getProjects(teamSlug, signal),
+      queryKey: projectFabricKeys.list(teamId),
+      queryFn: async ({ signal }) => ProjectHttp.getProjects(teamId, signal),
       staleTime: 60_000,
     });
   }
 
-  static getProject(teamSlug: string, id: string, token?: string) {
+  static getProject(teamId: string, id: string, token?: string) {
     return queryOptions({
-      queryKey: [...projectFabricKeys.detail(teamSlug, id), token ?? null],
-      queryFn: async ({ signal }) => ProjectHttp.getProject(teamSlug, id, token, signal),
+      queryKey: [...projectFabricKeys.detail(teamId, id), token ?? null],
+      queryFn: async ({ signal }) => ProjectHttp.getProject(teamId, id, token, signal),
       staleTime: 60_000,
     });
   }

src/entities/project/model/const.ts

@@ -1,6 +1,6 @@
 import { createEntityKeys } from 'shared/lib/utils';
 
 export const projectFabricKeys = createEntityKeys('project', {
-  list: (teamSlug: string) => ['teams', teamSlug, 'projects'],
-  detail: (teamSlug: string, id: string) => ['teams', teamSlug, 'projects', id],
+  list: (teamId: string) => ['teams', teamId, 'projects'],
+  detail: (teamId: string, id: string) => ['teams', teamId, 'projects', id],
 });

src/entities/project/model/schemas.ts

@@ -1,4 +1,4 @@
-import { DateTimeString, GlobalSuccess } from 'shared/api';
+import { DateTimeString, GlobalSuccess, PaginatedResponseSchema } from 'shared/api';
 import { z } from 'zod/v4';
 import { PROJECT_ICONS } from '../config/icons';
 
@@ -57,15 +57,12 @@ export const ProjectListItemResponse = z.object({
   canEdit: z.boolean(),
 });
 
-export const ProjectListResponse = z.object({
+export const ProjectListResponse = PaginatedResponseSchema(ProjectListItemResponse).extend({
   team: z.object({
     id: z.string(),
     name: z.string(),
-    slug: z.string(),
     role: z.string(),
   }),
-  items: ProjectListItemResponse.array(),
-  meta: z.object({ total: z.number() }),
 });
 
 export const ProjectDetailResponse = z.object({

src/entities/team/api/http.ts

@@ -15,20 +15,9 @@ export class TeamHttp {
     });
   }
 
-  static checkSlug(slug: string, signal?: AbortSignal) {
-    return api<TTeam.CheckSlugResponse>({
-      url: `/teams/check-slug/${slug}`,
-      method: 'GET',
-      contracts: {
-        response: STeam.CheckSlugResponse,
-      },
-      signal,
-    });
-  }
-
-  static getTeam(slug: string, signal?: AbortSignal) {
+  static getTeam(teamId: string, signal?: AbortSignal) {
     return api<TTeam.TeamDetailsResponse>({
-      url: `/teams/${slug}`,
+      url: `/teams/${teamId}`,
       method: 'GET',
       contracts: {
         response: STeam.TeamDetailsResponse,
@@ -37,9 +26,9 @@ export class TeamHttp {
     });
   }
 
-  static updateTeam(slug: string, data: TTeam.UpdateTeamBody) {
+  static updateTeam(teamId: string, data: TTeam.UpdateTeamBody) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}`,
+      url: `/teams/${teamId}`,
       method: 'PATCH',
       data,
       contracts: {
@@ -49,19 +38,19 @@ export class TeamHttp {
     });
   }
 
-  static removeTeam(slug: string) {
+  static removeTeam(teamId: string) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}`,
+      url: `/teams/${teamId}`,
       method: 'DELETE',
       contracts: {
         response: STeam.ActionResponse,
       },
     });
   }
 
-  static getInvitations(slug: string, signal?: AbortSignal) {
+  static getInvitations(teamId: string, signal?: AbortSignal) {
     return api<TTeam.TeamInvitationListResponse>({
-      url: `/teams/${slug}/invitations`,
+      url: `/teams/${teamId}/invitations`,
       method: 'GET',
       contracts: {
         response: STeam.TeamInvitationListResponse,
@@ -70,9 +59,9 @@ export class TeamHttp {
     });
   }
 
-  static getInvitation(slug: string, code: string, signal?: AbortSignal) {
+  static getInvitation(teamId: string, code: string, signal?: AbortSignal) {
     return api<TTeam.TeamInvitationResponse>({
-      url: `/teams/${slug}/invitations/${code}`,
+      url: `/teams/${teamId}/invitations/${code}`,
       method: 'GET',
       contracts: {
         response: STeam.TeamInvitationResponse,
@@ -81,9 +70,9 @@ export class TeamHttp {
     });
   }
 
-  static inviteMember(slug: string, data: TTeam.InviteMemberBody) {
+  static inviteMember(teamId: string, data: TTeam.InviteMemberBody) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}/invitations`,
+      url: `/teams/${teamId}/invitations`,
       method: 'POST',
       data,
       contracts: {
@@ -103,9 +92,9 @@ export class TeamHttp {
     });
   }
 
-  static updateInvitation(slug: string, code: string, data: TTeam.UpdateInvitationBody) {
+  static updateInvitation(teamId: string, code: string, data: TTeam.UpdateInvitationBody) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}/invitations/${code}`,
+      url: `/teams/${teamId}/invitations/${code}`,
       method: 'PATCH',
       data,
       contracts: {
@@ -115,19 +104,19 @@ export class TeamHttp {
     });
   }
 
-  static removeInvitation(slug: string, code: string) {
+  static removeInvitation(teamId: string, code: string) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}/invitations/${code}`,
+      url: `/teams/${teamId}/invitations/${code}`,
       method: 'DELETE',
       contracts: {
         response: STeam.ActionResponse,
       },
     });
   }
 
-  static getMembers(slug: string, signal?: AbortSignal) {
+  static getMembers(teamId: string, signal?: AbortSignal) {
     return api<TTeam.TeamMemberListResponse>({
-      url: `/teams/${slug}/members`,
+      url: `/teams/${teamId}/members`,
       method: 'GET',
       contracts: {
         response: STeam.TeamMemberListResponse,
@@ -136,9 +125,9 @@ export class TeamHttp {
     });
   }
 
-  static updateMember(slug: string, userId: string, data: TTeam.UpdateMemberBody) {
+  static updateMember(teamId: string, userId: string, data: TTeam.UpdateMemberBody) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}/members/${userId}`,
+      url: `/teams/${teamId}/members/${userId}`,
       method: 'PATCH',
       data,
       contracts: {
@@ -148,9 +137,9 @@ export class TeamHttp {
     });
   }
 
-  static removeMember(slug: string, userId: string) {
+  static removeMember(teamId: string, userId: string) {
     return api<TTeam.ActionResponse>({
-      url: `/teams/${slug}/members/${userId}`,
+      url: `/teams/${teamId}/members/${userId}`,
       method: 'DELETE',
       contracts: {
         response: STeam.ActionResponse,

src/entities/team/api/queries.ts

@@ -3,43 +3,34 @@ import { teamFabricKeys } from '../model/const';
 import { TeamHttp } from './http';
 
 export class TeamQueries {
-  static getTeam(slug: string) {
+  static getTeam(teamId: string) {
     return queryOptions({
-      queryKey: teamFabricKeys.bySlug(slug),
-      queryFn: async ({ signal }) => TeamHttp.getTeam(slug, signal),
+      queryKey: teamFabricKeys.byId(teamId),
+      queryFn: async ({ signal }) => TeamHttp.getTeam(teamId, signal),
       staleTime: 60_000,
     });
   }
 
-  static checkSlug(slug: string) {
+  static getInvitation(teamId: string, code: string) {
     return queryOptions({
-      queryKey: teamFabricKeys.checkSlug(slug),
-      queryFn: async ({ signal }) => TeamHttp.checkSlug(slug, signal),
-      gcTime: 5000,
-      staleTime: 5000,
-    });
-  }
-
-  static getInvitation(slug: string, code: string) {
-    return queryOptions({
-      queryKey: teamFabricKeys.invitation(slug, code),
-      queryFn: async ({ signal }) => TeamHttp.getInvitation(slug, code, signal),
+      queryKey: teamFabricKeys.invitation(teamId, code),
+      queryFn: async ({ signal }) => TeamHttp.getInvitation(teamId, code, signal),
       staleTime: 60_000,
     });
   }
 
-  static getInvitations(slug: string) {
+  static getInvitations(teamId: string) {
     return queryOptions({
-      queryKey: teamFabricKeys.invitations(slug),
-      queryFn: async ({ signal }) => TeamHttp.getInvitations(slug, signal),
+      queryKey: teamFabricKeys.invitations(teamId),
+      queryFn: async ({ signal }) => TeamHttp.getInvitations(teamId, signal),
       staleTime: 60_000,
     });
   }
 
-  static getMembers(slug: string) {
+  static getMembers(teamId: string) {
     return queryOptions({
-      queryKey: teamFabricKeys.members(slug),
-      queryFn: async ({ signal }) => TeamHttp.getMembers(slug, signal),
+      queryKey: teamFabricKeys.members(teamId),
+      queryFn: async ({ signal }) => TeamHttp.getMembers(teamId, signal),
       staleTime: 60_000,
     });
   }

src/entities/team/index.ts

@@ -2,11 +2,8 @@ export * as STeam from './model/schemas';
 export type * as TTeam from './model/types';
 export { TeamHttp } from './api/http';
 export { TeamQueries } from './api/queries';
-export { MAX_SLUG_LENGTH, MIN_SLUG_LENGTH, teamFabricKeys } from './model/const';
+export { teamFabricKeys } from './model/const';
 export { ROLE_LABELS, INVITATION_ROLES } from './config/roles';
 export { STATUS_LABELS, MEMBER_STATUSES } from './config/statuses';
-export { useCheckSlug } from './lib/useCheckSlug';
-export { validateTeamSlugAsync } from './lib/validate-team-slug';
 export { useTeamStore } from './model/store';
 export { TeamAvatar } from './ui/TeamAvatar';
-export { SlugField } from './ui/SlugField';