Merge branch 'master' into rs-app-2147

rolling-scopes · Nov 1, 2023 · 30a1d61 · 30a1d61
2 parents 249a2d5 + 987c03a
commit 30a1d61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/client/src/pages/course/student/auto-test/task.tsx b/client/src/pages/course/student/auto-test/task.tsx
@@ -5,6 +5,7 @@ import { GetServerSideProps } from 'next';
 import { CoursesTasksApi } from 'api';
 import { getApiConfiguration } from 'utils/axios';
 import { getTokenFromContext } from 'utils/server';
+import dayjs from 'dayjs';
 
 function Page(props: AutoTestTaskProps) {
   return (
@@ -27,12 +28,20 @@ export const getServerSideProps: GetServerSideProps<AutoTestTaskProps> = async c
 
   try {
     const course = result.props.course;
+
     if (course) {
       const { data: task } = await new CoursesTasksApi(getApiConfiguration(token)).getCourseTask(
         course.id,
         Number(courseTaskId),
       );
 
+      const now = dayjs();
+      const startDate = dayjs(task.studentStartDate);
+
+      if (startDate > now) {
+        return noAccessResponse;
+      }
+
       return {
         props: { course, task },
       };

diff --git a/nestjs/src/courses/task-verifications/task-verifications.service.ts b/nestjs/src/courses/task-verifications/task-verifications.service.ts
@@ -109,6 +109,10 @@ export class TaskVerificationsService {
       throw new BadRequestException(`Course task does not belong to the student's course`);
     }
 
+    if (courseTask.studentStartDate && courseTask.studentStartDate > new Date()) {
+      throw new BadRequestException(`Task Verification ${courseTask.task.name} not started`);
+    }
+
     const existing = await this.taskVerificationsRepository.findOne({
       where: {
         status: 'pending',