Merge pull request #87 from TurTaskProject/feature/kanban-board

Fix Kanban not work with api, fix style and now, calendar can only delete and view. Fix profile update page

Author: Sosokker

backend/tasks/misc/views.py

@@ -1,8 +1,10 @@
 from rest_framework import viewsets
+from rest_framework.permissions import IsAuthenticated
 from ..models import Tag
 from .serializers import TagSerializer
 
 
 class TagViewSet(viewsets.ModelViewSet):
     queryset = Tag.objects.all()
-    serializer_class = TagSerializer
+    serializer_class = TagSerializer
+    permission_classes = (IsAuthenticated,)

backend/tasks/models.py

@@ -81,6 +81,11 @@ class EisenhowerMatrix(models.IntegerChoices):
     priority = models.PositiveSmallIntegerField(choices=EisenhowerMatrix.choices, default=EisenhowerMatrix.NOT_IMPORTANT_NOT_URGENT)
 
     def save(self, *args, **kwargs):
+        done_list_name = "Done"
+        if self.list_board.name == done_list_name:
+            self.completed = True
+            Todo.objects.filter(list_board=self.list_board).update(completed=True)
+
         if self.completed and not self.completion_date:
             self.completion_date = timezone.now()
         elif not self.completed:

backend/tasks/tasks/serializers.py

@@ -1,9 +1,12 @@
 from rest_framework import serializers
 from users.models import CustomUser
 from boards.models import ListBoard
-from tasks.models import Todo, RecurrenceTask, Habit
+from tasks.models import Todo, RecurrenceTask, Habit, Subtask
 
 class TaskSerializer(serializers.ModelSerializer):
+    tags = serializers.SerializerMethodField()
+    sub_task_count = serializers.SerializerMethodField()
+    
     class Meta:
         model = Todo
         fields = '__all__'
@@ -19,6 +22,12 @@ def create(self, validated_data):
         validated_data['user'] = user
         return Todo.objects.create(**validated_data)
 
+    def get_tags(self, instance):
+        return [tag.name for tag in instance.tags.all()]
+
+    def get_sub_task_count(self, instance):
+        return instance.subtask_set.count()
+
 class TaskCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Todo
@@ -97,4 +106,14 @@ def create(self, validated_data):
 class HabitTaskCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Habit
-        exclude = ('tags',)
+        exclude = ('tags',)
+
+
+class SubTaskSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Subtask
+        fields = '__all__'
+
+    def create(self, validated_data):
+        # Create a new task with validated data
+        return Subtask.objects.create(**validated_data)

backend/tasks/tasks/views.py

@@ -4,10 +4,13 @@
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from rest_framework import mixins
 
-from .serializers import ChangeTaskListBoardSerializer, ChangeTaskOrderSerializer
+from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter
+
+from tasks.tasks.serializers import ChangeTaskListBoardSerializer, ChangeTaskOrderSerializer, SubTaskSerializer
 from boards.models import ListBoard, KanbanTaskOrder
-from tasks.models import Todo, RecurrenceTask, Habit
+from tasks.models import Todo, RecurrenceTask, Habit, Subtask
 from tasks.tasks.serializers import (TaskCreateSerializer,
                                      TaskSerializer,
                                      RecurrenceTaskSerializer,
@@ -32,6 +35,18 @@ def get_serializer_class(self):
             return TaskCreateSerializer
         return TaskSerializer
 
+    def list(self, request, *args, **kwargs):
+        """
+        list all tasks of the authenticated 
+        user and send tags if those Todo too.
+        """
+        try:
+            queryset = self.get_queryset()
+            serializer = TaskSerializer(queryset, many=True)
+            return Response(serializer.data)
+        except Exception as e:
+            return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
     def create(self, request, *args, **kwargs):
         try:
             new_task_data = request.data
@@ -117,6 +132,73 @@ def change_task_list_board(self, request):
             return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
 
+@extend_schema_view(
+list=extend_schema(
+    parameters=[
+        OpenApiParameter(name='parent_task', description='Parent Task ID', type=int),
+        ]
+    )
+)
+class SubTaskViewset(viewsets.GenericViewSet,
+                     mixins.CreateModelMixin,
+                     mixins.DestroyModelMixin,
+                     mixins.ListModelMixin,
+                     mixins.UpdateModelMixin):
+    queryset = Subtask.objects.all()
+    permission_classes = (IsAuthenticated,)
+
+    def get_serializer_class(self):
+        return SubTaskSerializer
+    
+    def list(self, request, *args, **kwargs):
+        """List only subtask of parent task."""
+        try:
+            parent_task = request.query_params.get('parent_task')
+            if not parent_task:
+                raise serializers.ValidationError('parent_task is required.')
+            queryset = self.get_queryset().filter(parent_task_id=parent_task)
+            serializer = self.get_serializer(queryset, many=True)
+            return Response(serializer.data)
+        
+        except Exception as e:
+            return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    def create(self, request, *args, **kwargs):
+        """Create a new subtask, point to some parent tasks."""
+        try:
+            serializer = self.get_serializer(data=request.data)
+            serializer.is_valid(raise_exception=True)
+            self.perform_create(serializer)
+            return Response(serializer.data)
+        
+        except Exception as e:
+            return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+    def destroy(self, request, *args, **kwargs):
+        """Delete a subtask."""
+        try:
+            instance = self.get_object()
+            self.perform_destroy(instance)
+            return Response(status=status.HTTP_204_NO_CONTENT)
+        
+        except Exception as e:
+            return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+    def partial_update(self, request, *args, **kwargs):
+        """Update a subtask."""
+        try:
+            instance = self.get_object()
+            serializer = self.get_serializer(instance, data=request.data, partial=True)
+            serializer.is_valid(raise_exception=True)
+            self.perform_update(serializer)
+            return Response(serializer.data)
+        
+        except Exception as e:
+            return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
 class RecurrenceTaskViewSet(viewsets.ModelViewSet):
     queryset = RecurrenceTask.objects.all()
     serializer_class = RecurrenceTaskSerializer

backend/tasks/tests/test_todo_signal.py

@@ -0,0 +1,33 @@
+from datetime import datetime, timedelta
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+from tasks.tests.utils import create_test_user
+from tasks.models import Todo
+from boards.models import ListBoard, Board
+
+
+class TodoSignalHandlersTests(APITestCase):
+    def setUp(self):
+        self.user = create_test_user()
+        self.client.force_authenticate(user=self.user)
+        self.list_board = Board.objects.get(user=self.user).listboard_set.first()
+
+    def test_update_priority_signal_handler(self):
+        """
+        Test the behavior of the update_priority signal handler.
+        """
+        due_date = datetime.now() + timedelta(days=5)
+        data = {
+            'title': 'Test Task',
+            'type': 'habit',
+            'difficulty': 1,
+            'end_event': due_date.strftime('%Y-%m-%dT%H:%M:%S'),
+            'list_board': self.list_board.id,
+        }
+        response = self.client.post(reverse("todo-list"), data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+        # Retrieve the created task and check if priority is updated
+        task = Todo.objects.get(title='Test Task')
+        self.assertIsNotNone(task.priority)  # Check if priority is not None

backend/tasks/urls.py

@@ -3,7 +3,7 @@
 from rest_framework.routers import DefaultRouter
 
 from tasks.api import GoogleCalendarEventViewset
-from tasks.tasks.views import TodoViewSet, RecurrenceTaskViewSet, HabitTaskViewSet
+from tasks.tasks.views import TodoViewSet, RecurrenceTaskViewSet, HabitTaskViewSet, SubTaskViewset
 from tasks.misc.views import TagViewSet
 
 
@@ -13,6 +13,7 @@
 router.register(r'habit', HabitTaskViewSet)
 router.register(r'tags', TagViewSet)
 router.register(r'calendar-events', GoogleCalendarEventViewset, basename='calendar-events')
+router.register(r'subtasks', SubTaskViewset, basename='subtasks')
 
 urlpatterns = [
     path('', include(router.urls)),

backend/users/serializers.py

@@ -32,12 +32,32 @@ class UpdateProfileSerializer(serializers.ModelSerializer):
     Serializer for updating user profile.
     """
     profile_pic = serializers.ImageField(required=False)
-    first_name = serializers.CharField(max_length=255, required=False)
+    username = serializers.CharField(max_length=255, required=False)
     about = serializers.CharField(required=False)
 
     class Meta:
         model = CustomUser
-        fields = ('profile_pic', 'first_name', 'about')
+        fields = ('profile_pic', 'username', 'about')
+
+    def update(self, instance, validated_data):
+        """
+        Update an existing user's profile.
+        """
+        for attr, value in validated_data.items():
+            setattr(instance, attr, value)
+        instance.save()
+        return instance
+    
+class UpdateProfileNopicSerializer(serializers.ModelSerializer):
+    """
+    Serializer for updating user profile.
+    """
+    username = serializers.CharField(max_length=255, required=False)
+    about = serializers.CharField(required=False)
+
+    class Meta:
+        model = CustomUser
+        fields = ('username', 'about')
 
     def update(self, instance, validated_data):
         """

backend/users/views.py

@@ -9,7 +9,7 @@
 
 from rest_framework_simplejwt.tokens import RefreshToken
 
-from users.serializers import CustomUserSerializer, UpdateProfileSerializer
+from users.serializers import CustomUserSerializer, UpdateProfileSerializer, UpdateProfileNopicSerializer
 from users.models import CustomUser
 
 class CustomUserCreate(APIView):
@@ -57,13 +57,17 @@ def post(self, request):
             return Response ({
                 'error': 'User does not exist'
             }, status=status.HTTP_404_NOT_FOUND)
+        
         serializer = UpdateProfileSerializer(request.user, data=request.data)
+        if request.data.get('profile_pic') == "null":
+            serializer = UpdateProfileNopicSerializer(request.user, data=request.data)
+
         if serializer.is_valid():
             serializer.save()
             return Response(serializer.data)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-    
+
 class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin):
     queryset = CustomUser.objects.all()
     permission_classes = (IsAuthenticated,)
@@ -72,4 +76,4 @@ class UserDataRetriveViewset(viewsets.GenericViewSet, mixins.RetrieveModelMixin)
     def retrieve(self, request, *args, **kwargs):
         serializer = self.get_serializer(request.user)
         return Response(serializer.data)
-        
+        

frontend/package.json

@@ -34,6 +34,7 @@
     "@wojtekmaj/react-daterange-picker": "^5.4.4",
     "axios": "^1.6.1",
     "bootstrap": "^5.3.2",
+    "date-fns": "^2.30.0",
     "dotenv": "^16.3.1",
     "framer-motion": "^10.16.4",
     "gapi-script": "^1.2.0",
@@ -42,9 +43,11 @@
     "react": "^18.2.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-bootstrap": "^2.9.1",
+    "react-datepicker": "^4.23.0",
     "react-datetime-picker": "^5.5.3",
     "react-dom": "^18.2.0",
     "react-icons": "^4.11.0",
+    "react-ios-time-picker": "^0.2.2",
     "react-router-dom": "^6.18.0",
     "react-tsparticles": "^2.12.2",
     "tsparticles": "^2.12.0"