Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scrap MB references from Sigarra #665

Merged
merged 18 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions uni/lib/controller/fetchers/reference_fetcher.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import 'package:http/http.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/model/entities/session.dart';

class ReferenceFetcher implements SessionDependantFetcher {

@override
List<String> getEndpoints(Session session) {
final List<String> baseUrls = NetworkRouter.getBaseUrlsFromSession(session)
+ [NetworkRouter.getBaseUrl('sasup')];
final List<String> urls = baseUrls
.map((url) => '${url}gpag_ccorrente_geral.conta_corrente_view')
.toList();
return urls;
}

Future<Response> getUserReferenceResponse(Session session) {
final List<String> urls = getEndpoints(session);
final String url = urls[0];
final Map<String, String> query = {'pct_cod': session.studentNumber};
return NetworkRouter.getWithCookies(url, query, session);
}
}
8 changes: 6 additions & 2 deletions uni/lib/controller/load_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Future loadRemoteUserInfoToState(StateProviders stateProviders) async {
lastUpdate = Completer(),
restaurants = Completer(),
libraryOccupation = Completer(),
calendar = Completer();
calendar = Completer(),
references = Completer();

stateProviders.profileStateProvider.getUserInfo(userInfo, session);
stateProviders.busStopProvider.getUserBusTrips(trips);
Expand All @@ -73,6 +74,7 @@ Future loadRemoteUserInfoToState(StateProviders stateProviders) async {
stateProviders.profileStateProvider
.getUserPrintBalance(printBalance, session);
stateProviders.profileStateProvider.getUserFees(fees, session);
stateProviders.referenceProvider.getUserReferences(references, userPersistentInfo, session);
});

final allRequests = Future.wait([
Expand All @@ -85,7 +87,8 @@ Future loadRemoteUserInfoToState(StateProviders stateProviders) async {
trips.future,
restaurants.future,
libraryOccupation.future,
calendar.future
calendar.future,
references.future,
]);
allRequests.then((futures) {
stateProviders.lastUserInfoProvider
Expand Down Expand Up @@ -124,6 +127,7 @@ void loadLocalUserInfoToState(StateProviders stateProviders,
stateProviders.lastUserInfoProvider.updateStateBasedOnLocalTime();
stateProviders.calendarProvider.updateStateBasedOnLocalCalendar();
stateProviders.profileStateProvider.updateStateBasedOnLocalCourseUnits();
stateProviders.referenceProvider.updateStateBasedOnLocalUserReferences();
}

stateProviders.facultyLocationsProvider.getFacultyLocations(Completer());
Expand Down
70 changes: 70 additions & 0 deletions uni/lib/controller/local_storage/app_references_database.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import 'dart:async';

import 'package:sqflite/sqflite.dart';
import 'package:uni/controller/local_storage/app_database.dart';
import 'package:uni/model/entities/reference.dart';

/// Manages the app's References database.
///
/// This database stores information about the user's references.
/// See the [Reference] class to see what data is stored in this database.
class AppReferencesDatabase extends AppDatabase {
static const String createScript =
'''CREATE TABLE refs(description TEXT, entity INTEGER, '''
'''reference INTEGER, amount REAL, limitDate TEXT)''';

AppReferencesDatabase() :
super('refs.db', [createScript], onUpgrade: migrate, version: 2);

/// Replaces all of the data in this database with the data from [references].
Future<void> saveNewReferences(List<Reference> references) async {
await deleteReferences();
await insertReferences(references);
}

/// Returns a list containing all the references stored in this database.
Future<List<Reference>> references() async {
final Database db = await getDatabase();
final List<Map<String, dynamic>> maps = await db.query('refs');

return List.generate(maps.length, (i) {
return Reference(
maps[i]['description'],
DateTime.parse(maps[i]['limitDate']),
maps[i]['entity'],
maps[i]['reference'],
maps[i]['amount']);
});
}

/// Deletes all of the data in this database.
Future<void> deleteReferences() async {
final Database db = await getDatabase();
await db.delete('refs');
}

/// Adds all items from [references] to this database.
///
/// If a row with the same data is present, it will be replaced.
Future<void> insertReferences(List<Reference> references) async {
for (Reference reference in references) {
await insertInDatabase(
'refs',
reference.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace
);
}
}

/// Migrates [db] from [oldVersion] to [newVersion].
///
/// *Note:* This operation only updates the schema of the tables present in
/// the database and, as such, all data is lost.
static FutureOr<void> migrate(
Database db, int oldVersion, int newVersion) async {
final batch = db.batch();
batch.execute('DROP TABLE IF EXISTS refs');
batch.execute(createScript);
batch.commit();
}
}
33 changes: 33 additions & 0 deletions uni/lib/controller/parsers/parser_references.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import 'package:html/dom.dart';
import 'package:html/parser.dart' show parse;
import 'package:http/http.dart' as http;
import 'package:uni/model/entities/reference.dart';


/// Extracts a list of references from an HTTP [response].
Future<List<Reference>> parseReferences(http.Response response) async {
final document = parse(response.body);

final List<Reference> references = [];

final List<Element> rows = document
.querySelectorAll('div#tab0 > table.dadossz > tbody > tr');

if (rows.length > 1) {
rows.sublist(1)
.forEach((Element tr) {
final List<Element> info = tr.querySelectorAll('td');
final String description = info[0].text;
final DateTime limitDate = DateTime.parse(info[2].text);
final int entity = int.parse(info[3].text);
final int reference = int.parse(info[4].text);
final String formattedAmount = info[5].text
.replaceFirst(',', '.')
.replaceFirst('€', '');
final double amount = double.parse(formattedAmount);
references.add(Reference(description, limitDate, entity, reference, amount));
});
}

return references;
}
6 changes: 5 additions & 1 deletion uni/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import 'package:uni/model/providers/last_user_info_provider.dart';
import 'package:uni/model/providers/lecture_provider.dart';
import 'package:uni/model/providers/library_occupation_provider.dart';
import 'package:uni/model/providers/profile_state_provider.dart';
import 'package:uni/model/providers/reference_provider.dart';
import 'package:uni/model/providers/restaurant_provider.dart';
import 'package:uni/model/providers/session_provider.dart';
import 'package:uni/model/providers/state_providers.dart';
Expand Down Expand Up @@ -61,7 +62,8 @@ Future<void> main() async {
LastUserInfoProvider(),
UserFacultiesProvider(),
FavoriteCardsProvider(),
HomePageEditingModeProvider());
HomePageEditingModeProvider(),
ReferenceProvider());

OnStartUp.onStart(stateProviders.sessionProvider);
WidgetsFlutterBinding.ensureInitialized();
Expand Down Expand Up @@ -109,6 +111,8 @@ Future<void> main() async {
stateProviders.favoriteCardsProvider),
ChangeNotifierProvider(
create: (context) => stateProviders.homePageEditingMode),
ChangeNotifierProvider(
create: (context) => stateProviders.referenceProvider),
],
child: ChangeNotifierProvider<ThemeNotifier>(
create: (_) => ThemeNotifier(savedTheme),
Expand Down
21 changes: 21 additions & 0 deletions uni/lib/model/entities/reference.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
class Reference {
final String description;
final DateTime limitDate;
final int entity;
final int reference;
final double amount;

Reference(this.description, this.limitDate,
this.entity, this.reference, this.amount);

/// Converts this reference to a map.
Map<String, dynamic> toMap() {
return {
'description': description,
'limitDate': limitDate.toString(),
'entity': entity,
'reference': reference,
'amount': amount,
};
}
}
64 changes: 64 additions & 0 deletions uni/lib/model/providers/reference_provider.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import 'dart:async';
import 'dart:collection';

import 'package:logger/logger.dart';
import 'package:tuple/tuple.dart';
import 'package:uni/controller/fetchers/reference_fetcher.dart';
import 'package:uni/controller/local_storage/app_references_database.dart';
import 'package:uni/controller/local_storage/app_refresh_times_database.dart';
import 'package:uni/controller/parsers/parser_references.dart';
import 'package:uni/model/entities/reference.dart';
import 'package:uni/model/entities/session.dart';
import 'package:uni/model/providers/state_provider_notifier.dart';
import 'package:uni/model/request_status.dart';

class ReferenceProvider extends StateProviderNotifier {
List<Reference> _references = [];

UnmodifiableListView<Reference> get references =>
UnmodifiableListView(_references);

void getUserReferences(
Completer<void> action,
Tuple2<String, String> userPersistentInfo,
Session session) async {
try {
if (userPersistentInfo.item1 == '' || userPersistentInfo.item2 == '') {
return;
}

updateStatus(RequestStatus.busy);
final response = await ReferenceFetcher()
.getUserReferenceResponse(session);
final List<Reference> references = await parseReferences(response);
final String currentTime = DateTime.now().toString();
await storeRefreshTime('references', currentTime);

// Store references in the database
final referencesDb = AppReferencesDatabase();
referencesDb.saveNewReferences(references);

_references = references;
notifyListeners();

} catch (e) {
Logger().e('Failed to get References info');
updateStatus(RequestStatus.failed);
}

action.complete();
}

void updateStateBasedOnLocalUserReferences() async {
final AppReferencesDatabase referencesDb = AppReferencesDatabase();
final List<Reference> references = await referencesDb.references();
_references = references;
notifyListeners();
}

Future<void> storeRefreshTime(String db, String currentTime) async {
final AppRefreshTimesDatabase refreshTimesDatabase =
AppRefreshTimesDatabase();
refreshTimesDatabase.saveRefreshTime(db, currentTime);
}
}
10 changes: 8 additions & 2 deletions uni/lib/model/providers/state_providers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'package:uni/model/providers/last_user_info_provider.dart';
import 'package:uni/model/providers/lecture_provider.dart';
import 'package:uni/model/providers/library_occupation_provider.dart';
import 'package:uni/model/providers/profile_state_provider.dart';
import 'package:uni/model/providers/reference_provider.dart';
import 'package:uni/model/providers/restaurant_provider.dart';
import 'package:uni/model/providers/session_provider.dart';
import 'package:uni/model/providers/user_faculties_provider.dart';
Expand All @@ -28,6 +29,7 @@ class StateProviders {
final UserFacultiesProvider userFacultiesProvider;
final FavoriteCardsProvider favoriteCardsProvider;
final HomePageEditingModeProvider homePageEditingMode;
final ReferenceProvider referenceProvider;

StateProviders(
this.lectureProvider,
Expand All @@ -42,7 +44,8 @@ class StateProviders {
this.lastUserInfoProvider,
this.userFacultiesProvider,
this.favoriteCardsProvider,
this.homePageEditingMode);
this.homePageEditingMode,
this.referenceProvider);

static StateProviders fromContext(BuildContext context) {
final lectureProvider =
Expand Down Expand Up @@ -70,6 +73,8 @@ class StateProviders {
Provider.of<FavoriteCardsProvider>(context, listen: false);
final homePageEditingMode =
Provider.of<HomePageEditingModeProvider>(context, listen: false);
final referenceProvider =
Provider.of<ReferenceProvider>(context, listen: false);

return StateProviders(
lectureProvider,
Expand All @@ -84,6 +89,7 @@ class StateProviders {
lastUserInfoProvider,
userFacultiesProvider,
favoriteCardsProvider,
homePageEditingMode);
homePageEditingMode,
referenceProvider);
}
}
11 changes: 6 additions & 5 deletions uni/lib/view/common_widgets/generic_expansion_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ abstract class GenericExpansionCard extends StatefulWidget {
return GenericExpansionCardState();
}

TextStyle? getTitleStyle(BuildContext context) => Theme.of(context)
.textTheme
.headlineSmall
?.apply(color: Theme.of(context).primaryColor);

String getTitle();
Widget buildCardContent(BuildContext context);
}
Expand All @@ -26,11 +31,7 @@ class GenericExpansionCardState extends State<GenericExpansionCard> {
expandedColor: (Theme.of(context).brightness == Brightness.light)
? const Color.fromARGB(0xf, 0, 0, 0)
: const Color.fromARGB(255, 43, 43, 43),
title: Text(widget.getTitle(),
style: Theme.of(context)
.textTheme
.headlineSmall
?.apply(color: Theme.of(context).primaryColor)),
title: Text(widget.getTitle(), style: widget.getTitleStyle(context)),
elevation: 0,
children: <Widget>[
Container(
Expand Down
Loading