create toAlarm and fromAlarm

lib/model/alarm/alarm.dart

@@ -4,7 +4,6 @@ import 'relative_time_alarm.dart';
 
 abstract class Alarm {
   String get id;
-  String get taskId;
   AlarmType get alarmType;
   Map<String, dynamic> toJson();
 
@@ -31,7 +30,7 @@ abstract class Alarm {
   }
 
   @override
-  int get hashCode => taskId.hashCode;
+  int get hashCode => id.hashCode;
 }
 
 enum AlarmType { timeFixed, timeRelative, location }

lib/model/alarm/fixed_time_alarm.dart

@@ -4,24 +4,17 @@ class FixedTimeAlarm implements Alarm {
   @override
   final String id;
 
-  @override
-  final String taskId;
-
   final DateTime triggerAt;
 
   @override
   final AlarmType alarmType;
 
-  const FixedTimeAlarm({
+  const FixedTimeAlarm({required this.id, required this.triggerAt})
-    required this.id,
+    : alarmType = AlarmType.timeFixed;
-    required this.taskId,
-    required this.triggerAt,
-  }) : alarmType = AlarmType.timeFixed;
 
   factory FixedTimeAlarm.fromJson(Map<String, dynamic> json) {
     return FixedTimeAlarm(
       id: json['id'] as String,
-      taskId: json['taskId'] as String,
       triggerAt: DateTime.parse(json['triggerAt'] as String),
     );
   }
@@ -30,7 +23,6 @@ class FixedTimeAlarm implements Alarm {
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'taskId': taskId,
       'triggerAt': triggerAt.toIso8601String(),
       'alarmType': alarmType,
     };

lib/model/alarm/location_alarm.dart

@@ -5,9 +5,6 @@ class LocationAlarm implements Alarm {
   @override
   final String id;
 
-  @override
-  final String taskId;
-
   final Location location;
 
   final int radiusMeters;
@@ -17,7 +14,6 @@ class LocationAlarm implements Alarm {
 
   const LocationAlarm({
     required this.id,
-    required this.taskId,
     required this.location,
     required this.radiusMeters,
   }) : alarmType = AlarmType.location;
@@ -25,7 +21,6 @@ class LocationAlarm implements Alarm {
   factory LocationAlarm.fromJson(Map<String, dynamic> json) {
     return LocationAlarm(
       id: json['id'] as String,
-      taskId: json['taskId'] as String,
       location: Location.fromJson(json['location'] as Map<String, dynamic>),
       radiusMeters: json['radiusMeters'] as int,
     );
@@ -35,7 +30,6 @@ class LocationAlarm implements Alarm {
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'taskId': taskId,
       'location': location.toJson(),
       'radiusMeters': radiusMeters,
       'alarmType': alarmType,

lib/model/alarm/relative_time_alarm.dart

@@ -4,24 +4,17 @@ class RelativeTimeAlarm implements Alarm {
   @override
   final String id;
 
-  @override
-  final String taskId;
-
   final DateTime triggerAt;
 
   @override
   final AlarmType alarmType;
 
-  const RelativeTimeAlarm({
+  const RelativeTimeAlarm({required this.id, required this.triggerAt})
-    required this.id,
+    : alarmType = AlarmType.timeRelative;
-    required this.taskId,
-    required this.triggerAt,
-  }) : alarmType = AlarmType.timeRelative;
 
   factory RelativeTimeAlarm.fromJson(Map<String, dynamic> json) {
     return RelativeTimeAlarm(
       id: json['id'] as String,
-      taskId: json['taskId'] as String,
       triggerAt: DateTime.parse(json['triggerAt'] as String),
     );
   }
@@ -30,7 +23,6 @@ class RelativeTimeAlarm implements Alarm {
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'taskId': taskId,
       'triggerAt': triggerAt.toIso8601String(),
       'alarmType': alarmType,
     };

lib/model/requests/create_fixed_time_alarm_request.dart

@@ -1,9 +1,17 @@
 import '../alarm/alarm.dart';
+import '../alarm/fixed_time_alarm.dart';
 import 'create_alarm_request.dart';
 
 class CreateFixedTimeAlarmRequest extends CreateAlarmRequest {
   final DateTime? triggerAt;
 
-  CreateFixedTimeAlarmRequest({this.triggerAt})
+  const CreateFixedTimeAlarmRequest({this.triggerAt})
     : super(alarmType: AlarmType.timeFixed);
+
+  CreateFixedTimeAlarmRequest.fromAlarm(FixedTimeAlarm alarm)
+    : triggerAt = alarm.triggerAt,
+      super(alarmType: AlarmType.timeFixed);
+
+  FixedTimeAlarm toFixedTimeAlarm(String id) =>
+      FixedTimeAlarm(id: id, triggerAt: triggerAt!);
 }

lib/model/requests/create_location_alarm_request.dart

@@ -1,4 +1,5 @@
 import '../alarm/alarm.dart' show AlarmType;
+import '../alarm/location_alarm.dart';
 import '../location.dart';
 import 'create_alarm_request.dart';
 
@@ -9,4 +10,12 @@ class CreateLocationAlarmRequest extends CreateAlarmRequest {
 
   const CreateLocationAlarmRequest({this.location, this.radiusMeters})
     : super(alarmType: AlarmType.location);
+
+  CreateLocationAlarmRequest.fromAlarm(LocationAlarm alarm)
+    : location = alarm.location,
+      radiusMeters = alarm.radiusMeters,
+      super(alarmType: AlarmType.location);
+
+  LocationAlarm toLocationAlarm(String id) =>
+      LocationAlarm(id: id, location: location!, radiusMeters: radiusMeters!);
 }

lib/model/requests/create_relative_time_alarm_request.dart

@@ -1,9 +1,17 @@
 import '../alarm/alarm.dart' show AlarmType;
+import '../alarm/relative_time_alarm.dart';
 import 'create_alarm_request.dart';
 
 class CreateRelativeTimeAlarmRequest extends CreateAlarmRequest {
   final DateTime? triggerAt;
 
-  CreateRelativeTimeAlarmRequest({this.triggerAt})
+  const CreateRelativeTimeAlarmRequest({this.triggerAt})
     : super(alarmType: AlarmType.timeRelative);
+
+  CreateRelativeTimeAlarmRequest.fromAlarm(RelativeTimeAlarm alarm)
+    : triggerAt = alarm.triggerAt,
+      super(alarmType: AlarmType.timeRelative);
+
+  RelativeTimeAlarm toRelativeTimeAlarm(String id) =>
+      RelativeTimeAlarm(id: id, triggerAt: triggerAt!);
 }

lib/model/requests/create_task_request.dart

@@ -1,3 +1,4 @@
+import '../alarm/alarm.dart';
 import '../task.dart';
 
 class CreateTaskRequest {
@@ -9,6 +10,7 @@ class CreateTaskRequest {
   final String category;
   final List<Task> subtasks;
   final String url;
+  final List<Alarm> alarms;
 
   CreateTaskRequest({
     required this.title,
@@ -19,6 +21,7 @@ class CreateTaskRequest {
     required this.category,
     required this.subtasks,
     required this.url,
+    required this.alarms,
   });
 
   CreateTaskRequest.fromTask(Task task)
@@ -29,7 +32,8 @@ class CreateTaskRequest {
       isCompleted = task.isCompleted,
       category = task.category,
       subtasks = task.subtasks,
-      url = task.url;
+      url = task.url,
+      alarms = task.alarms;
 
   Task toTask({required String id}) {
     return Task(
@@ -42,6 +46,7 @@ class CreateTaskRequest {
       category: category,
       subtasks: subtasks,
       url: url,
+      alarms: alarms,
     );
   }
 }

lib/model/task.dart

@@ -1,3 +1,4 @@
+import 'alarm/alarm.dart';
 import 'location.dart';
 
 class Task {
@@ -10,6 +11,7 @@ class Task {
   final String category;
   final List<Task> subtasks;
   final String url;
+  final List<Alarm> alarms;
 
   Task({
     required this.id,
@@ -21,6 +23,7 @@ class Task {
     this.category = '',
     this.subtasks = const [],
     this.url = '',
+    required this.alarms,
   });
 
   Task copyWith({
@@ -32,7 +35,7 @@ class Task {
     bool? isCompleted,
     String? category,
     List<Task>? subtasks,
-    List<DateTime>? alarms,
+    List<Alarm>? alarms,
     Location? location,
     String? url,
   }) {
@@ -46,6 +49,7 @@ class Task {
       category: category ?? this.category,
       subtasks: subtasks ?? this.subtasks,
       url: url ?? this.url,
+      alarms: alarms ?? this.alarms,
     );
   }
 
@@ -66,6 +70,11 @@ class Task {
               .toList() ??
           [],
       url: json['url'] as String? ?? '',
+      alarms:
+          (json['alarms'] as List<dynamic>?)
+              ?.map((e) => Alarm.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          [],
     );
   }
 
@@ -80,6 +89,7 @@ class Task {
       'category': category,
       'subtasks': subtasks.map((e) => e.toJson()).toList(),
       'url': url,
+      'alarms': alarms.map((e) => e.toJson()).toList(),
     };
   }
 

lib/pages/task_edit_page.dart

@@ -187,6 +187,7 @@ class _TaskEditPageState extends State<TaskEditPage> {
         category: categoryController.text,
         subtasks: [],
         url: urlController.text,
+        alarms: [],
       ),
     );
   }