Added persistence

Author: el-agua

backend/plan/migrations/0016_break_unique_break_name_per_person.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.2 on 2025-05-13 23:27
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("plan", "0015_schedule_breaks"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="break",
+            constraint=models.UniqueConstraint(
+                condition=models.Q(("name__isnull", False), models.Q(("name", ""), _negated=True)),
+                fields=("name", "person"),
+                name="unique_break_name_per_person",
+            ),
+        ),
+    ]

backend/plan/migrations/0017_break_checked.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.0.2 on 2025-05-14 00:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("plan", "0016_break_unique_break_name_per_person"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="break",
+            name="checked",
+            field=models.BooleanField(
+                default=True,
+                help_text="\nWhether or not the break has been checked by the user. This is used to\ndetermine if the break should be displayed in the user's schedule.\n",
+            ),
+        ),
+    ]

backend/plan/models.py

@@ -42,6 +42,16 @@ class Break(models.Model):
         ),
     )
 
+    checked = models.BooleanField(
+        default=True,
+        help_text=dedent(
+            """
+        Whether or not the break has been checked by the user. This is used to
+        determine if the break should be displayed in the user's schedule.
+        """
+        ),
+    )
+
     meeting_times = models.TextField(
         blank=True,
         help_text=dedent(

backend/plan/views.py

@@ -501,6 +501,8 @@ def get_breaks(data):
             if break_id:
                 break_candidate = Break.objects.filter(id=break_id).first()
                 if break_candidate:
+                    break_candidate.checked = b.get("checked", False)
+                    break_candidate.save()
                     breaks.append(break_candidate)
         return breaks
 
@@ -701,7 +703,8 @@ def update(self, request):
                 {"detail": "Error setting meetings: " + str(e)}, status=status.HTTP_400_BAD_REQUEST
             )
 
-        print("current_break", current_break)
+        checked = request.data.get("checked")
+        current_break.checked = checked if checked is not None else current_break.checked
 
         try:
             current_break.save()
@@ -724,7 +727,6 @@ def create(self, request, *args, **kwargs):
                 {"detail": "Break name is required."}, status=status.HTTP_400_BAD_REQUEST
             )
         location_string = request.data.get("location_string")
-        print(request.data)
         try:
             if break_id:
                 new_break = self.get_queryset().create(
@@ -762,7 +764,6 @@ def create(self, request, *args, **kwargs):
             }
             for m in meetings
         ]
-        print(meetings_with_codes)
         try:
             set_meetings(new_break, meetings_with_codes)
         except Exception as e:

frontend/plan/actions/index.js

@@ -703,7 +703,9 @@ export const updateScheduleOnBackend = (name, schedule) => (dispatch) => {
         ...schedule,
         name,
         sections: schedule.sections,
-        breaks: (schedule.breaks ?? []).map((breakItem) => breakItem.break),
+        breaks: (schedule.breaks ?? []).map((breakItem) => {
+            return { ...breakItem.break, checked: breakItem.checked };
+        }),
     };
     doAPIRequest(`/plan/schedules/${schedule.id}/`, {
         method: "PUT",

frontend/plan/components/schedule/ScheduleDisplay.tsx

@@ -145,7 +145,7 @@ const ScheduleDisplay = ({
   breaks = friendshipState.activeFriendSchedule?.breaks
     || schedData.breaks || [];
 
-  const notEmpty = sections.length > 0;
+  const notEmpty = sections.length > 0 || breaks.length > 0;
 
   let startHour = 10.5;
   let endHour = 16;

frontend/plan/reducers/schedule.js

@@ -195,7 +195,7 @@ const handleUpdateSchedulesOnFrontend = (state, schedulesFromBackend) => {
                                 };
                                 return {
                                     break: newBreak,
-                                    checked: true,
+                                    checked: newBreak.checked,
                                 };
                             }),
                             id: scheduleFromBackend.id,
@@ -474,6 +474,28 @@ export const schedule = (state = initialState, action) => {
             };
 
         case ADD_BREAK_ITEM:
+            // Check name is not already in use
+            if (
+                state.schedules[state.scheduleSelected].breaks.find(
+                    (br) => br.break.name === action.name
+                )
+            ) {
+                showToast("Break name already in use!", true);
+                return { ...state };
+            }
+
+            // Check that some date is selected
+            if (action.days.length === 0) {
+                showToast("Please select a day!", true);
+                return { ...state };
+            }
+
+            // Check that the name box is not empty
+            if (action.name === "") {
+                showToast("Please enter a name!", true);
+                return { ...state };
+            }
+
             if (!state.readOnly) {
                 const newBreakItem = {
                     name: action.name,
@@ -525,7 +547,7 @@ export const schedule = (state = initialState, action) => {
                         return breakSection;
                     }
                 );
-                return {
+                const temp = {
                     ...state,
                     schedules: {
                         ...state.schedules,
@@ -537,6 +559,7 @@ export const schedule = (state = initialState, action) => {
                         },
                     },
                 };
+                return temp;
             }
             showToast("Cannot remove breaks from a friend's schedule!", true);
             return { ...state };