fix: migrate @common/ code

Author: apalchys

client/src/api/api.ts

@@ -3344,6 +3344,49 @@ export const EventDtoTypeEnum = {
 
 export type EventDtoTypeEnum = typeof EventDtoTypeEnum[keyof typeof EventDtoTypeEnum];
 
+/**
+ * 
+ * @export
+ * @interface ExpelledStatsDto
+ */
+export interface ExpelledStatsDto {
+    /**
+     * 
+     * @type {string}
+     * @memberof ExpelledStatsDto
+     */
+    'id': string;
+    /**
+     * 
+     * @type {CourseDto}
+     * @memberof ExpelledStatsDto
+     */
+    'course': CourseDto;
+    /**
+     * 
+     * @type {UserDto}
+     * @memberof ExpelledStatsDto
+     */
+    'user': UserDto;
+    /**
+     * 
+     * @type {Array<string>}
+     * @memberof ExpelledStatsDto
+     */
+    'reasonForLeaving': Array<string>;
+    /**
+     * 
+     * @type {string}
+     * @memberof ExpelledStatsDto
+     */
+    'otherComment': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ExpelledStatsDto
+     */
+    'submittedAt': string;
+}
 /**
  * 
  * @export
@@ -10493,7 +10536,7 @@ export const CourseStatsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getExpelledStats(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<CourseStatsDto>>> {
+        async getExpelledStats(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<ExpelledStatsDto>>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getExpelledStats(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
@@ -10587,7 +10630,7 @@ export const CourseStatsApiFactory = function (configuration?: Configuration, ba
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getExpelledStats(options?: any): AxiosPromise<Array<CourseStatsDto>> {
+        getExpelledStats(options?: any): AxiosPromise<Array<ExpelledStatsDto>> {
             return localVarFp.getExpelledStats(options).then((request) => request(axios, basePath));
         },
         /**

client/src/components/Forms/Heroes/index.tsx

@@ -3,9 +3,8 @@ import { FormLayout } from 'antd/es/form/Form';
 import { useCallback, useEffect, useState } from 'react';
 import Masonry from 'react-masonry-css';
 import css from 'styled-jsx/css';
-import { IGratitudeGetRequest, IGratitudeGetResponse, HeroesFormData } from '@common/interfaces/gratitude';
 import heroesBadges from 'configs/heroes-badges';
-import { GratitudeService } from 'services/gratitude';
+import { GratitudeService, HeroesFormData, IGratitudeGetRequest, IGratitudeGetResponse } from 'services/gratitude';
 import { onlyDefined } from 'utils/onlyDefined';
 import { getFullName } from 'domain/user';
 import { useActiveCourseContext } from 'modules/Course/contexts';

client/src/components/Heroes/HeroesRadarTab.tsx

@@ -1,7 +1,7 @@
 import { FileExcelOutlined } from '@ant-design/icons';
 import { SessionContext, useActiveCourseContext } from '@client/modules/Course/contexts';
 import { onlyDefined } from '@client/utils/onlyDefined';
-import { IPaginationInfo } from '@common/types/pagination';
+import { IPaginationInfo } from '@client/utils/pagination';
 import type { TimeRangePickerProps } from 'antd';
 import { Button, Checkbox, DatePicker, Form, Row, Select, Space, TableProps } from 'antd';
 import { CountryDto, GratitudesApi, HeroesRadarDto, HeroRadarDto } from 'api';

client/src/components/MentorOptions.tsx

@@ -1,10 +1,10 @@
 import { Button, Form, FormInstance, Select } from 'antd';
-import { PreferredStudentsLocation } from '@common/enums/mentor';
 import { StudentSearch } from './StudentSearch';
+import { MentorDetailsDtoStudentsPreferenceEnum } from '@client/api/api';
 
 export type Options = {
   maxStudentsLimit: number;
-  preferedStudentsLocation: PreferredStudentsLocation;
+  preferedStudentsLocation: MentorDetailsDtoStudentsPreferenceEnum;
   students?: { value: number }[];
   preselectedStudents?: { id: number; githubId: string; name: string }[];
 };

client/src/modules/CourseManagement/components/ExpelledStudentsStats.tsx

@@ -5,15 +5,15 @@ import { PublicSvgIcon } from '@client/components/Icons';
 import { DEFAULT_COURSE_ICONS } from '@client/configs/course-icons';
 import { dateUtcRenderer } from '@client/components/Table';
 import { useExpelledStats } from '@client/modules/CourseManagement/hooks/useExpelledStats';
-import { DetailedExpelledStat } from '@common/models';
+import { ExpelledStatsDto } from '@client/api';
 
 const { Title, Text } = Typography;
 
 const ExpelledStudentsStats: React.FC = () => {
   const { data, error, loading, isDeleting, handleDelete } = useExpelledStats();
   const [csvUrl, setCsvUrl] = React.useState<string | null>(null);
   const downloadRef = React.useRef<HTMLAnchorElement>(null);
-  const columns: ColumnsType<DetailedExpelledStat> = [
+  const columns: ColumnsType<ExpelledStatsDto> = [
     {
       title: 'Course',
       dataIndex: ['course', 'name'],
@@ -80,7 +80,7 @@ const ExpelledStudentsStats: React.FC = () => {
     return value;
   };
 
-  const getValueFromDataIndex = (row: DetailedExpelledStat, dataIndex: unknown): string => {
+  const getValueFromDataIndex = (row: ExpelledStatsDto, dataIndex: unknown): string => {
     if (Array.isArray(dataIndex)) {
       let current: unknown = row;
 
@@ -93,14 +93,14 @@ const ExpelledStudentsStats: React.FC = () => {
     }
 
     if (typeof dataIndex === 'string' || typeof dataIndex === 'number') {
-      const value = row[dataIndex as keyof DetailedExpelledStat];
+      const value = row[dataIndex as keyof ExpelledStatsDto];
       return value !== undefined && value !== null ? String(value) : '';
     }
 
     return '';
   };
 
-  const getSpecialColumnValue = (row: DetailedExpelledStat, columnKey: string): string => {
+  const getSpecialColumnValue = (row: ExpelledStatsDto, columnKey: string): string => {
     switch (columnKey) {
       case 'reasons':
         return row.reasonForLeaving ? row.reasonForLeaving.map(r => r.replace(/_/g, ' ')).join('; ') : '';
@@ -115,7 +115,7 @@ const ExpelledStudentsStats: React.FC = () => {
     }
   };
 
-  const formatRowToCsv = (row: DetailedExpelledStat, exportableColumns: ColumnType<DetailedExpelledStat>[]): string => {
+  const formatRowToCsv = (row: ExpelledStatsDto, exportableColumns: ColumnType<ExpelledStatsDto>[]): string => {
     return exportableColumns
       .map(col => {
         let value = '';
@@ -137,7 +137,7 @@ const ExpelledStudentsStats: React.FC = () => {
     }
 
     const exportableColumns = columns.filter(
-      (col): col is ColumnType<DetailedExpelledStat> => 'dataIndex' in col && col.dataIndex !== undefined,
+      (col): col is ColumnType<ExpelledStatsDto> => 'dataIndex' in col && col.dataIndex !== undefined,
     );
 
     const headers = exportableColumns

client/src/modules/CourseManagement/hooks/useExpelledStats.ts

@@ -1,31 +1,41 @@
+import { CourseStatsApi, ExpelledStatsDto } from '@client/api/api';
 import { useRequest } from 'ahooks';
 import { useState } from 'react';
-import { DetailedExpelledStat } from '@common/models';
 
-const fetchExpelledStats = async (): Promise<DetailedExpelledStat[]> => {
-  const response = await fetch('/api/v2/courses/stats/expelled');
-  if (!response.ok) {
-    throw new Error('Failed to fetch stats');
-  }
-  return response.json() as Promise<DetailedExpelledStat[]>;
+export interface DetailedExpelledStat {
+  id: string;
+  course: {
+    id: number;
+    name: string;
+    fullName: string;
+    alias: string;
+    description: string;
+    logo: string;
+  };
+  user: {
+    id: number;
+    githubId: string;
+  };
+  reasonForLeaving?: string[];
+  otherComment: string;
+  submittedAt: Date;
+}
+
+const api = new CourseStatsApi();
+
+const fetchExpelledStats = async (): Promise<ExpelledStatsDto[]> => {
+  const response = await api.getExpelledStats();
+  return response.data;
 };
 
 export const useExpelledStats = () => {
-  const { data, error, loading, refresh } = useRequest(fetchExpelledStats);
+  const { data, error, loading } = useRequest(fetchExpelledStats);
   const [isDeleting, setIsDeleting] = useState(false);
 
   const handleDelete = async (id: string) => {
     setIsDeleting(true);
     try {
-      const response = await fetch(`/api/v2/courses/stats/expelled/${id}`, {
-        method: 'DELETE',
-      });
-      if (!response.ok) {
-        throw new Error('Failed to delete stat');
-      }
-      if (typeof refresh === 'function') {
-        refresh();
-      }
+      await api.deleteExpelledStat(id);
     } catch (err) {
       console.error('Error deleting stat:', err);
     } finally {

client/src/modules/CrossCheckPairs/pages/CrossCheckPairs/CrossCheckPairs.tsx

@@ -1,7 +1,7 @@
 import { Collapse, Modal, Space, TablePaginationConfig } from 'antd';
 import { Comment } from '@ant-design/compatible';
 import { FilterValue } from 'antd/lib/table/interface';
-import { IPaginationInfo } from '@common/types/pagination';
+import { IPaginationInfo } from '@client/utils/pagination';
 import { AdminPageLayout } from 'components/PageLayout';
 import { dateTimeRenderer } from 'components/Table';
 import { useCallback, useEffect, useMemo, useState } from 'react';

client/src/modules/Interviews/pages/StageInterviewFeedback/feedbackTemplateHandler.test.ts

@@ -1,16 +1,11 @@
+import { InterviewFeedbackValues } from '@common/models/interview';
 import {
   getFeedbackFromTemplate,
   getDefaultStep,
   isInterviewCanceled,
   getUpdatedFeedback,
 } from './feedbackTemplateHandler';
-import {
-  Decision,
-  Feedback,
-  FeedbackStepId,
-  InterviewFeedbackValues,
-  feedbackTemplate,
-} from 'data/interviews/technical-screening';
+import { Decision, Feedback, FeedbackStepId, feedbackTemplate } from 'data/interviews/technical-screening';
 
 describe('getFeedbackFromTemplate', () => {
   test('should return default template when no feedback exists', () => {

client/src/modules/Mentor/pages/Interviews/components/MentorPreferencesModal.tsx

@@ -3,10 +3,9 @@ import { MentorOptions, Options } from 'components/MentorOptions';
 import React, { createContext, useState } from 'react';
 import { useAsync } from 'react-use';
 import { CourseService } from 'services/course';
-import { MentorsApi } from 'api';
+import { MentorDetailsDtoStudentsPreferenceEnum, MentorsApi } from 'api';
 import { getMentorId } from 'domain/user';
 import { Session } from 'components/withSession';
-import { PreferredStudentsLocation } from '@common/enums/mentor';
 
 type Props = {
   course: { id: number; name: string };
@@ -46,7 +45,7 @@ function MentorOptionsModal({ course, close, session }: Props & { close: () => v
     const { students, maxStudentsLimit, preferedStudentsLocation } = mentor;
     setOptions({
       maxStudentsLimit,
-      preferedStudentsLocation: preferedStudentsLocation as PreferredStudentsLocation,
+      preferedStudentsLocation: preferedStudentsLocation as MentorDetailsDtoStudentsPreferenceEnum,
       students: students.map(s => ({ value: s.id })),
       preselectedStudents: students,
     });

client/src/modules/MentorTasksReview/pages/MentorTasksReview.tsx

@@ -3,7 +3,7 @@ import { message, Space, TablePaginationConfig, Typography } from 'antd';
 import { FilterValue } from 'antd/es/table/interface';
 import { SorterResult } from 'antd/lib/table/interface';
 import { CoursesTasksApi, CourseTaskDtoCheckerEnum, MentorReviewDto, MentorReviewsApi } from 'api';
-import { IPaginationInfo } from '@common/types/pagination';
+import { IPaginationInfo } from '@client/utils/pagination';
 import { AdminPageLayout } from 'components/PageLayout';
 import { useLoading } from 'components/useLoading';
 import { isCourseManager } from 'domain/user';