From 58216533dccc25171f621b2c39d844e207ff45b5 Mon Sep 17 00:00:00 2001 From: pdenert Date: Wed, 6 Nov 2024 14:48:47 +0100 Subject: [PATCH] Change way of generating type in entries toJson --- packages/patrol_log/lib/src/entry.dart | 2 ++ packages/patrol_log/lib/src/entry.g.dart | 6 ------ packages/patrol_log/lib/src/log_entry.dart | 6 ++++-- packages/patrol_log/lib/src/step_entry.dart | 6 ++++-- packages/patrol_log/lib/src/test_entry.dart | 6 ++++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/patrol_log/lib/src/entry.dart b/packages/patrol_log/lib/src/entry.dart index 256a14005..2bc39ad97 100644 --- a/packages/patrol_log/lib/src/entry.dart +++ b/packages/patrol_log/lib/src/entry.dart @@ -18,6 +18,8 @@ sealed class Entry with EquatableMixin { } final DateTime timestamp; + + @JsonKey(includeToJson: true) final EntryType type; Map toJson(); diff --git a/packages/patrol_log/lib/src/entry.g.dart b/packages/patrol_log/lib/src/entry.g.dart index 537f6e9f1..3657287ec 100644 --- a/packages/patrol_log/lib/src/entry.g.dart +++ b/packages/patrol_log/lib/src/entry.g.dart @@ -11,8 +11,6 @@ LogEntry _$LogEntryFromJson(Map json) => LogEntry( timestamp: json['timestamp'] == null ? null : DateTime.parse(json['timestamp'] as String), - type: $enumDecodeNullable(_$EntryTypeEnumMap, json['type']) ?? - EntryType.log, ); Map _$LogEntryToJson(LogEntry instance) => { @@ -35,8 +33,6 @@ StepEntry _$StepEntryFromJson(Map json) => StepEntry( timestamp: json['timestamp'] == null ? null : DateTime.parse(json['timestamp'] as String), - type: $enumDecodeNullable(_$EntryTypeEnumMap, json['type']) ?? - EntryType.step, ); Map _$StepEntryToJson(StepEntry instance) => { @@ -61,8 +57,6 @@ TestEntry _$TestEntryFromJson(Map json) => TestEntry( ? null : DateTime.parse(json['timestamp'] as String), error: json['error'] as String?, - type: $enumDecodeNullable(_$EntryTypeEnumMap, json['type']) ?? - EntryType.test, ); Map _$TestEntryToJson(TestEntry instance) => { diff --git a/packages/patrol_log/lib/src/log_entry.dart b/packages/patrol_log/lib/src/log_entry.dart index 5f4f68c0b..bddfad150 100644 --- a/packages/patrol_log/lib/src/log_entry.dart +++ b/packages/patrol_log/lib/src/log_entry.dart @@ -5,8 +5,10 @@ class LogEntry extends Entry { LogEntry({ required this.message, DateTime? timestamp, - super.type = EntryType.log, - }) : super(timestamp: timestamp ?? DateTime.now()); + }) : super( + timestamp: timestamp ?? DateTime.now(), + type: EntryType.log, + ); @override factory LogEntry.fromJson(Map json) => diff --git a/packages/patrol_log/lib/src/step_entry.dart b/packages/patrol_log/lib/src/step_entry.dart index 65f3d9d77..0df89f868 100644 --- a/packages/patrol_log/lib/src/step_entry.dart +++ b/packages/patrol_log/lib/src/step_entry.dart @@ -8,8 +8,10 @@ class StepEntry extends Entry { this.exception, this.data, DateTime? timestamp, - super.type = EntryType.step, - }) : super(timestamp: timestamp ?? DateTime.now()); + }) : super( + timestamp: timestamp ?? DateTime.now(), + type: EntryType.step, + ); factory StepEntry.fromJson(Map json) => _$StepEntryFromJson(json); diff --git a/packages/patrol_log/lib/src/test_entry.dart b/packages/patrol_log/lib/src/test_entry.dart index 6dd6eda5e..51b2d17f2 100644 --- a/packages/patrol_log/lib/src/test_entry.dart +++ b/packages/patrol_log/lib/src/test_entry.dart @@ -7,8 +7,10 @@ class TestEntry extends Entry { required this.status, DateTime? timestamp, this.error, - super.type = EntryType.test, - }) : super(timestamp: timestamp ?? DateTime.now()); + }) : super( + timestamp: timestamp ?? DateTime.now(), + type: EntryType.test, + ); @override factory TestEntry.fromJson(Map json) =>