feat: new restaurants api

packages/uni_app/lib/controller/fetchers/restaurant_fetcher.dart

@@ -1,47 +1,80 @@
+import 'package:intl/intl.dart';
 import 'package:uni/controller/networking/network_router.dart';
 import 'package:uni/controller/parsers/parser_restaurants.dart';
+import 'package:uni/model/entities/meal.dart';
 import 'package:uni/model/entities/restaurant.dart';
+import 'package:uni/model/utils/day_of_week.dart';
 import 'package:uni/session/flows/base/session.dart';
+import 'package:up_menus/up_menus.dart';
 
 /// Class for fetching the menu
 class RestaurantFetcher {
-  final String spreadSheetUrl = 'https://docs.google.com/spreadsheets/d/'
-      '1TJauM0HwIf2RauQU2GmhdZZ1ZicFLMHuBkxWwVOw3Q4';
-  final String jsonEndpoint = '/gviz/tq?tqx=out:json';
-
-  // Format: Date(dd/mm/yyyy), Meal("Almoço", "Jantar), Dish("Sopa", "Carne",
-  //         "Peixe", "Dieta", "Vegetariano", "Salada"), Description(String)
-  final String sheetsColumnRange = 'A:D';
-
-  // List the Restaurant sheet names in the Google Sheets Document
-  final List<String> restaurantSheets = ['Cantina'];
-
-  // Generate the Gsheets endpoints list based on a list of sheets
-  String buildGSheetsEndpoint(String sheet) {
-    return Uri.encodeFull(
-      '$spreadSheetUrl$jsonEndpoint&sheet=$sheet&range=$sheetsColumnRange',
+  Restaurant convertToRestaurant(
+    Establishment establishment,
+    Iterable<DayMenu> dayMenus,
+    String period,
+  ) {
+    final currentLocale = Intl.getCurrentLocale();
+
+    final meals = <Meal>[];
+    for (final dayMenu in dayMenus) {
+      for (final dish in dayMenu.dishes) {
+        // Extract the information about the meal.
+        meals.add(
+          Meal(
+            dish.dishType.namePt,
+            currentLocale.startsWith('pt')
+                ? dish.dish.namePt
+                : dish.dish.nameEn ??
+                    dish.dish
+                        .namePt, // if there isn't an english name, use the portuguese one.
+            parseDateTime(dayMenu.day),
+            dayMenu.day,
+          ),
+        );
+      }
+    }
+    return Restaurant(
+      establishment.id,
+      currentLocale.startsWith('pt')
+          ? establishment.namePt
+          : establishment.nameEn,
+      period,
+      '',
+      meals: meals,
     );
   }
 
-  String getRestaurantGSheetName(Restaurant restaurant) {
-    return restaurantSheets.firstWhere(
-      (sheetName) =>
-          restaurant.name.toLowerCase().contains(sheetName.toLowerCase()),
-      orElse: () => '',
-    );
-  }
+  Future<List<Restaurant>> fetchSASUPRestaurants() async {
+    // TODO: change the implementation to accomodate changes for the new UI.
+    final upMenus = UPMenusApi();
+    final establishments = await upMenus.establishments.list();
+    final restaurants = <Restaurant>[];
 
-  Future<Restaurant> fetchGSheetsRestaurant(
-    String url,
-    String restaurantName,
-    Session session, {
-    bool isDinner = false,
-  }) async {
-    return getRestaurantFromGSheets(
-      await NetworkRouter.getWithCookies(url, {}, session),
-      restaurantName,
-      isDinner: isDinner,
-    );
+    const periods = [
+      {'period': Period.lunch, 'meal': 'lunch'},
+      {'period': Period.dinner, 'meal': 'dinner'},
+      {'period': Period.snackBar, 'meal': 'snackbar'},
+      {'period': Period.breakfast, 'meal': 'breakfast'},
+    ];
+
+    for (final establishment in establishments) {
+      if (establishment.dayMenu == false) {
+        continue;
+      }
+
+      for (final period in periods) {
+        restaurants.add(
+          convertToRestaurant(
+            establishment,
+            await upMenus.dayMenus
+                .get(establishment.id, period['period']! as Period),
+            period['meal']! as String,
+          ),
+        );
+      }
+    }
+    return restaurants;
   }
 
   final List<String> sigarraMenuEndpoints = [
@@ -64,32 +97,8 @@ class RestaurantFetcher {
   }
 
   Future<List<Restaurant>> getRestaurants(Session session) async {
-    final restaurants = await fetchSigarraRestaurants(session);
-
-    // Check for restaurants without associated meals and attempt to parse them
-    // from GSheets
-    final restaurantsWithoutMeals =
-        restaurants.where((restaurant) => restaurant.meals.isEmpty).toList();
-
-    for (final restaurant in restaurantsWithoutMeals) {
-      final sheetName = getRestaurantGSheetName(restaurant);
-      if (sheetName.isEmpty) {
-        continue;
-      }
-
-      final gSheetsRestaurant = await fetchGSheetsRestaurant(
-        buildGSheetsEndpoint(sheetName),
-        restaurant.name,
-        session,
-        isDinner: restaurant.name.toLowerCase().contains('jantar'),
-      );
-
-      restaurants
-        ..removeWhere(
-          (restaurant) => restaurant.name == gSheetsRestaurant.name,
-        )
-        ..insert(0, gSheetsRestaurant);
-    }
+    final restaurants =
+        await fetchSASUPRestaurants() + await fetchSigarraRestaurants(session);
 
     return restaurants;
   }

packages/uni_app/lib/controller/local_storage/database/app_restaurant_database.dart

@@ -46,6 +46,7 @@ class RestaurantDatabase extends AppDatabase<List<Restaurant>> {
           return Restaurant(
             restaurantId,
             map['name'] as String,
+            map['period'] as String,
             map['ref'] as String,
             meals: meals,
           );
@@ -70,7 +71,7 @@ class RestaurantDatabase extends AppDatabase<List<Restaurant>> {
       }
     });
 
-    return filterPastMeals(restaurants);
+    return restaurants;
   }
 
   Future<List<Meal>> getRestaurantMeals(
@@ -129,22 +130,3 @@ class RestaurantDatabase extends AppDatabase<List<Restaurant>> {
     });
   }
 }
-
-List<Restaurant> filterPastMeals(List<Restaurant> restaurants) {
-  final restaurantsCopy = List<Restaurant>.from(restaurants);
-  // Hide past and next weeks' meals
-  // (To replicate sigarra's behaviour for the GSheets meals)
-  final now = DateTime.now().toUtc();
-  final today = DateTime.utc(now.year, now.month, now.day);
-  final nextSunday = today.add(Duration(days: DateTime.sunday - now.weekday));
-
-  for (final restaurant in restaurantsCopy) {
-    for (final meals in restaurant.meals.values) {
-      meals.removeWhere(
-        (meal) => meal.date.isBefore(today) || meal.date.isAfter(nextSunday),
-      );
-    }
-  }
-
-  return restaurantsCopy;
-}

packages/uni_app/lib/controller/parsers/parser_restaurants.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:intl/intl.dart';
@@ -72,52 +70,9 @@ List<Restaurant> getRestaurantsFromHtml(Response response) {
       null,
       restaurantTuple.item2,
       restaurantTuple.item1,
+      '',
       meals: meals,
     );
   }).toList();
   return restaurants;
 }
-
-Restaurant getRestaurantFromGSheets(
-  Response response,
-  String restaurantName, {
-  bool isDinner = false,
-}) {
-  // Ignore beginning of response: "/*O_o*/\ngoogle.visualization.Query.setResponse("
-  // Ignore the end of the response: ");"
-  // Check the structure by accessing the link:
-  // https://docs.google.com/spreadsheets/d/1TJauM0HwIf2RauQU2GmhdZZ1ZicFLMHuBkxWwVOw3Q4/gviz/tq?tqx=out:json&sheet=Cantina%20de%20Engenharia&range=A:D
-  final jsonString = response.body.substring(
-    response.body.indexOf('(') + 1,
-    response.body.lastIndexOf(')'),
-  );
-  final parsedJson = jsonDecode(jsonString) as Map<String, dynamic>;
-
-  final mealsList = <Meal>[];
-
-  final format = DateFormat('d/M/y');
-
-  final table = parsedJson['table'] as Map<String, dynamic>;
-  final rows = table['rows'] as List<dynamic>;
-
-  for (final row in rows) {
-    final cellList = (row as Map<String, dynamic>)['c'] as List<dynamic>;
-    if (((cellList[1] as Map<String, dynamic>)['v'] == 'Almoço' && isDinner) ||
-        ((cellList[1] as Map<String, dynamic>)['v'] != 'Almoço' && !isDinner)) {
-      continue;
-    }
-
-    final meal = Meal(
-      (cellList[2] as Map<String, dynamic>)['v'] as String,
-      (cellList[3] as Map<String, dynamic>)['v'] as String,
-      DayOfWeek.values[format
-              .parseUtc((cellList[0] as Map<String, dynamic>)['f'] as String)
-              .weekday -
-          1],
-      format.parseUtc((cellList[0] as Map<String, dynamic>)['f'] as String),
-    );
-    mealsList.add(meal);
-  }
-
-  return Restaurant(null, restaurantName, '', meals: mealsList);
-}

packages/uni_app/lib/generated/intl/messages_en.dart

@@ -63,6 +63,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "banner_info": MessageLookupByLibrary.simpleMessage(
             "We do now collect anonymous usage statistics in order to improve your experience. You can change it in settings."),
         "bibliography": MessageLookupByLibrary.simpleMessage("Bibliography"),
+        "breakfast": MessageLookupByLibrary.simpleMessage("Breakfast"),
         "bs_description": MessageLookupByLibrary.simpleMessage(
             "Did you find any bugs in the application?\nDo you have any suggestions for the app?\nTell us so we can improve!"),
         "bug_description": MessageLookupByLibrary.simpleMessage(
@@ -110,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "description": MessageLookupByLibrary.simpleMessage("Description"),
         "desired_email": MessageLookupByLibrary.simpleMessage(
             "Email where you want to be contacted"),
+        "dinner": MessageLookupByLibrary.simpleMessage("Dinner"),
         "dona_bia": MessageLookupByLibrary.simpleMessage(
             "D. Beatriz\'s stationery store"),
         "dona_bia_building": MessageLookupByLibrary.simpleMessage(
@@ -167,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "login_with_credentials":
             MessageLookupByLibrary.simpleMessage("Login with credentials"),
         "logout": MessageLookupByLibrary.simpleMessage("Log out"),
+        "lunch": MessageLookupByLibrary.simpleMessage("Lunch"),
         "menus": MessageLookupByLibrary.simpleMessage("Menus"),
         "min_value_reference":
             MessageLookupByLibrary.simpleMessage("Minimum value: 1,00 €"),
@@ -272,6 +275,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "sent_error": MessageLookupByLibrary.simpleMessage(
             "An error occurred in sending"),
         "settings": MessageLookupByLibrary.simpleMessage("Settings"),
+        "snackbar": MessageLookupByLibrary.simpleMessage("Snackbar"),
         "some_error": MessageLookupByLibrary.simpleMessage("Some error!"),
         "stcp_stops":
             MessageLookupByLibrary.simpleMessage("STCP - Upcoming Trips"),

packages/uni_app/lib/generated/intl/messages_pt_PT.dart

@@ -63,6 +63,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "banner_info": MessageLookupByLibrary.simpleMessage(
             "Agora recolhemos estatísticas de uso anónimas para melhorar a tua experiência. Podes alterá-lo nas definições."),
         "bibliography": MessageLookupByLibrary.simpleMessage("Bibliografia"),
+        "breakfast": MessageLookupByLibrary.simpleMessage("Pequeno Almoço"),
         "bs_description": MessageLookupByLibrary.simpleMessage(
             "Encontraste algum bug na aplicação?\nTens alguma sugestão para a app?\nConta-nos para que possamos melhorar!"),
         "bug_description": MessageLookupByLibrary.simpleMessage(
@@ -109,6 +110,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "description": MessageLookupByLibrary.simpleMessage("Descrição"),
         "desired_email": MessageLookupByLibrary.simpleMessage(
             "Email em que desejas ser contactado"),
+        "dinner": MessageLookupByLibrary.simpleMessage("Jantar"),
         "dona_bia":
             MessageLookupByLibrary.simpleMessage("Papelaria D. Beatriz"),
         "dona_bia_building": MessageLookupByLibrary.simpleMessage(
@@ -166,6 +168,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "login_with_credentials": MessageLookupByLibrary.simpleMessage(
             "Iniciar sessão com credenciais"),
         "logout": MessageLookupByLibrary.simpleMessage("Terminar sessão"),
+        "lunch": MessageLookupByLibrary.simpleMessage("Almoço"),
         "menus": MessageLookupByLibrary.simpleMessage("Ementas"),
         "min_value_reference":
             MessageLookupByLibrary.simpleMessage("Valor mínimo: 1,00 €"),
@@ -273,6 +276,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "sent_error":
             MessageLookupByLibrary.simpleMessage("Ocorreu um erro no envio"),
         "settings": MessageLookupByLibrary.simpleMessage("Definições"),
+        "snackbar": MessageLookupByLibrary.simpleMessage("Snackbar"),
         "some_error": MessageLookupByLibrary.simpleMessage("Algum erro!"),
         "stcp_stops":
             MessageLookupByLibrary.simpleMessage("STCP - Próximas Viagens"),