Remove Reminders from model

This commit is contained in:
sosokker 2023-11-03 12:49:46 +07:00
parent 6581b547a0
commit 02236f9873
7 changed files with 74 additions and 24 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.6 on 2023-11-02 07:31
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('tasks', '0004_rename_time_reminder_alerttime_and_more'),
]
operations = [
migrations.AddField(
model_name='task',
name='google_calendar_id',
field=models.CharField(blank=True, max_length=255, null=True),
),
]

View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.6 on 2023-11-03 05:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('tasks', '0005_task_google_calendar_id'),
]
operations = [
migrations.AlterField(
model_name='task',
name='difficulty',
field=models.PositiveSmallIntegerField(choices=[(1, 'Easy'), (2, 'Normal'), (3, 'Hard'), (4, 'Very Hard'), (5, 'Devil')], default=1),
),
]

View File

@ -0,0 +1,30 @@
# Generated by Django 4.2.6 on 2023-11-03 05:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('tasks', '0006_alter_task_difficulty'),
]
operations = [
migrations.RemoveField(
model_name='task',
name='reminders',
),
migrations.AddField(
model_name='task',
name='end_event',
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name='task',
name='start_event',
field=models.DateTimeField(blank=True, null=True),
),
migrations.DeleteModel(
name='Reminder',
),
]

View File

@ -1,10 +1,6 @@
from rest_framework import serializers from rest_framework import serializers
from ..models import Reminder, Tag from ..models import Tag
class ReminderSerializer(serializers.ModelSerializer):
class Meta:
model = Reminder
fields = '__all__'
class TagSerializer(serializers.ModelSerializer): class TagSerializer(serializers.ModelSerializer):
class Meta: class Meta:

View File

@ -1,10 +1,7 @@
from rest_framework import viewsets from rest_framework import viewsets
from ..models import Reminder, Tag from ..models import Tag
from .serializers import ReminderSerializer, TagSerializer from .serializers import TagSerializer
class ReminderViewSet(viewsets.ModelViewSet):
queryset = Reminder.objects.all()
serializer_class = ReminderSerializer
class TagViewSet(viewsets.ModelViewSet): class TagViewSet(viewsets.ModelViewSet):
queryset = Tag.objects.all() queryset = Tag.objects.all()

View File

@ -3,16 +3,6 @@ from django.conf import settings
from django.core import validators from django.core import validators
class Reminder(models.Model):
"""
Represents a reminder associated with a task.
Fields:
- startDate: The optional date for which the reminder is set.
- time: The time at which the reminder is triggered.
"""
startDate = models.DateField(auto_now_add=True, null=True, blank=True)
alertTime = models.DateTimeField(null=False, blank=False)
class Tag(models.Model): class Tag(models.Model):
""" """
Represents a tag that can be associated with tasks. Represents a tag that can be associated with tasks.
@ -66,7 +56,7 @@ class Task(models.Model):
validators.MinValueValidator(0.1), validators.MinValueValidator(0.1),
validators.MaxValueValidator(2), validators.MaxValueValidator(2),
]) ])
difficulty = models.PositiveSmallIntegerField(choices=DIFFICULTY_CHOICES) difficulty = models.PositiveSmallIntegerField(choices=DIFFICULTY_CHOICES, default=1)
attribute = models.CharField(max_length=15, choices=[ attribute = models.CharField(max_length=15, choices=[
('str', 'Strength'), ('str', 'Strength'),
('int', 'Intelligence'), ('int', 'Intelligence'),
@ -76,10 +66,12 @@ class Task(models.Model):
], default='str') ], default='str')
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
challenge = models.BooleanField(default=False) challenge = models.BooleanField(default=False)
reminders = models.ManyToManyField(Reminder, blank=True)
fromSystem = models.BooleanField(default=False) fromSystem = models.BooleanField(default=False)
creation_date = models.DateTimeField(auto_now_add=True) creation_date = models.DateTimeField(auto_now_add=True)
last_update = models.DateTimeField(auto_now=True) last_update = models.DateTimeField(auto_now=True)
google_calendar_id = models.CharField(blank=True, null=True, max_length=255)
start_event = models.DateTimeField(blank=True, null=True)
end_event = models.DateTimeField(blank=True, null=True)
class Subtask(models.Model): class Subtask(models.Model):

View File

@ -2,10 +2,9 @@ from django.urls import path, include
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from .api import GoogleCalendarEventViewset from .api import GoogleCalendarEventViewset
from .tasks.views import TaskCreateView, TaskRetrieveView, TaskUpdateView, TaskDeleteView from .tasks.views import TaskCreateView, TaskRetrieveView, TaskUpdateView, TaskDeleteView
from .misc.views import TagViewSet, ReminderViewSet from .misc.views import TagViewSet
router = DefaultRouter() router = DefaultRouter()
router.register(r'reminders', ReminderViewSet)
router.register(r'tags', TagViewSet) router.register(r'tags', TagViewSet)
router.register(r'calendar-events', GoogleCalendarEventViewset, basename='calendar-events') router.register(r'calendar-events', GoogleCalendarEventViewset, basename='calendar-events')