Merge pull request #44 from WorkTechDevelop/refactoring-rpc-lib

Refactoring rpc lib

Author: EgorKru

src/features/projects/api/use-get-projects.ts

@@ -7,7 +7,7 @@ export const useGetProjects = () => {
     queryKey: ["projects"],
     queryFn: async (): Promise<ShortProjectData[]> => {
       try {
-        const response = await client.getProjects();
+        const response = await client.getAllUserProjects();
         return response;
       } catch (error) {
         console.error("Failed to fetch projects:", error);

src/lib/rpc.ts

@@ -1,4 +1,5 @@
 import { buildApiUrl } from "@/config";
+import { API_ENDPOINTS } from "@/config";
 import { 
   LoginResponse, 
   UserData, 
@@ -125,7 +126,7 @@ class WorkTechApiClient {
     if (!refreshToken) return false;
 
     try {
-      const response = await fetch(buildApiUrl('/auth/refresh'), {
+      const response = await fetch(buildApiUrl(API_ENDPOINTS.AUTH.REFRESH_TOKEN), {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -147,30 +148,31 @@ class WorkTechApiClient {
     return false;
   }
 
+  //User
+  async getCurrentUser(): Promise<UserData> {
+    return this.request<UserData>(API_ENDPOINTS.USERS.PROFILE);
+  }
+
   async login(email: string, password: string): Promise<LoginResponse> {
-    return this.request<LoginResponse>('/auth/login', {
+    return this.request<LoginResponse>(API_ENDPOINTS.AUTH.LOGIN, {
       method: 'POST',
       body: JSON.stringify({ email, password }),
     });
   }
 
   async register(data: RegisterRequest): Promise<string> {
-    return this.request<string>('/registration/registry', {
+    return this.request<string>(API_ENDPOINTS.REGISTRATION.REGISTER, {
       method: 'POST',
       body: JSON.stringify(data),
     });
   }
 
-  async getCurrentUser(): Promise<UserData> {
-    return this.request<UserData>('/users/profile');
-  }
-
   async getRoles(): Promise<{ roles: RoleDataDto[] }> {
-    return this.request<{ roles: RoleDataDto[] }>('/roles');
+    return this.request<{ roles: RoleDataDto[] }>(API_ENDPOINTS.ROLES.GET_ALL);
   }
 
-  async getProjects(): Promise<ShortProjectData[]> {
-    return this.request<ShortProjectData[]>('/projects/all-user-project');
+  async getAllUserProjects(): Promise<ShortProjectData[]> {
+    return this.request<ShortProjectData[]>(API_ENDPOINTS.PROJECTS.GET_ALL_USER);
   }
 
   async getProject(projectId: string): Promise<Project> {

src/lib/types.ts

@@ -1,11 +1,4 @@
-// WorkTech API Types based on OpenAPI Schema
-
-export interface ErrorResponse {
-  error: string;
-  message: string;
-}
-
-// Auth Types
+// ===== Auth Types =====
 export interface LoginRequest {
   email: string;
   password: string;
@@ -32,7 +25,7 @@ export interface TokenRefreshRequest {
   refreshToken: string;
 }
 
-// User Types
+// ===== User Types =====
 export interface UserShortData {
   id: string;
   email: string;
@@ -47,13 +40,26 @@ export interface RoleDataDto {
   roleName: string;
 }
 
-export interface UserData extends UserShortData {
+export interface PermissionProject {
+  projectId: string;
+  projectName: string;
+  owner: boolean;
+  extendedPermission: boolean;
+}
+
+export interface UserData {
   userId: string;
+  lastProjectId: string | null;
+  lastName: string;
+  firstName: string;
   middleName?: string;
+  email: string;
   phone?: string;
   birthDate?: string;
   active: boolean;
+  gender?: string;
   roles: RoleDataDto[];
+  permissionProjects: PermissionProject[];
 }
 
 export interface UpdateUserRequest {
@@ -67,7 +73,7 @@ export interface UpdateUserRequest {
   confirmPassword: string;
 }
 
-// Project Types
+// ===== Project Types =====
 export interface ShortProjectData {
   id: string;
   name: string;
@@ -110,7 +116,7 @@ export interface ProjectData {
   users: UserWithTasks[];
 }
 
-// Task Types
+// ===== Task Types =====
 export type TaskPriority = 'BLOCKER' | 'HIGH' | 'MEDIUM' | 'LOW';
 export type TaskType = 'BUG' | 'TASK' | 'RESEARCH' | 'STORY';
 
@@ -172,7 +178,7 @@ export interface TaskHistory {
   createdAt: string;
 }
 
-// Sprint Types
+// ===== Sprint Types =====
 export interface SprintRequest {
   name: string;
   startDate?: string;
@@ -189,7 +195,7 @@ export interface Sprint {
   defaultSprint: boolean;
 }
 
-// Status Types
+// ===== Status Types =====
 export interface TaskStatusRequest {
   id?: number;
   priority: number;
@@ -214,7 +220,7 @@ export interface UpdateRequestStatuses {
   statuses: TaskStatusRequest[];
 }
 
-// Comment Types
+// ===== Comment Types =====
 export interface CommentRequest {
   taskId: string;
   projectId: string;
@@ -237,7 +243,7 @@ export interface AllTasksCommentsResponse {
   updatedAt: string;
 }
 
-// Link Types
+// ===== Link Types =====
 export interface LinkRequest {
   taskIdSource: string;
   taskIdTarget: string;
@@ -253,14 +259,18 @@ export interface LinkResponse {
   description: string;
 }
 
-// API Response wrapper
+// ===== Общие типы и утилиты =====
+export interface ErrorResponse {
+  error: string;
+  message: string;
+}
+
 export interface ApiResponse<T = Record<string, unknown>> {
   data?: T;
   error?: string;
   message?: string;
 }
 
-// Common ID list type
 export interface StringIds {
   ids: string[];
 }