use json_serialisable

analysis_options.yaml

@@ -6,7 +6,7 @@ include: package:lint/analysis_options.yaml
 # You might want to exclude auto-generated files from dart analysis
 analyzer:
   exclude:
-    #- '**.freezed.dart'
+    - "**.g.dart"
 
 # You can customize the lint rules set to your own liking. A list of all rules
 # can be found at https://dart-lang.github.io/linter/lints/options/options.html

lib/common/data/epoch_date_time_converter.dart

@@ -0,0 +1,11 @@
+import 'package:json_annotation/json_annotation.dart';
+
+class EpochDateTimeConverter implements JsonConverter<DateTime, int> {
+  const EpochDateTimeConverter();
+
+  @override
+  DateTime fromJson(int json) => DateTime.fromMillisecondsSinceEpoch(json);
+
+  @override
+  int toJson(DateTime object) => object.millisecondsSinceEpoch;
+}

lib/date_management/data/date_entry_repository.dart

@@ -1,5 +1,4 @@
 import 'package:dhbwstudentapp/common/data/database_access.dart';
-import 'package:dhbwstudentapp/date_management/data/date_entry_entity.dart';
 import 'package:dhbwstudentapp/date_management/model/date_entry.dart';
 
 class DateEntryRepository {
@@ -12,7 +11,7 @@ class DateEntryRepository {
     String? year,
   ) async {
     final rows = await _database.queryRows(
-      DateEntryEntity.tableName(),
+      DateEntry.tableName,
       where: "databaseName=? AND year=?",
       whereArgs: [databaseName, year],
     );
@@ -27,7 +26,7 @@ class DateEntryRepository {
     DateTime end,
   ) async {
     final rows = await _database.queryRows(
-      DateEntryEntity.tableName(),
+      DateEntry.tableName,
       where: "date>=? AND date<=? AND databaseName=? AND year=?",
       whereArgs: [
         start.millisecondsSinceEpoch,
@@ -46,7 +45,7 @@ class DateEntryRepository {
     DateTime date,
   ) async {
     final rows = await _database.queryRows(
-      DateEntryEntity.tableName(),
+      DateEntry.tableName,
       where: "date>=? AND databaseName=? AND year=?",
       whereArgs: [
         date.millisecondsSinceEpoch,
@@ -64,7 +63,7 @@ class DateEntryRepository {
     DateTime date,
   ) async {
     final rows = await _database.queryRows(
-      DateEntryEntity.tableName(),
+      DateEntry.tableName,
       where: "date<=? AND databaseName=? AND year=?",
       whereArgs: [
         date.millisecondsSinceEpoch,
@@ -77,8 +76,8 @@ class DateEntryRepository {
   }
 
   Future saveDateEntry(DateEntry entry) async {
-    final row = DateEntryEntity.fromModel(entry).toMap();
-    await _database.insert(DateEntryEntity.tableName(), row);
+    final row = entry.toJson();
+    await _database.insert(DateEntry.tableName, row);
   }
 
   Future saveDateEntries(List<DateEntry> entries) async {
@@ -92,7 +91,7 @@ class DateEntryRepository {
     String? year,
   ) async {
     await _database.deleteWhere(
-      DateEntryEntity.tableName(),
+      DateEntry.tableName,
       where: "databaseName=? AND year=?",
       whereArgs: [
         databaseName,
@@ -106,7 +105,7 @@ class DateEntryRepository {
 
     for (final row in rows) {
       dateEntries.add(
-        DateEntryEntity.fromMap(row).asDateEntry(),
+        DateEntry.fromJson(row),
       );
     }
 

lib/date_management/model/date_entry.dart

@@ -1,9 +1,18 @@
+import 'package:dhbwstudentapp/common/data/epoch_date_time_converter.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'date_entry.g.dart';
+
+@JsonSerializable()
 class DateEntry {
   final String description;
   final String year;
   final String comment;
   final String databaseName;
+  @JsonKey(name: "date")
+  @EpochDateTimeConverter()
   final DateTime start;
+  @EpochDateTimeConverter()
   final DateTime end;
   final String? room;
 
@@ -16,9 +25,16 @@ class DateEntry {
     DateTime? end,
     this.room,
   })  : start = start ?? DateTime.fromMicrosecondsSinceEpoch(0),
-        end = end ?? DateTime.fromMicrosecondsSinceEpoch(0),
+        end = end ?? start ?? DateTime.fromMicrosecondsSinceEpoch(0),
         comment = comment ?? "",
         description = description ?? "",
         year = year ?? "",
         databaseName = databaseName ?? "";
+
+  factory DateEntry.fromJson(Map<String, dynamic> json) =>
+      _$DateEntryFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DateEntryToJson(this);
+
+  static const tableName = "DateEntries";
 }

lib/schedule/data/schedule_entry_repository.dart

@@ -1,5 +1,4 @@
 import 'package:dhbwstudentapp/common/data/database_access.dart';
-import 'package:dhbwstudentapp/schedule/data/schedule_entry_entity.dart';
 import 'package:dhbwstudentapp/schedule/model/schedule.dart';
 import 'package:dhbwstudentapp/schedule/model/schedule_entry.dart';
 
@@ -17,7 +16,7 @@ class ScheduleEntryRepository {
     DateTime end,
   ) async {
     final rows = await _database.queryRows(
-      ScheduleEntryEntity.tableName(),
+      ScheduleEntry.tableName,
       where: "end>? AND start<?",
       whereArgs: [
         start.millisecondsSinceEpoch,
@@ -27,15 +26,15 @@ class ScheduleEntryRepository {
 
     final entries = <ScheduleEntry>[];
     for (final row in rows) {
-      entries.add(ScheduleEntryEntity.fromMap(row).asScheduleEntry());
+      entries.add(ScheduleEntry.fromJson(row));
     }
 
     return Schedule(entries: entries);
   }
 
   Future<ScheduleEntry?> queryExistingScheduleEntry(ScheduleEntry entry) async {
     final rows = await _database.queryRows(
-      ScheduleEntryEntity.tableName(),
+      ScheduleEntry.tableName,
       where: "start=? AND end=? AND title=? AND details=? AND professor=?",
       whereArgs: [
         entry.start.millisecondsSinceEpoch,
@@ -48,12 +47,12 @@ class ScheduleEntryRepository {
 
     if (rows.isEmpty) return null;
 
-    return ScheduleEntryEntity.fromMap(rows[0]).asScheduleEntry();
+    return ScheduleEntry.fromJson(rows[0]);
   }
 
   Future<ScheduleEntry?> queryNextScheduleEntry(DateTime dateTime) async {
     final nextScheduleEntry = await _database.queryRows(
-      ScheduleEntryEntity.tableName(),
+      ScheduleEntry.tableName,
       where: "start>?",
       whereArgs: [dateTime.millisecondsSinceEpoch],
       limit: 1,
@@ -63,7 +62,7 @@ class ScheduleEntryRepository {
     final entriesList = nextScheduleEntry.toList();
 
     if (entriesList.length == 1) {
-      return ScheduleEntryEntity.fromMap(entriesList[0]).asScheduleEntry();
+      return ScheduleEntry.fromJson(entriesList[0]);
     }
 
     return null;
@@ -86,12 +85,12 @@ class ScheduleEntryRepository {
       return;
     }
 
-    final row = ScheduleEntryEntity.fromModel(entry).toMap();
+    final row = entry.toJson();
     if (entry.id == null) {
-      final id = await _database.insert(ScheduleEntryEntity.tableName(), row);
+      final id = await _database.insert(ScheduleEntry.tableName, row);
       entry = entry.copyWith.id(id);
     } else {
-      await _database.update(ScheduleEntryEntity.tableName(), row);
+      await _database.update(ScheduleEntry.tableName, row);
     }
   }
 
@@ -102,15 +101,15 @@ class ScheduleEntryRepository {
   }
 
   Future<void> deleteScheduleEntry(ScheduleEntry entry) async {
-    await _database.delete(ScheduleEntryEntity.tableName(), entry.id);
+    await _database.delete(ScheduleEntry.tableName, entry.id);
   }
 
   Future<void> deleteScheduleEntriesBetween(
     DateTime start,
     DateTime end,
   ) async {
     await _database.deleteWhere(
-      ScheduleEntryEntity.tableName(),
+      ScheduleEntry.tableName,
       where: "start>=? AND end<=?",
       whereArgs: [
         start.millisecondsSinceEpoch,
@@ -121,7 +120,7 @@ class ScheduleEntryRepository {
 
   Future<void> deleteAllScheduleEntries() async {
     await _database.deleteWhere(
-      ScheduleEntryEntity.tableName(),
+      ScheduleEntry.tableName,
       where: "1=1",
       whereArgs: [],
     );