feat(app): clean architecture with typed repositories, DTO models and calendar event logos
This commit is contained in:
@@ -2,22 +2,26 @@ import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import '../../../core/network/api_client.dart';
|
||||
import '../../../core/theme/app_theme.dart';
|
||||
import '../models/news_article_model.dart';
|
||||
import '../repositories/news_repository.dart';
|
||||
import '../widgets/news_card_item.dart';
|
||||
import '../widgets/advanced_news_filter_bar.dart';
|
||||
|
||||
/// Paginated Infinite Scroll Daily News Feed screen with deduplication and strict chronological sorting.
|
||||
class NewsFeedScreen extends StatefulWidget {
|
||||
final ApiClient apiClient;
|
||||
final NewsRepository? repository;
|
||||
|
||||
const NewsFeedScreen({super.key, required this.apiClient});
|
||||
const NewsFeedScreen({super.key, required this.apiClient, this.repository});
|
||||
|
||||
@override
|
||||
State<NewsFeedScreen> createState() => _NewsFeedScreenState();
|
||||
}
|
||||
|
||||
class _NewsFeedScreenState extends State<NewsFeedScreen> {
|
||||
late final NewsRepository _repository;
|
||||
final ScrollController _scrollController = ScrollController();
|
||||
final List<dynamic> _newsItems = [];
|
||||
final List<NewsArticleModel> _newsItems = [];
|
||||
int _currentPage = 1;
|
||||
static const int _pageSize = 15;
|
||||
bool _isLoading = false;
|
||||
@@ -34,6 +38,7 @@ class _NewsFeedScreenState extends State<NewsFeedScreen> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_repository = widget.repository ?? NewsRepository(apiClient: widget.apiClient, backendUrl: ApiClient.baseUrl);
|
||||
_loadNews(refresh: true);
|
||||
_scrollController.addListener(() {
|
||||
if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 200) {
|
||||
@@ -49,17 +54,6 @@ class _NewsFeedScreenState extends State<NewsFeedScreen> {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
DateTime _parseDateTime(dynamic val) {
|
||||
if (val == null) return DateTime.fromMillisecondsSinceEpoch(0);
|
||||
final str = val.toString().trim();
|
||||
if (str.isEmpty) return DateTime.fromMillisecondsSinceEpoch(0);
|
||||
try {
|
||||
return DateTime.parse(str).toUtc();
|
||||
} catch (_) {
|
||||
return DateTime.fromMillisecondsSinceEpoch(0);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadNews({bool refresh = false}) async {
|
||||
if (_isLoading) return;
|
||||
if (refresh) {
|
||||
@@ -72,54 +66,32 @@ class _NewsFeedScreenState extends State<NewsFeedScreen> {
|
||||
setState(() => _isLoading = true);
|
||||
|
||||
try {
|
||||
final queryParams = <String, dynamic>{
|
||||
'page': _currentPage,
|
||||
'pageSize': _pageSize,
|
||||
};
|
||||
final fetched = await _repository.fetchNews(
|
||||
page: _currentPage,
|
||||
pageSize: _pageSize,
|
||||
date: _selectedDate?.toIso8601String().substring(0, 10),
|
||||
query: _searchQuery?.trim(),
|
||||
isin: _selectedIsin?.trim(),
|
||||
hasSentiment: _hasSentimentOnly,
|
||||
);
|
||||
|
||||
if (_selectedDate != null) {
|
||||
queryParams['date'] = _selectedDate!.toIso8601String().substring(0, 10);
|
||||
}
|
||||
if (_searchQuery != null && _searchQuery!.trim().isNotEmpty) {
|
||||
queryParams['query'] = _searchQuery!.trim();
|
||||
}
|
||||
if (_selectedIsin != null && _selectedIsin!.trim().isNotEmpty) {
|
||||
queryParams['isin'] = _selectedIsin!.trim();
|
||||
}
|
||||
if (_hasSentimentOnly) {
|
||||
queryParams['hasSentiment'] = true;
|
||||
}
|
||||
|
||||
final res = await widget.apiClient.get('/api/v1/news', queryParameters: queryParams);
|
||||
|
||||
if (res.statusCode == 200 && res.data != null && res.data is List) {
|
||||
final List fetched = res.data as List;
|
||||
setState(() {
|
||||
// Deduplicate by ID
|
||||
final existingIds = _newsItems.map((e) => e['id'] ?? e['Id']).where((id) => id != null).toSet();
|
||||
for (final item in fetched) {
|
||||
final id = item['id'] ?? item['Id'];
|
||||
if (id == null || !existingIds.contains(id)) {
|
||||
_newsItems.add(item);
|
||||
if (id != null) existingIds.add(id);
|
||||
}
|
||||
setState(() {
|
||||
final existingIds = _newsItems.map((e) => e.id).where((id) => id.isNotEmpty).toSet();
|
||||
for (final item in fetched) {
|
||||
if (item.id.isEmpty || !existingIds.contains(item.id)) {
|
||||
_newsItems.add(item);
|
||||
if (item.id.isNotEmpty) existingIds.add(item.id);
|
||||
}
|
||||
}
|
||||
|
||||
// Re-sort strictly by publication timestamp descending (newest articles at the top)
|
||||
_newsItems.sort((a, b) {
|
||||
final dtA = _parseDateTime(a['publishedAt'] ?? a['PublishedAt'] ?? a['scrapedAt'] ?? a['ScrapedAt']);
|
||||
final dtB = _parseDateTime(b['publishedAt'] ?? b['PublishedAt'] ?? b['scrapedAt'] ?? b['ScrapedAt']);
|
||||
return dtB.compareTo(dtA);
|
||||
});
|
||||
_newsItems.sort((a, b) => b.publishedAt.compareTo(a.publishedAt));
|
||||
|
||||
_currentPage++;
|
||||
if (fetched.length < _pageSize) {
|
||||
_hasMore = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
_currentPage++;
|
||||
if (fetched.length < _pageSize) {
|
||||
_hasMore = false;
|
||||
}
|
||||
});
|
||||
} catch (_) {
|
||||
// Handle error visually if necessary, currently silent fallback
|
||||
} finally {
|
||||
setState(() => _isLoading = false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user