Develop

.env.development

@@ -6,7 +6,16 @@ VITE_AVATAR_UPLOAD_URI=/upload/avatar
 VITE_AVATAR_DELETE_URI=/upload/avatar
 VITE_TRAINING_UPLOAD_URI=/upload/training/:id
 VITE_TRAINING_DELETE_URI=/upload/training/:id
-VITE_HOMEWORK_FILE_UPLOAD_URI=/homework/:homeWorkId/file
-VITE_HOMEWORK_FILE_GET_URI=/homework/:homeWorkId/file/:fileId
-VITE_HOMEWORK_FILE_DELETE_URI=/homework/:homeWorkId/file
-VITE_APP_ENDPOINT="http://app-stage.qa.guru:8080"
+VITE_HOMEWORK_FILE_UPLOAD_URI=/student/homework/:homeWorkId/file
+VITE_HOMEWORK_FILE_GET_URI=/student/homework/:homeWorkId/file/:fileId
+VITE_HOMEWORK_FILE_DELETE_URI=/student/homework/:homeWorkId/file/:fileId
+VITE_LECTURE_FILE_UPLOAD_URI=/lecture/:lectureId/file
+VITE_LECTURE_FILE_GET_URI=/lecture/:lectureId/file/:fileId
+VITE_LECTURE_FILE_DELETE_URI=/lecture/:lectureId/file/:fileId
+VITE_LECTURE_HOMEWORK_FILE_UPLOAD_URI=/lecture/:lectureId/homework/file
+VITE_LECTURE_HOMEWORK_FILE_GET_URI=/lecture/:lectureId/homework/file/:fileId
+VITE_LECTURE_HOMEWORK_FILE_DELETE_URI=/lecture/:lectureId/homework/file/:fileId
+VITE_HOMEWORK_COMMENT_FILE_UPLOAD_URI=/homework/comment/:commentId/file
+VITE_HOMEWORK_COMMENT_FILE_GET_URI=/homework/comment/:commentId/file/:fileId
+VITE_HOMEWORK_COMMENT_FILE_DELETE_URI=/homework/comment/:commentId/file/:fileId
+VITE_APP_ENDPOINT="http://app-stage.qa.guru:8080"

.env.production

@@ -6,6 +6,15 @@ VITE_AVATAR_UPLOAD_URI=/api/upload/avatar
 VITE_AVATAR_DELETE_URI=/api/upload/avatar
 VITE_TRAINING_UPLOAD_URI=/api/upload/training/:id
 VITE_TRAINING_DELETE_URI=/api/upload/training/:id
-VITE_HOMEWORK_FILE_UPLOAD_URI=/api/homework/:homeWorkId/file
-VITE_HOMEWORK_FILE_GET_URI=/api/homework/:homeWorkId/file/:fileId
-VITE_HOMEWORK_FILE_DELETE_URI=/api/homework/:homeWorkId/file
+VITE_HOMEWORK_FILE_UPLOAD_URI=/api/student/homework/:homeWorkId/file
+VITE_HOMEWORK_FILE_GET_URI=/api/student/homework/:homeWorkId/file/:fileId
+VITE_HOMEWORK_FILE_DELETE_URI=/api/student/homework/:homeWorkId/file/:fileId
+VITE_LECTURE_FILE_UPLOAD_URI=/api/lecture/:lectureId/file
+VITE_LECTURE_FILE_GET_URI=/api/lecture/:lectureId/file/:fileId
+VITE_LECTURE_FILE_DELETE_URI=/api/lecture/:lectureId/file/:fileId
+VITE_LECTURE_HOMEWORK_FILE_UPLOAD_URI=/api/lecture/:lectureId/homework/file
+VITE_LECTURE_HOMEWORK_FILE_GET_URI=/api/lecture/:lectureId/homework/file/:fileId
+VITE_LECTURE_HOMEWORK_FILE_DELETE_URI=/api/lecture/:lectureId/homework/file/:fileId
+VITE_HOMEWORK_COMMENT_FILE_UPLOAD_URI=/api/homework/comment/:commentId/file
+VITE_HOMEWORK_COMMENT_FILE_GET_URI=/api/homework/comment/:commentId/file/:fileId
+VITE_HOMEWORK_COMMENT_FILE_DELETE_URI=/api/homework/comment/:commentId/file/:fileId

.github/workflows/frontend_deploy_test.yml

@@ -33,3 +33,12 @@ jobs:
         run:
           #            rm -rf /var/www/app.qa.guru/html/*
           cp -r dist/* /var/www/app-stage.qa.guru/html/
+
+  runtest_jenkins:
+    runs-on: stage-runner
+    needs: yarn-and-node
+    steps:
+      - name: jenkins
+        run: curl -X POST "https://jenkins.autotests.cloud/buildByToken/buildWithParameters?job=qa-guru-app-tests&token=$TOKEN&TAG=UI"
+        env:
+          TOKEN: ${{ secrets.JENKINS_TOKEN }}

codegen.ts

@@ -2,7 +2,10 @@ import type { CodegenConfig } from "@graphql-codegen/cli";
 import "dotenv/config";
 
 const config: CodegenConfig = {
-  schema: `${process.env.APP_ENDPOINT}${process.env.GRAPHQL_URI}`,
+  schema: [
+    `${process.env.APP_ENDPOINT}${process.env.GRAPHQL_URI}`,
+    "src/api/schema.graphql",
+  ],
   documents: ["src/**/*.graphql"],
   generates: {
     "src/api/graphql/generated/graphql.tsx": {

src/api/graphql/homework/create-homework-to-check.graphql

@@ -17,6 +17,7 @@ mutation createHomeWorkToCheck(
     answer
     status
     training {
+      id
       techStack
     }
     student {

src/api/graphql/homework/homework-by-lecture-and-training.graphql

@@ -9,6 +9,7 @@ query homeWorkByLectureAndTraining($lectureId: ID!, $trainingId: ID!) {
     answer
     status
     training {
+      id
       techStack
     }
     student {

src/api/graphql/homework/send-homework-to-check.graphql → src/api/graphql/homework/send-hom-work-to-check.graphql

@@ -4,13 +4,13 @@ mutation sendHomeWorkToCheck($homeWorkId: ID!) {
     lecture {
       id
       subject
+      description
       contentHomeWork
     }
-    answer
-    status
     training {
       techStack
     }
+    answer
     student {
       id
       firstName
@@ -29,7 +29,15 @@ mutation sendHomeWorkToCheck($homeWorkId: ID!) {
         rating
       }
     }
+    filesHomeWork {
+      id
+      creationDate
+      fileName
+      contentType
+      size
+    }
     creationDate
+    updateDate
     startCheckingDate
     endCheckingDate
   }

src/api/graphql/homework/update-homework.graphql

@@ -9,6 +9,7 @@ mutation updateHomework($id: ID!, $content: String!) {
     answer
     status
     training {
+      id
       techStack
     }
     student {
@@ -29,6 +30,13 @@ mutation updateHomework($id: ID!, $content: String!) {
         rating
       }
     }
+    filesHomeWork {
+      id
+      creationDate
+      fileName
+      contentType
+      size
+    }
     creationDate
     startCheckingDate
     endCheckingDate

src/api/graphql/lecture/lecture.graphql

@@ -14,5 +14,13 @@ query lecture($id: ID!) {
     subject
     description
     content
+    files {
+      id
+      homeWork
+      creationDate
+      fileName
+      contentType
+      size
+    }
   }
 }

src/api/graphql/user/user.graphql

@@ -11,6 +11,7 @@ query user {
     linkedin
     avatar
     creationDate
+    phoneNumber
     rating {
       rating
     }

src/api/rest/auth-service.ts

@@ -1,8 +1,7 @@
 import axios, { type AxiosResponse } from "axios";
+import { LOGIN_URI, LOGOUT_URI, REFRESH_TOKEN_URI } from "config";
 import qs from "qs";
 
-import { LOGIN_URI, LOGOUT_URI, REFRESH_TOKEN_URI } from "../../config";
-
 export interface LoginResponse {
   username: string;
   password: string;

src/api/rest/avatar-upload-service.ts

@@ -1,6 +1,5 @@
 import axios, { type AxiosResponse } from "axios";
-
-import { AVATAR_UPLOAD_URI, AVATAR_DELETE_URI } from "../../config";
+import { AVATAR_DELETE_URI, AVATAR_UPLOAD_URI } from "config";
 
 export interface AvatarUploadResponse {
   file: string | File;

src/api/rest/homework-comment-serivce.ts

@@ -0,0 +1,71 @@
+import axios, { type AxiosResponse } from "axios";
+import {
+  HOMEWORK_COMMENT_FILE_UPLOAD_URI,
+  HOMEWORK_COMMENT_FILE_GET_URI,
+  HOMEWORK_COMMENT_FILE_DELETE_URI,
+} from "config";
+
+import { createUrlWithParams } from "shared/utils";
+
+export interface HomeworkFileResponse {
+  id: string;
+  fileName: string;
+  contentType: string;
+  size: number;
+  creationDate: string;
+}
+
+export default class HomeworkCommentFileService {
+  static uploadFile(
+    commentId: string,
+    file: File
+  ): Promise<AxiosResponse<HomeworkFileResponse>> {
+    const formData = new FormData();
+    formData.append("file", file);
+
+    const uploadFileUrl = createUrlWithParams(
+      HOMEWORK_COMMENT_FILE_UPLOAD_URI,
+      {
+        commentId,
+      }
+    );
+
+    return axios({
+      method: "POST",
+      url: uploadFileUrl,
+      headers: { "Content-Type": "multipart/form-data" },
+      data: formData,
+    });
+  }
+
+  static getFile(
+    commentId: string,
+    fileId: string
+  ): Promise<AxiosResponse<Blob>> {
+    const getFileUrl = createUrlWithParams(HOMEWORK_COMMENT_FILE_GET_URI, {
+      commentId,
+      fileId,
+    });
+
+    return axios({
+      method: "GET",
+      url: getFileUrl,
+      responseType: "blob",
+    });
+  }
+
+  static deleteFile(
+    commentId: string,
+    fileId: string
+  ): Promise<AxiosResponse<void>> {
+    const deleteUrl = createUrlWithParams(HOMEWORK_COMMENT_FILE_DELETE_URI, {
+      commentId,
+      fileId,
+    });
+
+    return axios({
+      method: "DELETE",
+      url: deleteUrl,
+    });
+  }
+}

src/api/rest/homework-file-service.ts

@@ -5,6 +5,8 @@ import {
   HOMEWORK_FILE_UPLOAD_URI,
 } from "config";
 
+import { createUrlWithParams } from "shared/utils";
+
 export interface HomeworkFileResponse {
   id: string;
   fileName: string;
@@ -21,11 +23,9 @@ export default class HomeworkFileService {
     const formData = new FormData();
     formData.append("file", file);
 
-    const uploadFileUrl = HOMEWORK_FILE_UPLOAD_URI.replace(
-      // eslint-disable-next-line sonarjs/no-duplicate-string
-      ":homeWorkId",
-      homeWorkId
-    );
+    const uploadFileUrl = createUrlWithParams(HOMEWORK_FILE_UPLOAD_URI, {
+      homeWorkId,
+    });
 
     return axios({
       method: "POST",
@@ -39,10 +39,10 @@ export default class HomeworkFileService {
     homeWorkId: string,
     fileId: string
   ): Promise<AxiosResponse<Blob>> {
-    const getFileUrl = HOMEWORK_FILE_GET_URI.replace(
-      ":homeWorkId",
-      homeWorkId
-    ).replace(":fileId", fileId);
+    const getFileUrl = createUrlWithParams(HOMEWORK_FILE_GET_URI, {
+      homeWorkId,
+      fileId,
+    });
 
     return axios({
       method: "GET",
@@ -51,11 +51,14 @@ export default class HomeworkFileService {
     });
   }
 
-  static deleteFile(homeWorkId: string): Promise<AxiosResponse<void>> {
-    const deleteUrl = HOMEWORK_FILE_DELETE_URI.replace(
-      ":homeWorkId",
-      homeWorkId
-    );
+  static deleteFile(
+    homeWorkId: string,
+    fileId: string
+  ): Promise<AxiosResponse<void>> {
+    const deleteUrl = createUrlWithParams(HOMEWORK_FILE_DELETE_URI, {
+      homeWorkId,
+      fileId,
+    });
 
     return axios({
       method: "DELETE",

src/api/rest/lecture-file-service.ts

@@ -0,0 +1,68 @@
+import axios, { type AxiosResponse } from "axios";
+import {
+  LECTURE_FILE_UPLOAD_URI,
+  LECTURE_FILE_GET_URI,
+  LECTURE_FILE_DELETE_URI,
+} from "config";
+
+import { createUrlWithParams } from "shared/utils";
+
+export interface LectureFileResponse {
+  id: string;
+  fileName: string;
+  contentType: string;
+  size: number;
+  creationDate: string;
+}
+
+export default class LectureFileService {
+  static uploadFile(
+    lectureId: string,
+    file: File
+  ): Promise<AxiosResponse<LectureFileResponse>> {
+    const formData = new FormData();
+    formData.append("file", file);
+
+    const uploadFileUrl = createUrlWithParams(LECTURE_FILE_UPLOAD_URI, {
+      lectureId,
+    });
+
+    return axios({
+      method: "POST",
+      url: uploadFileUrl,
+      headers: { "Content-Type": "multipart/form-data" },
+      data: formData,
+    });
+  }
+
+  static getFile(
+    lectureId: string,
+    fileId: string
+  ): Promise<AxiosResponse<Blob>> {
+    const getFileUrl = createUrlWithParams(LECTURE_FILE_GET_URI, {
+      lectureId,
+      fileId,
+    });
+
+    return axios({
+      method: "GET",
+      url: getFileUrl,
+      responseType: "blob",
+    });
+  }
+
+  static deleteFile(
+    lectureId: string,
+    fileId: string
+  ): Promise<AxiosResponse<void>> {
+    const deleteUrl = createUrlWithParams(LECTURE_FILE_DELETE_URI, {
+      lectureId,
+      fileId,
+    });
+
+    return axios({
+      method: "DELETE",
+      url: deleteUrl,
+    });
+  }
+}