Merge pull request #381 from qa-guru/develop

Develop

Author: nik1999777

.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 renamed to 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
     }