chore(wip): upgrade dependencies, begin refactor

frontend/lib/data/datasources/backend_trip_datasource.dart

@@ -0,0 +1,5 @@
+import 'package:anyway/domain/entities/landmark.dart';
+
+abstract class TripRemoteDataSource {
+  Future<List<Landmark>> fetchLandmarks();
+}

frontend/lib/data/models/landmark_model.dart

@@ -0,0 +1,30 @@
+import 'package:anyway/domain/entities/landmark.dart';
+import 'package:anyway/domain/entities/landmark_description.dart';
+import 'package:anyway/domain/entities/landmark_type.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+part 'landmark_model.freezed.dart';
+part 'landmark_model.g.dart';
+
+@freezed
+abstract class LandmarkModel with _$LandmarkModel {
+  const factory LandmarkModel({
+    required String uuid,
+    required String name,
+    required List<double> location,
+    required String type,
+    required bool isSecondary,
+    required String description,
+  }) = _LandmarkModel;
+
+  factory LandmarkModel.fromJson(Map<String, dynamic> json) => _$LandmarkModelFromJson(json);
+
+  Landmark toEntity() => Landmark(
+    uuid: uuid,
+    name: name,
+    location: location,
+    type: LandmarkType(type: LandmarkTypeEnum.values.firstWhere((e) => e.value == type)),
+    isSecondary: isSecondary,
+    // TODO - try to set tags
+    description: LandmarkDescription(description: description, tags: [])
+  );
+}

frontend/lib/data/models/landmark_model.freezed.dart

@@ -0,0 +1,443 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'landmark_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$LandmarkModel {
+  String get uuid;
+  String get name;
+  List<double> get location;
+  String get type;
+  bool get isSecondary;
+  String get description;
+
+  /// Create a copy of LandmarkModel
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  $LandmarkModelCopyWith<LandmarkModel> get copyWith =>
+      _$LandmarkModelCopyWithImpl<LandmarkModel>(
+          this as LandmarkModel, _$identity);
+
+  /// Serializes this LandmarkModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is LandmarkModel &&
+            (identical(other.uuid, uuid) || other.uuid == uuid) &&
+            (identical(other.name, name) || other.name == name) &&
+            const DeepCollectionEquality().equals(other.location, location) &&
+            (identical(other.type, type) || other.type == type) &&
+            (identical(other.isSecondary, isSecondary) ||
+                other.isSecondary == isSecondary) &&
+            (identical(other.description, description) ||
+                other.description == description));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      uuid,
+      name,
+      const DeepCollectionEquality().hash(location),
+      type,
+      isSecondary,
+      description);
+
+  @override
+  String toString() {
+    return 'LandmarkModel(uuid: $uuid, name: $name, location: $location, type: $type, isSecondary: $isSecondary, description: $description)';
+  }
+}
+
+/// @nodoc
+abstract mixin class $LandmarkModelCopyWith<$Res> {
+  factory $LandmarkModelCopyWith(
+          LandmarkModel value, $Res Function(LandmarkModel) _then) =
+      _$LandmarkModelCopyWithImpl;
+  @useResult
+  $Res call(
+      {String uuid,
+      String name,
+      List<double> location,
+      String type,
+      bool isSecondary,
+      String description});
+}
+
+/// @nodoc
+class _$LandmarkModelCopyWithImpl<$Res>
+    implements $LandmarkModelCopyWith<$Res> {
+  _$LandmarkModelCopyWithImpl(this._self, this._then);
+
+  final LandmarkModel _self;
+  final $Res Function(LandmarkModel) _then;
+
+  /// Create a copy of LandmarkModel
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? uuid = null,
+    Object? name = null,
+    Object? location = null,
+    Object? type = null,
+    Object? isSecondary = null,
+    Object? description = null,
+  }) {
+    return _then(_self.copyWith(
+      uuid: null == uuid
+          ? _self.uuid
+          : uuid // ignore: cast_nullable_to_non_nullable
+              as String,
+      name: null == name
+          ? _self.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      location: null == location
+          ? _self.location
+          : location // ignore: cast_nullable_to_non_nullable
+              as List<double>,
+      type: null == type
+          ? _self.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      isSecondary: null == isSecondary
+          ? _self.isSecondary
+          : isSecondary // ignore: cast_nullable_to_non_nullable
+              as bool,
+      description: null == description
+          ? _self.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// Adds pattern-matching-related methods to [LandmarkModel].
+extension LandmarkModelPatterns on LandmarkModel {
+  /// A variant of `map` that fallback to returning `orElse`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>(
+    TResult Function(_LandmarkModel value)? $default, {
+    required TResult orElse(),
+  }) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel() when $default != null:
+        return $default(_that);
+      case _:
+        return orElse();
+    }
+  }
+
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// Callbacks receives the raw object, upcasted.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case final Subclass2 value:
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>(
+    TResult Function(_LandmarkModel value) $default,
+  ) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel():
+        return $default(_that);
+      case _:
+        throw StateError('Unexpected subclass');
+    }
+  }
+
+  /// A variant of `map` that fallback to returning `null`.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case final Subclass value:
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>(
+    TResult? Function(_LandmarkModel value)? $default,
+  ) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel() when $default != null:
+        return $default(_that);
+      case _:
+        return null;
+    }
+  }
+
+  /// A variant of `when` that fallback to an `orElse` callback.
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return orElse();
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>(
+    TResult Function(String uuid, String name, List<double> location,
+            String type, bool isSecondary, String description)?
+        $default, {
+    required TResult orElse(),
+  }) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel() when $default != null:
+        return $default(_that.uuid, _that.name, _that.location, _that.type,
+            _that.isSecondary, _that.description);
+      case _:
+        return orElse();
+    }
+  }
+
+  /// A `switch`-like method, using callbacks.
+  ///
+  /// As opposed to `map`, this offers destructuring.
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case Subclass2(:final field2):
+  ///     return ...;
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>(
+    TResult Function(String uuid, String name, List<double> location,
+            String type, bool isSecondary, String description)
+        $default,
+  ) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel():
+        return $default(_that.uuid, _that.name, _that.location, _that.type,
+            _that.isSecondary, _that.description);
+      case _:
+        throw StateError('Unexpected subclass');
+    }
+  }
+
+  /// A variant of `when` that fallback to returning `null`
+  ///
+  /// It is equivalent to doing:
+  /// ```dart
+  /// switch (sealedClass) {
+  ///   case Subclass(:final field):
+  ///     return ...;
+  ///   case _:
+  ///     return null;
+  /// }
+  /// ```
+
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>(
+    TResult? Function(String uuid, String name, List<double> location,
+            String type, bool isSecondary, String description)?
+        $default,
+  ) {
+    final _that = this;
+    switch (_that) {
+      case _LandmarkModel() when $default != null:
+        return $default(_that.uuid, _that.name, _that.location, _that.type,
+            _that.isSecondary, _that.description);
+      case _:
+        return null;
+    }
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _LandmarkModel implements LandmarkModel {
+  const _LandmarkModel(
+      {required this.uuid,
+      required this.name,
+      required final List<double> location,
+      required this.type,
+      required this.isSecondary,
+      required this.description})
+      : _location = location;
+  factory _LandmarkModel.fromJson(Map<String, dynamic> json) =>
+      _$LandmarkModelFromJson(json);
+
+  @override
+  final String uuid;
+  @override
+  final String name;
+  final List<double> _location;
+  @override
+  List<double> get location {
+    if (_location is EqualUnmodifiableListView) return _location;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_location);
+  }
+
+  @override
+  final String type;
+  @override
+  final bool isSecondary;
+  @override
+  final String description;
+
+  /// Create a copy of LandmarkModel
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @pragma('vm:prefer-inline')
+  _$LandmarkModelCopyWith<_LandmarkModel> get copyWith =>
+      __$LandmarkModelCopyWithImpl<_LandmarkModel>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$LandmarkModelToJson(
+      this,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _LandmarkModel &&
+            (identical(other.uuid, uuid) || other.uuid == uuid) &&
+            (identical(other.name, name) || other.name == name) &&
+            const DeepCollectionEquality().equals(other._location, _location) &&
+            (identical(other.type, type) || other.type == type) &&
+            (identical(other.isSecondary, isSecondary) ||
+                other.isSecondary == isSecondary) &&
+            (identical(other.description, description) ||
+                other.description == description));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      uuid,
+      name,
+      const DeepCollectionEquality().hash(_location),
+      type,
+      isSecondary,
+      description);
+
+  @override
+  String toString() {
+    return 'LandmarkModel(uuid: $uuid, name: $name, location: $location, type: $type, isSecondary: $isSecondary, description: $description)';
+  }
+}
+
+/// @nodoc
+abstract mixin class _$LandmarkModelCopyWith<$Res>
+    implements $LandmarkModelCopyWith<$Res> {
+  factory _$LandmarkModelCopyWith(
+          _LandmarkModel value, $Res Function(_LandmarkModel) _then) =
+      __$LandmarkModelCopyWithImpl;
+  @override
+  @useResult
+  $Res call(
+      {String uuid,
+      String name,
+      List<double> location,
+      String type,
+      bool isSecondary,
+      String description});
+}
+
+/// @nodoc
+class __$LandmarkModelCopyWithImpl<$Res>
+    implements _$LandmarkModelCopyWith<$Res> {
+  __$LandmarkModelCopyWithImpl(this._self, this._then);
+
+  final _LandmarkModel _self;
+  final $Res Function(_LandmarkModel) _then;
+
+  /// Create a copy of LandmarkModel
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $Res call({
+    Object? uuid = null,
+    Object? name = null,
+    Object? location = null,
+    Object? type = null,
+    Object? isSecondary = null,
+    Object? description = null,
+  }) {
+    return _then(_LandmarkModel(
+      uuid: null == uuid
+          ? _self.uuid
+          : uuid // ignore: cast_nullable_to_non_nullable
+              as String,
+      name: null == name
+          ? _self.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      location: null == location
+          ? _self._location
+          : location // ignore: cast_nullable_to_non_nullable
+              as List<double>,
+      type: null == type
+          ? _self.type
+          : type // ignore: cast_nullable_to_non_nullable
+              as String,
+      isSecondary: null == isSecondary
+          ? _self.isSecondary
+          : isSecondary // ignore: cast_nullable_to_non_nullable
+              as bool,
+      description: null == description
+          ? _self.description
+          : description // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+// dart format on

frontend/lib/data/models/landmark_model.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'landmark_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_LandmarkModel _$LandmarkModelFromJson(Map<String, dynamic> json) =>
+    _LandmarkModel(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      location: (json['location'] as List<dynamic>)
+          .map((e) => (e as num).toDouble())
+          .toList(),
+      type: json['type'] as String,
+      isSecondary: json['isSecondary'] as bool,
+      description: json['description'] as String,
+    );
+
+Map<String, dynamic> _$LandmarkModelToJson(_LandmarkModel instance) =>
+    <String, dynamic>{
+      'uuid': instance.uuid,
+      'name': instance.name,
+      'location': instance.location,
+      'type': instance.type,
+      'isSecondary': instance.isSecondary,
+      'description': instance.description,
+    };

frontend/lib/data/repositories/backend_trip_repository.dart

@@ -0,0 +1,119 @@
+import 'dart:developer';
+
+import 'package:anyway/domain/entities/preferences.dart';
+import 'package:anyway/domain/entities/trip.dart';
+import 'package:anyway/domain/repositories/trip_repository.dart';
+import 'package:dio/dio.dart';
+
+// We can request a new trip from our backend API by passing it user preferences (which contain all the necessary data)
+class BackendTripRepository implements TripRepository {
+  final Dio dio;
+
+  BackendTripRepository({required this.dio});
+
+
+  @override
+  Future<Trip> getTrip({Preferences? preferences, String? tripUUID}) async {
+    Map<String, dynamic> data = {
+      "preferences": preferences!.toJson(),
+      // "start": preferences!.startPoint.location,
+    };
+
+
+    late Response response;
+    try {
+      response = await dio.post(
+        "/trip/new",
+        data: data
+      );
+    } catch (e) {
+      trip.updateUUID("error");
+
+      // Format the error message to be more user friendly
+      String errorDescription;
+      if (e is DioException) {
+          errorDescription = e.message ?? "Unknown error";
+      } else if (e is SocketException) {
+          errorDescription = "No internet connection";
+      } else if (e is TimeoutException) {
+          errorDescription = "Request timed out";
+      } else {
+          errorDescription = "Unknown error";
+      }
+
+      String errorMessage = """
+        We're sorry, the following error was generated:
+
+        ${errorDescription.trim()}
+      """.trim();
+
+      trip.updateError(errorMessage);
+      log(e.toString());
+      log(errorMessage);
+      return;
+    }
+
+    // handle more specific errors
+    if (response.statusCode != 200) {
+      trip.updateUUID("error");
+      String errorDescription;
+      if (response.data.runtimeType == String) {
+        errorDescription = response.data;
+      } else if (response.data.runtimeType == Map<String, dynamic>) {
+        errorDescription = response.data["detail"] ?? "Unknown error";
+      } else {
+        errorDescription = "Unknown error";
+      }
+
+      String errorMessage = """
+        We're sorry, our servers generated the following error:
+
+        ${errorDescription.trim()}
+        Please try again.
+      """.trim();
+      trip.updateError(errorMessage);
+      log(errorMessage);
+      // Actualy no need to throw an exception, we can just log the error and let the user retry
+      // throw Exception(errorDetail);
+    } else {
+
+      // if the response data is not json, throw an error
+      if (response.data is! Map<String, dynamic>) {
+        log("${response.data.runtimeType}");
+        trip.updateUUID("error");
+        String errorMessage = """
+          We're sorry, our servers generated the following error:
+
+          ${response.data.trim()}
+          Please try again.
+        """.trim();
+        trip.updateError(errorMessage);
+        log(errorMessage);
+        return;
+      }
+
+      Map<String, dynamic> json = response.data;
+
+      // only fill in the trip "meta" data for now
+      trip.loadFromJson(json);
+
+      // now fill the trip with landmarks
+      // we are going to recreate ALL the landmarks from the information given by the api
+      trip.landmarks.remove(trip.landmarks.first);
+      String? nextUUID = json["first_landmark_uuid"];
+      while (nextUUID != null) {
+        var (landmark, newUUID) = await fetchLandmark(nextUUID);
+        trip.addLandmark(landmark);
+        nextUUID = newUUID;
+      }
+
+    log(response.data.toString());
+    // // Also save the trip for the user's convenience
+    // savedTrips.addTrip(trip);
+    }
+
+
+
+
+  }
+}