diff --git a/lib/models/comment/comment.dart b/lib/models/comment/comment.dart index 4a53a4a..b4f43ea 100644 --- a/lib/models/comment/comment.dart +++ b/lib/models/comment/comment.dart @@ -3,7 +3,7 @@ import 'reply.dart'; import 'user.dart'; class CommentData { - final int id; + int id; final String text; final String createdAt; final bool liked; diff --git a/lib/models/item_overview.dart b/lib/models/item_overview.dart index 50ddec4..3832850 100644 --- a/lib/models/item_overview.dart +++ b/lib/models/item_overview.dart @@ -5,14 +5,15 @@ class ItemOverview { final String title; final String image; final String description; - final int timeToRead; - final String reference; - final bool forManagers; + final int? timeToRead; + final String? reference; + final bool? forManagers; final String createdAt; - final String type; - final List categories; + final String? type; + final List? categories; + int? comments; - const ItemOverview({ + ItemOverview({ required this.id, required this.title, required this.image, @@ -23,6 +24,7 @@ class ItemOverview { required this.createdAt, required this.type, required this.categories, + required this.comments, }); factory ItemOverview.fromJson(Map json) => ItemOverview( @@ -35,11 +37,14 @@ class ItemOverview { forManagers: json['forManagers'], createdAt: json['createdAt'], type: json['type'], - categories: List.from( - json['categories'].map( - (cat) => Category.fromJson(cat), - ), - ), + comments: json['comments'], + categories: json['categories'] == null + ? null + : List.from( + json['categories'].map( + (cat) => Category.fromJson(cat), + ), + ), ); Map toJson() => { @@ -52,6 +57,6 @@ class ItemOverview { 'forManagers': forManagers, 'createdAt': createdAt, 'type': type, - 'categories': categories.map((e) => e.toJson()).toList(), + 'categories': categories?.map((e) => e.toJson()).toList(), }; } diff --git a/lib/models/news_details_data.dart b/lib/models/news_details_data.dart index c5ead9e..1b603bd 100644 --- a/lib/models/news_details_data.dart +++ b/lib/models/news_details_data.dart @@ -8,12 +8,12 @@ class NewsDetailsData { final String image; final String createdAt; final bool marked; - final int comments; + int comments; final int order; final List tags; final List contents; - const NewsDetailsData({ + NewsDetailsData({ required this.id, required this.title, required this.reference, diff --git a/lib/models/radar_details_data.dart b/lib/models/radar_details_data.dart index fb2aecd..fb493e3 100644 --- a/lib/models/radar_details_data.dart +++ b/lib/models/radar_details_data.dart @@ -12,13 +12,13 @@ class RadarDetailsData { final String? podcast; final bool forManagers; final bool marked; - final int comments; + int comments; final List tags; final List contents; final List categories; final int order; - const RadarDetailsData({ + RadarDetailsData({ required this.id, required this.title, required this.image, diff --git a/lib/models/radar_overview.dart b/lib/models/radar_overview.dart index 16e5c12..a601084 100644 --- a/lib/models/radar_overview.dart +++ b/lib/models/radar_overview.dart @@ -10,7 +10,7 @@ class RadarOverview { final bool forManagers; bool marked; final List categories; - final int comments; + int comments; RadarOverview({ required this.id, diff --git a/lib/models/requests/radar.dart b/lib/models/requests/radar.dart index 9a28fae..12e7e24 100644 --- a/lib/models/requests/radar.dart +++ b/lib/models/requests/radar.dart @@ -4,6 +4,7 @@ class RadarRequestArgs { final String? startDate; final String? endDate; final String? search; + final bool? isSingleItem; const RadarRequestArgs({ required this.page, @@ -11,5 +12,6 @@ class RadarRequestArgs { this.startDate, this.endDate, this.search, + this.isSingleItem, }); }