Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/api/v1/task/schemas.py

@@ -33,6 +33,7 @@ class TaskOutSchema(ModelSchema):
             "description",
             "in_competition_position",
             "points",
+            "max_attempts"
         ]
 
 

services/backend/api/v1/user/views.py

@@ -21,7 +21,7 @@ from api.v1.user.schemas import (
     TokenSchema,
     UserSchema,
 )
-from apps.task.models import CompetitionTaskSubmission
+from apps.task.models import CompetitionTaskSubmission, CompetitionTask
 from apps.user.models import User
 
 router = Router(tags=["user"])
@@ -104,9 +104,10 @@ def get_my_stat(request):
     success_attempts_cnt = 0
 
     for attempt in checked_attempts:
-        is_correct = attempt.result.get("correct", None)
-        if is_correct is None:
-            is_correct = attempt.result.get("total_points", 0) > 0
+        if attempt.task.type == CompetitionTask.CompetitionTaskType.REVIEW:
+            is_correct = attempt.earned_points > 0
+        else:
+            is_correct = attempt.result.get("correct", None)
 
         if is_correct:
             success_attempts_cnt += 1

services/backend/apps/achievement/management/commands/init_achievments.py

@@ -30,3 +30,13 @@ class Command(BaseCommand):
                     slug="welcome",
                     icon=welcome_icon,
                 )
+
+        if not Achievement.objects.filter(slug="start_competition").exists():
+            with open(f"{icons_dir}/start_competition.png", "rb") as f:
+                start_competition = File(f, name="start_competition.png")
+                Achievement.objects.get_or_create(
+                    name="Да начнётся битва!",
+                    description="Начните соревнование",
+                    slug="start_competition",
+                    icon=start_competition,
+                )

services/backend/apps/competition/apps.py

@@ -5,3 +5,6 @@ class CompetitionsConfig(AppConfig):
     name = "apps.competition"
     label = "competition"
     verbose_name = "Соревнование"
+
+    def ready(self):
+        import apps.competition.signals

services/backend/apps/competition/signals.py

@@ -0,0 +1,17 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from apps.achievement.models import Achievement, UserAchievement
+from apps.competition.models import State
+from apps.user.models import User
+
+
+@receiver(post_save, sender=State)
+def assign_start_competition_achievement(sender, instance, created, **kwargs):
+    if created:
+        if State.objects.filter(user=instance.user, state=State.StateChoices.STARTED.value).count() == 1 \
+                and not State.objects.filter(user=instance.user, state=State.StateChoices.FINISHED.value).exists():
+            start_competition_achievement = Achievement.objects.get(slug="start_competition")
+            UserAchievement.objects.create(
+                user=instance.user, achievement=start_competition_achievement
+            )

services/frontend/src/pages/CompetitionSession/components/CompetitionHeader/index.tsx

@@ -2,13 +2,14 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Task } from '@/shared/types/task';
 import { ArrowLeft } from 'lucide-react'; 
+import { useNavigate } from 'react-router-dom';
 
 interface CompetitionHeaderProps {
   title: string;
   tasks: Task[];
   competitionId: string;
   setAnswer: (value: string) => void;
-  setSelectedFile: (file: File | null) => void;  // заглушка
+  setSelectedFile: (file: File | null) => void;
 }
 
 const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({ 
@@ -18,11 +19,13 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
   setAnswer,
   setSelectedFile
 }) => {
+  const navigate = useNavigate();
 
-  const handleTaskSelect = () => {
-    setAnswer("")
-    setSelectedFile(null)
-    console.log("STOP IT")
+  const handleTaskSelect = (taskId: string) => {
+    setAnswer("");
+    setSelectedFile(null);
+    
+    navigate(`/competition/${competitionId}/tasks/${taskId}`);
   }
 
   return (
@@ -32,7 +35,6 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
           <Link 
             to={`/competition/${competitionId}`}
             className="flex items-center text-gray-600 hover:text-gray-900 transition-colors font-hse-sans text-sm"
-            onClick={handleTaskSelect}
           >
             <ArrowLeft className="h-4 w-4 mr-1" />
           </Link>
@@ -46,16 +48,16 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
         
         <div className="flex items-center justify-center gap-4 pb-4 overflow-x-auto no-scrollbar">
           {tasks.map((task) => (
-            <Link
-              key={task.id}
-              to={`/competition/${competitionId}/tasks/${task.id}`}
-              className={`text-[var(--color-task-text-uncleared)] bg-[var(--color-task-uncleared)]
-                rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer 
-                transition-all hover:brightness-95 flex-shrink-0
-                `}
-            >
-              {task.in_competition_position}
-            </Link>
+          <button
+            key={task.id}
+            className={`text-[var(--color-task-text-uncleared)] bg-[var(--color-task-uncleared)]
+              rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer 
+              transition-all hover:brightness-95 flex-shrink-0
+              `}
+            onClick={() => handleTaskSelect(task.id)}
+          >
+            {task.in_competition_position}
+          </button>
           ))}
         </div>
       </div>

services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/FileSolution/index.tsx

@@ -8,6 +8,7 @@ interface FileSolutionProps {
   fileInputRef: React.RefObject<HTMLInputElement>;
   existingFileUrl?: string | null; 
   onClearExistingFile?: () => void; // New prop to clear existing file URL
+  firstSolution: boolean
 }
 
 const FileSolution: React.FC<FileSolutionProps> = ({ 
@@ -15,7 +16,8 @@ const FileSolution: React.FC<FileSolutionProps> = ({
   setSelectedFile, 
   fileInputRef,
   existingFileUrl = null,
-  onClearExistingFile
+  onClearExistingFile,
+  firstSolution
 }) => {
   const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     if (event.target.files && event.target.files[0]) {
@@ -59,9 +61,6 @@ const FileSolution: React.FC<FileSolutionProps> = ({
     }
   };
 
-  const handleSelectNewFile = () => {
-    fileInputRef.current?.click();
-  };
 
   const fileName = selectedFile 
     ? selectedFile.name 
@@ -69,7 +68,7 @@ const FileSolution: React.FC<FileSolutionProps> = ({
       ? existingFileUrl.split('/').pop() || 'file' 
       : '';
 
-  const hasFile = !!selectedFile || !!existingFileUrl;
+  const hasFile = !!selectedFile || (!!existingFileUrl && !firstSolution);
 
   return (
     <>

services/frontend/src/pages/CompetitionSession/modules/TaskSolution/index.tsx

@@ -1,168 +1,170 @@
-import React, { useState, useRef, useEffect } from 'react';
-import { useParams } from 'react-router-dom';
-import { Task, TaskType, Solution } from '@/shared/types/task';
-import { useQuery } from '@tanstack/react-query';
-import { getTaskSolutionHistory } from '@/shared/api/session';
-import SolutionStatus from './components/SolutionStatus';
-import InputSolution from './components/InputSolution';
-import FileSolution from './components/FileSolution';
-import CodeSolution from './components/CodeSolution';
-import ActionButtons from './components/ActionButtons';
-import SolutionHistorySheet from './components/SolutionHistorySheet';
+  import React, { useState, useRef, useEffect } from 'react';
+  import { useParams } from 'react-router-dom';
+  import { Task, TaskType, Solution } from '@/shared/types/task';
+  import { useQuery } from '@tanstack/react-query';
+  import { getTaskSolutionHistory } from '@/shared/api/session';
+  import SolutionStatus from './components/SolutionStatus';
+  import InputSolution from './components/InputSolution';
+  import FileSolution from './components/FileSolution';
+  import CodeSolution from './components/CodeSolution';
+  import ActionButtons from './components/ActionButtons';
+  import SolutionHistorySheet from './components/SolutionHistorySheet';
 
-interface TaskSolutionProps {
-  task: Task;
-  answer: string;
-  setAnswer: (value: string) => void;
-  selectedFile: File | null;
-  setSelectedFile: (file: File | null) => void;
-  onSubmit: () => void;
-}
+  interface TaskSolutionProps {
+    task: Task;
+    answer: string;
+    setAnswer: (value: string) => void;
+    selectedFile: File | null;
+    setSelectedFile: (file: File | null) => void;
+    onSubmit: () => void;
+  }
 
-const TaskSolution: React.FC<TaskSolutionProps> = ({ 
-  task, 
-  answer,
-  setAnswer,
-  selectedFile,
-  setSelectedFile, 
-  onSubmit,
-}) => {
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  const [isHistoryOpen, setIsHistoryOpen] = useState(false);
-  const [selectedSolutionUrl, setSelectedSolutionUrl] = useState<string | null>(null);
-  const [displayedSolution, setDisplayedSolution] = useState<Solution | null>(null);
-  const { id: competitionId } = useParams<{ id: string }>();
-  const prevTaskIdRef = useRef<string | null>(null);
+  const TaskSolution: React.FC<TaskSolutionProps> = ({ 
+    task, 
+    answer,
+    setAnswer,
+    selectedFile,
+    setSelectedFile, 
+    onSubmit,
+  }) => {
+    const fileInputRef = useRef<HTMLInputElement>(null);
+    const [isHistoryOpen, setIsHistoryOpen] = useState(false);
+    const [selectedSolutionUrl, setSelectedSolutionUrl] = useState<string | null>(null);
+    const [displayedSolution, setDisplayedSolution] = useState<Solution | null>(null);
+    const { id: competitionId } = useParams<{ id: string }>();
+    const prevTaskIdRef = useRef<string | null>(null);
 
-  const solutionsQuery = useQuery({
-    queryKey: ['solutionHistory', competitionId, task.id],
-    queryFn: () => getTaskSolutionHistory(competitionId || '', task.id),
-    enabled: !!(competitionId && task.id),
-  });
+    const solutionsQuery = useQuery({
+      queryKey: ['solutionHistory', competitionId, task.id],
+      queryFn: () => getTaskSolutionHistory(competitionId || '', task.id),
+      enabled: !!(competitionId && task.id),
+    });
 
-  const solutionHistory = solutionsQuery.data || [];
+    const solutionHistory = solutionsQuery.data || [];
 
-  useEffect(() => {
-    if (solutionHistory.length > 0 && !displayedSolution) {
-      const latestSolution = solutionHistory[solutionHistory.length - 1];
-      setDisplayedSolution(latestSolution);
-    }
-  }, [solutionHistory, displayedSolution]);
-
-  useEffect(() => {
-    if (prevTaskIdRef.current !== task.id) {
-      setDisplayedSolution(null);
-      setSelectedSolutionUrl(null);
-      
-      // If solutions are already loaded for the new task, set the latest one
-      if (solutionHistory.length > 0) {
+    useEffect(() => {
+      if (solutionHistory.length > 0 && !displayedSolution) {
         const latestSolution = solutionHistory[solutionHistory.length - 1];
         setDisplayedSolution(latestSolution);
       }
-      
-      prevTaskIdRef.current = task.id;
-    }
-  }, [task.id, solutionHistory]);
+    }, [solutionHistory, displayedSolution]);
 
-  // Check if a new solution was submitted (latest solution ID changed)
-  useEffect(() => {
-    if (solutionHistory.length > 0 && displayedSolution) {
-      const latestSolution = solutionHistory[solutionHistory.length - 1];
-      
-      // If the latest solution ID is different from the displayed one,
-      // a new solution was submitted - update to show the latest
-      if (latestSolution.id !== displayedSolution.id) {
-        setDisplayedSolution(latestSolution);
-      }
-    }
-  }, [solutionHistory, displayedSolution]);
-
-  // Load solution content when the displayed solution changes
-  useEffect(() => {
-    const loadSolutionContent = async () => {
-      if (!displayedSolution || !displayedSolution.content) return;
-      
-      try {
-        if (task.type === TaskType.FILE) {
-          setSelectedFile(null);
-          setSelectedSolutionUrl(displayedSolution.content);
-        } else {
-          const response = await fetch(displayedSolution.content);
-          if (!response.ok) {
-            throw new Error(`Failed to fetch solution content: ${response.status}`);
-          }
-          const text = await response.text();
-          setAnswer(text);
+    useEffect(() => {
+      if (prevTaskIdRef.current !== task.id) {
+        setDisplayedSolution(null);
+        setSelectedSolutionUrl(null);
+        
+        if (solutionHistory.length > 0) {
+          const latestSolution = solutionHistory[solutionHistory.length - 1];
+          setDisplayedSolution(latestSolution);
         }
-      } catch (error) {
-        console.error('Error loading solution content:', error);
+        
+        prevTaskIdRef.current = task.id;
       }
+    }, [task.id, solutionHistory]);
+
+    useEffect(() => {
+      if (solutionHistory.length > 0 && displayedSolution) {
+        const latestSolution = solutionHistory[solutionHistory.length - 1];
+        
+        if (latestSolution.id !== displayedSolution.id) {
+          setDisplayedSolution(latestSolution);
+        }
+      }
+    }, [solutionHistory, displayedSolution]);
+
+    // Load solution content when the displayed solution changes
+    useEffect(() => {
+      const loadSolutionContent = async () => {
+        if (!displayedSolution || !displayedSolution.content) return;
+        
+        try {
+          if (task.type === TaskType.FILE) {
+            setSelectedFile(null);
+            setSelectedSolutionUrl(displayedSolution.content);
+          } else {
+            const response = await fetch(displayedSolution.content);
+            if (!response.ok) {
+              throw new Error(`Failed to fetch solution content: ${response.status}`);
+            }
+            const text = await response.text();
+            setAnswer(text);
+          }
+        } catch (error) {
+          console.error('Error loading solution content:', error);
+        }
+      };
+
+      loadSolutionContent();
+    }, [displayedSolution, task.type, setAnswer, setSelectedFile]);
+
+    const handleOpenHistory = () => {
+      setIsHistoryOpen(true);
     };
 
-    loadSolutionContent();
-  }, [displayedSolution, task.type, setAnswer, setSelectedFile]);
+    const handleSolutionSelect = (solution: Solution) => {
+      setDisplayedSolution(solution);
+    };
 
-  const handleOpenHistory = () => {
-    setIsHistoryOpen(true);
+    const handleClearExistingFile = () => {
+      setSelectedSolutionUrl(null);
+    };
+
+    return (
+      <div className="md:w-[500px] flex flex-col gap-4">
+        {displayedSolution ? (
+          <>
+            <div className="bg-gray-100 rounded-lg p-4 text-gray-600 font-hse-sans">
+              Последнее решение
+            </div>
+            <SolutionStatus solution={displayedSolution} maxPoints={task.points}/>
+          </>
+
+        ) : (
+          <div className="bg-gray-100 rounded-lg p-4 text-gray-600 font-hse-sans">
+            Решение еще не отправлено
+          </div>
+        )}
+        
+        {task.type === TaskType.INPUT && (
+          <InputSolution 
+            answer={answer} 
+            setAnswer={setAnswer} 
+          />
+        )}
+        
+        {task.type === TaskType.FILE && (
+          <FileSolution 
+            selectedFile={selectedFile} 
+            setSelectedFile={setSelectedFile} 
+            fileInputRef={fileInputRef}
+            existingFileUrl={selectedSolutionUrl}
+            onClearExistingFile={handleClearExistingFile}
+            firstSolution={solutionHistory.length > 0}
+          />
+        )}
+        
+        {task.type === TaskType.CODE && (
+          <CodeSolution 
+            answer={answer} 
+            setAnswer={setAnswer}
+          />
+        )}
+        
+        <ActionButtons 
+          onSubmit={onSubmit} 
+          onHistoryClick={handleOpenHistory}
+        />
+        
+        <SolutionHistorySheet 
+          isOpen={isHistoryOpen} 
+          onOpenChange={setIsHistoryOpen} 
+          solutions={solutionHistory}
+          maxPoints={task.points}
+          onSolutionSelect={handleSolutionSelect}
+        />
+      </div>
+    );
   };
 
-  const handleSolutionSelect = (solution: Solution) => {
-    setDisplayedSolution(solution);
-    console.log(displayedSolution)
-  };
-
-  const handleClearExistingFile = () => {
-    setSelectedSolutionUrl(null);
-  };
-
-  return (
-    <div className="md:w-[500px] flex flex-col gap-4">
-      {displayedSolution ? (
-        <SolutionStatus solution={displayedSolution} maxPoints={task.points}/>
-      ) : (
-        <div className="bg-gray-100 rounded-lg p-4 text-gray-600 font-hse-sans">
-          Решение еще не отправлено
-        </div>
-      )}
-      
-      {task.type === TaskType.INPUT && (
-        <InputSolution 
-          answer={answer} 
-          setAnswer={setAnswer} 
-        />
-      )}
-      
-      {task.type === TaskType.FILE && (
-        <FileSolution 
-          selectedFile={selectedFile} 
-          setSelectedFile={setSelectedFile} 
-          fileInputRef={fileInputRef}
-          existingFileUrl={selectedSolutionUrl}
-          onClearExistingFile={handleClearExistingFile}
-        />
-      )}
-      
-      {task.type === TaskType.CODE && (
-        <CodeSolution 
-          answer={answer} 
-          setAnswer={setAnswer}
-        />
-      )}
-      
-      <ActionButtons 
-        onSubmit={onSubmit} 
-        onHistoryClick={handleOpenHistory}
-      />
-      
-      <SolutionHistorySheet 
-        isOpen={isHistoryOpen} 
-        onOpenChange={setIsHistoryOpen} 
-        solutions={solutionHistory}
-        maxPoints={task.points}
-        onSolutionSelect={handleSolutionSelect}
-      />
-    </div>
-  );
-};
-
-export default TaskSolution;
+  export default TaskSolution;