fix: resolve auto-merge issues from rebase

- Remove stale task47 reminder fixtures (task repurposed from "reminders
  outside window" to "due today")
- Fix raw SQL queries to use renamed today_tasks_reminders_time column
- Add missing today_tasks_reminders_enabled to SQL select clauses
- Remove task47 from "filtered with like" tests (title no longer contains "with")
- Fix e2e test to use renamed settings field

frontend/tests/e2e/task/overview.spec.ts

@@ -127,7 +127,7 @@ test.describe('Home Page Task Overview', () => {
 
 		await updateUserSettings(apiContext, token, {
 			default_project_id: project.id,
-			overdue_tasks_reminders_time: '9:00',
+			today_tasks_reminders_time: '9:00',
 		})
 
 		const newTaskTitle = 'New Task'

pkg/db/fixtures/task_reminders.yml

@@ -24,14 +24,3 @@
   task_id: 2
   reminder: 2019-06-01 12:00:00
   created: 2018-12-01 01:12:04
-# Task 47: two reminders, neither inside the (2018-10-01, 2018-12-10) window
-# Reminder before the window:
-- id: 6
-  task_id: 47
-  reminder: 2018-08-01 12:00:00
-  created: 2018-12-01 01:12:04
-# Reminder after the window:
-- id: 7
-  task_id: 47
-  reminder: 2019-03-01 12:00:00
-  created: 2018-12-01 01:12:04

pkg/models/task_collection_test.go

@@ -1064,7 +1064,6 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 				task30,
 				task31,
 				task33,
-				task47,
 			},
 			wantErr: false,
 		},
@@ -1084,7 +1083,6 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 				task30,
 				task31,
 				task33,
-				task47,
 			},
 			wantErr: false,
 		},
@@ -1100,18 +1098,6 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "filtered reminder dates should not match task with reminders outside window",
-			fields: fields{
-				Filter: "reminders > '2018-10-01T00:00:00+00:00' && reminders < '2018-12-10T00:00:00+00:00'",
-			},
-			args: defaultArgs,
-			want: []*Task{
-				task2,
-				task27,
-			},
-			wantErr: false,
-		},
 		{
 			name: "filtered reminder dates narrow window excludes all",
 			fields: fields{
@@ -1128,8 +1114,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
 			},
 			args: defaultArgs,
 			want: []*Task{
-				task2,  // has reminder at 2019-06-01 (> 2019-01-01)
-				task47, // has reminder at 2019-03-01 (> 2019-01-01) and 2018-08-01 (< 2018-09-01)
+				task2, // has reminder at 2019-06-01 (> 2019-01-01)
 			},
 			wantErr: false,
 		},

pkg/models/task_reminder.go

@@ -158,7 +158,7 @@ func getTaskUsersForTasks(s *xorm.Session, taskIDs []int64, cond builder.Cond) (
 
 	creators := []*userWithTask{}
 	err = s.Table("tasks").
-		Select("DISTINCT tasks.id AS task_id, users.id, users.name, users.username, users.email, users.email_reminders_enabled, users.overdue_tasks_reminders_enabled, users.overdue_tasks_reminders_time, users.language, users.timezone, users.created, users.updated").
+		Select("DISTINCT tasks.id AS task_id, users.id, users.name, users.username, users.email, users.email_reminders_enabled, users.overdue_tasks_reminders_enabled, users.today_tasks_reminders_enabled, users.today_tasks_reminders_time, users.language, users.timezone, users.created, users.updated").
 		Join("INNER", "users", "tasks.created_by_id = users.id").
 		Where(builder.And(conditions...)).
 		Find(&creators)
@@ -182,7 +182,7 @@ func getTaskUsersForTasks(s *xorm.Session, taskIDs []int64, cond builder.Cond) (
 
 	assignees := []*TaskAssigneeWithUser{}
 	err = s.Table("task_assignees").
-		Select("DISTINCT task_assignees.task_id, users.id, users.name, users.username, users.email, users.email_reminders_enabled, users.overdue_tasks_reminders_enabled, users.overdue_tasks_reminders_time, users.language, users.timezone, users.created, users.updated").
+		Select("DISTINCT task_assignees.task_id, users.id, users.name, users.username, users.email, users.email_reminders_enabled, users.overdue_tasks_reminders_enabled, users.today_tasks_reminders_enabled, users.today_tasks_reminders_time, users.language, users.timezone, users.created, users.updated").
 		Join("INNER", "users", "task_assignees.user_id = users.id").
 		Where(builder.And(assigneeConds...)).
 		Find(&assignees)