[RED] Fixing conflicts

lib/model/komentar.dart

@@ -16,6 +16,7 @@ class KomentarModel {
   final String namaLokasi;
   final String deskripsi;
   final String creator;
+  final String email;
   @JsonKey(name: 'date_time', fromJson: CustomSerializer.stringToDateTime)
   final DateTime dateTime;
   final String tag;
@@ -31,6 +32,7 @@ class KomentarModel {
       this.namaLokasi,
       this.deskripsi,
       this.creator,
+      this.email,
       this.dateTime,
       this.tag,
       this.disabilitas,

lib/model/komentar.g.dart

@@ -27,6 +27,7 @@ KomentarModel _$KomentarModelFromJson(Map<String, dynamic> json) {
     namaLokasi: json['nama_lokasi'] as String,
     deskripsi: json['deskripsi'] as String,
     creator: json['creator'] as String,
+    email: json['email'] as String,
     dateTime: CustomSerializer.stringToDateTime(json['date_time'] as String),
     tag: json['tag'] as String,
     disabilitas:
@@ -44,6 +45,7 @@ Map<String, dynamic> _$KomentarModelToJson(KomentarModel instance) =>
       'nama_lokasi': instance.namaLokasi,
       'deskripsi': instance.deskripsi,
       'creator': instance.creator,
+      'email': instance.email,
       'date_time': instance.dateTime?.toIso8601String(),
       'tag': instance.tag,
       'disabilitas': instance.disabilitas,

lib/page/dashboard/dashboard.dart

@@ -341,6 +341,7 @@ class DashboardState extends State<Dashboard> {
               lokasi: lokasi,
               komentar: KomentarModel(
                 creator: fasilitas.creator,
+                email: fasilitas.email,
                 dateTime: fasilitas.dateTime,
                 deskripsi: fasilitas.deskripsi,
                 id: fasilitas.id,
@@ -368,20 +369,20 @@ class DashboardState extends State<Dashboard> {
       ..name = namaLokasi;
     final fasilitasRoute = MaterialPageRoute(
         builder: (BuildContext context) => DetailPostKegiatanPage(
-          lokasi: lokasi,
-          kegiatan: KegiatanModel(
-            id: kegiatan.id,
-            placeId: lokasi.placeId,
-            creator: kegiatan.creator,
-            namaKegiatan: kegiatan.namaKegiatan,
-            penyelenggara: kegiatan.penyelenggara,
-            narahubung: kegiatan.narahubung,
-            deskripsi: kegiatan.deskripsi,
-            timeStart: kegiatan.timeStart,
-            timeEnd: kegiatan.timeEnd,
-            image: kegiatan.image,
-          ),
-        ));
+              lokasi: lokasi,
+              kegiatan: KegiatanModel(
+                id: kegiatan.id,
+                placeId: lokasi.placeId,
+                creator: kegiatan.creator,
+                namaKegiatan: kegiatan.namaKegiatan,
+                penyelenggara: kegiatan.penyelenggara,
+                narahubung: kegiatan.narahubung,
+                deskripsi: kegiatan.deskripsi,
+                timeStart: kegiatan.timeStart,
+                timeEnd: kegiatan.timeEnd,
+                image: kegiatan.image,
+              ),
+            ));
     await Navigator.of(context).push(fasilitasRoute);
   }
 

test/model_test.dart

@@ -36,6 +36,7 @@ void main() {
     'deskripsi':
         'Ada toilet khusus disabilitas terletak di lantai 2 dekat kintan',
     'creator': '',
+    'creator_email': '',
     'date_time': '2020-11-18 00:13:52.939668',
     'rating': 3,
     'tag': 'KR',
@@ -50,6 +51,7 @@ void main() {
     'deskripsi':
         'Ada toilet khusus disabilitas terletak di lantai 2 dekat kintan',
     'creator': '',
+    'creator_email': '',
     'date_time': '2020-11-18T00:13:00.000',
     'rating': 3,
     'tag': 'KR',