Merge pull request #358 from qa-guru/QAGDEV-681

QAGDEV-681 - Подключение проекта к S3

Author: nik1999777

.env.development

@@ -6,4 +6,7 @@ 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"

.env.production

@@ -5,4 +5,7 @@ VITE_REFRESH_TOKEN=/api/refreshtoken
 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_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

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

@@ -0,0 +1,51 @@
+mutation createHomeWorkToCheck(
+  $lectureId: ID!
+  $content: String!
+  $trainingId: ID!
+) {
+  createHomeWorkToCheck(
+    lectureId: $lectureId
+    content: $content
+    trainingId: $trainingId
+  ) {
+    id
+    lecture {
+      id
+      subject
+      contentHomeWork
+    }
+    answer
+    status
+    training {
+      techStack
+    }
+    student {
+      id
+      firstName
+      avatar
+      lastName
+      rating {
+        rating
+      }
+    }
+    mentor {
+      id
+      firstName
+      avatar
+      lastName
+      rating {
+        rating
+      }
+    }
+    filesHomeWork {
+      id
+      creationDate
+      fileName
+      contentType
+      size
+    }
+    creationDate
+    startCheckingDate
+    endCheckingDate
+  }
+}

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

@@ -4,9 +4,13 @@ query homeWorkByLectureAndTraining($lectureId: ID!, $trainingId: ID!) {
     lecture {
       id
       subject
+      contentHomeWork
     }
     answer
     status
+    training {
+      techStack
+    }
     student {
       id
       firstName
@@ -16,6 +20,22 @@ query homeWorkByLectureAndTraining($lectureId: ID!, $trainingId: ID!) {
         rating
       }
     }
+    mentor {
+      id
+      firstName
+      avatar
+      lastName
+      rating {
+        rating
+      }
+    }
+    filesHomeWork {
+      id
+      creationDate
+      fileName
+      contentType
+      size
+    }
     creationDate
     startCheckingDate
     endCheckingDate

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

@@ -1,13 +1,5 @@
-mutation sendHomeWorkToCheck(
-  $lectureId: ID!
-  $content: String!
-  $trainingId: ID!
-) {
-  sendHomeWorkToCheck(
-    lectureId: $lectureId
-    content: $content
-    trainingId: $trainingId
-  ) {
+mutation sendHomeWorkToCheck($homeWorkId: ID!) {
+  sendHomeWorkToCheck(homeWorkId: $homeWorkId) {
     id
     lecture {
       id

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

@@ -0,0 +1,65 @@
+import axios, { type AxiosResponse } from "axios";
+import {
+  HOMEWORK_FILE_DELETE_URI,
+  HOMEWORK_FILE_GET_URI,
+  HOMEWORK_FILE_UPLOAD_URI,
+} from "config";
+
+export interface HomeworkFileResponse {
+  id: string;
+  fileName: string;
+  contentType: string;
+  size: number;
+  creationDate: string;
+}
+
+export default class HomeworkFileService {
+  static uploadFile(
+    homeWorkId: string,
+    file: File
+  ): Promise<AxiosResponse<HomeworkFileResponse>> {
+    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
+    );
+
+    return axios({
+      method: "POST",
+      url: uploadFileUrl,
+      headers: { "Content-Type": "multipart/form-data" },
+      data: formData,
+    });
+  }
+
+  static getFile(
+    homeWorkId: string,
+    fileId: string
+  ): Promise<AxiosResponse<Blob>> {
+    const getFileUrl = HOMEWORK_FILE_GET_URI.replace(
+      ":homeWorkId",
+      homeWorkId
+    ).replace(":fileId", fileId);
+
+    return axios({
+      method: "GET",
+      url: getFileUrl,
+      responseType: "blob",
+    });
+  }
+
+  static deleteFile(homeWorkId: string): Promise<AxiosResponse<void>> {
+    const deleteUrl = HOMEWORK_FILE_DELETE_URI.replace(
+      ":homeWorkId",
+      homeWorkId
+    );
+
+    return axios({
+      method: "DELETE",
+      url: deleteUrl,
+    });
+  }
+}

src/config.ts

@@ -6,3 +6,8 @@ export const AVATAR_DELETE_URI = import.meta.env.VITE_AVATAR_DELETE_URI;
 export const TRAINING_UPLOAD_URI = import.meta.env.VITE_TRAINING_UPLOAD_URI;
 export const TRAINING_DELETE_URI = import.meta.env.VITE_TRAINING_DELETE_URI;
 export const REFRESH_TOKEN_URI = import.meta.env.VITE_REFRESH_TOKEN;
+export const HOMEWORK_FILE_UPLOAD_URI = import.meta.env
+  .VITE_HOMEWORK_FILE_UPLOAD_URI;
+export const HOMEWORK_FILE_GET_URI = import.meta.env.VITE_HOMEWORK_FILE_GET_URI;
+export const HOMEWORK_FILE_DELETE_URI = import.meta.env
+  .VITE_HOMEWORK_FILE_DELETE_URI;

src/shared/components/text-editor/comment-editor/comment-editor.tsx

@@ -7,7 +7,7 @@ import { LinkBubbleMenu, RichTextEditor } from "shared/lib/mui-tiptap";
 import { TableBubbleMenu, MenuButton } from "shared/lib/mui-tiptap/controls";
 
 import { EditorMenuControls } from "./ui";
-import { fileListToImageFiles } from "../utils/fileListToImageFiles";
+import { fileListToImageFiles } from "../utils/file-list-to-image-files";
 import useExtensions from "../hooks/use-extensions";
 import { ITextEditor } from "../types";