Rearrange generated files

uni/build.yaml

@@ -4,4 +4,8 @@ targets:
  mockito|mockBuilder:
  options:
  build_extensions:
- '^test/{{}}.dart': 'test/mocks/{{}}.mocks.dart'
+ '^test/{{}}.dart': 'test/mocks/{{}}.mocks.dart'
+ source_gen:combining_builder:
+ options:
+ build_extensions:
+ '^lib/{{}}.dart' : 'lib/generated/{{}}.g.dart'

uni/lib/model/entities/bug_report.dart

@@ -2,7 +2,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:tuple/tuple.dart';
 
-part 'bug_report.g.dart';
+part '../../generated/model/entities/bug_report.g.dart';
 
 class TupleConverter extends JsonConverter<Tuple2<String, String>?, String?> {
  const TupleConverter();

uni/lib/model/entities/bus.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'bus.g.dart';
+part '../../generated/model/entities/bus.g.dart';
 
 /// Stores information about a bus.
 ///

uni/lib/model/entities/bus_stop.dart

@@ -1,7 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uni/model/entities/trip.dart';
 
-part 'bus_stop.g.dart';
+part '../../generated/model/entities/bus_stop.g.dart';
 
 /// Stores information about a bus stop.
 @JsonSerializable()

uni/lib/model/entities/calendar_event.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'calendar_event.g.dart';
+part '../../generated/model/entities/calendar_event.g.dart';
 
 /// An event in the school calendar
 @JsonSerializable()

uni/lib/model/entities/course.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'course.g.dart';
+part '../../generated/model/entities/course.g.dart';
 
 /// Stores information about a course.
 ///
@@ -11,11 +11,11 @@ part 'course.g.dart';
 /// - The course current `year`
 /// - The date of the `firstEnrollment`
 /// - The course `state`
-@JsonSerializable()
+@JsonSerializable(createFactory: false)
 class Course {
  Course({
  required this.id,
- this.festId = 0,
+ this.festId,
  this.name,
  this.abbreviation,
  this.currYear,
@@ -26,10 +26,23 @@ class Course {
  this.currentAverage,
  });
 
- factory Course.fromJson(Map<String, dynamic> json) => _$CourseFromJson(json);
+ factory Course.fromJson(Map<String, dynamic> json) {
+ return Course(
+ id: json['cur_id'] as int,
+ festId: json['fest_id'] as int?,
+ name: json['cur_nome'] as String?,
+ abbreviation: json['abbreviation'] as String?,
+ currYear: json['ano_curricular'] as String?,
+ firstEnrollment: json['fest_a_lect_1_insc'] as int?,
+ state: json['state'] as String?,
+ faculty: json['inst_sigla'].toString().toLowerCase(),
+ finishedEcts: json['finishedEcts'] as num?,
+ currentAverage: json['currentAverage'] as num?,
+ );
+ }
  @JsonKey(name: 'cur_id')
  final int id;
- @JsonKey(name: 'fest_id')
+ @JsonKey(name: 'fest_id ')
  final int? festId;
  @JsonKey(name: 'cur_nome')
  final String? name;

uni/lib/model/entities/course_units/course_unit.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'course_unit.g.dart';
+part '../../../generated/model/entities/course_units/course_unit.g.dart';
 
 /// Stores information about a course unit.
 @JsonSerializable()

uni/lib/model/entities/exam.dart

@@ -3,40 +3,8 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:logger/logger.dart';
 import 'package:uni/model/entities/app_locale.dart';
 
-part 'exam.g.dart';
+part '../../generated/model/entities/exam.g.dart';
 
-enum WeekDays {
- monday('Segunda'),
- tuesday('Terça'),
- wednesday('Quarta'),
- thursday('Quinta'),
- friday('Sexta'),
- saturday('Sábado'),
- sunday('Domingo');
-
- const WeekDays(this.day);
-
- final String day;
-}
-
-enum Months {
- january('janeiro'),
- february('fevereiro'),
- march('março'),
- april('abril'),
- may('maio'),
- june('junho'),
- july('julho'),
- august('agosto'),
- september('setembro'),
- october('outubro'),
- november('novembro'),
- december('dezembro');
-
- const Months(this.month);
-
- final String month;
-}
 
 class DateTimeConverter extends JsonConverter<DateTime, String> {
  const DateTimeConverter();

uni/lib/model/entities/lecture.dart

@@ -1,7 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:logger/logger.dart';
 
-part 'lecture.g.dart';
+part '../../generated/model/entities/lecture.g.dart';
+
 
 class DateTimeConverter extends JsonConverter<DateTime, String> {
  const DateTimeConverter();
@@ -73,21 +74,19 @@ class Lecture {
  String classNumber,
  int occurrId,
  ) {
- final startTimeHours = int.parse(startTimeString.substring(0, 2));
- final startTimeMinutes = int.parse(startTimeString.substring(3, 5));
- final endTimeHours =
- (startTimeMinutes + (blocks * 30)) ~/ 60 + startTimeHours;
- final endTimeMinutes = (startTimeMinutes + (blocks * 30)) % 60;
+ final startTimeList = startTimeString.split(':');
+ final startTime = day.add(
+ Duration(
+ hours: int.parse(startTimeList[0]),
+ minutes: int.parse(startTimeList[1]),
+ ),
+ );
+ final endTime = startTime.add(Duration(minutes: 30 * blocks));
  return Lecture(
  subject,
  typeClass,
- day.add(Duration(hours: startTimeHours, minutes: startTimeMinutes)),
- day.add(
- Duration(
- hours: startTimeMinutes + endTimeHours,
- minutes: startTimeMinutes + endTimeMinutes,
- ),
- ),
+ startTime,
+ endTime,
  blocks,
  room,
  teacher,

uni/lib/model/entities/library_occupation.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 
 import 'package:json_annotation/json_annotation.dart';
 
-part 'library_occupation.g.dart';
+part '../../generated/model/entities/library_occupation.g.dart';
 
 /// Overall occupation of the library
 @JsonSerializable()

uni/lib/model/entities/location_group.dart

@@ -3,7 +3,7 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:uni/model/entities/location.dart';
 
-part 'location_group.g.dart';
+part '../../generated/model/entities/location_group.g.dart';
 
 /// Store information about a location marker.
 /// What's located in each floor, like vending machines, rooms, etc...

uni/lib/model/entities/meal.dart

@@ -2,7 +2,8 @@ import 'package:intl/intl.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uni/model/utils/day_of_week.dart';
 
-part 'meal.g.dart';
+part '../../generated/model/entities/meal.g.dart';
+
 
 class DateTimeConverter extends JsonConverter<DateTime, String> {
  const DateTimeConverter();

uni/lib/model/entities/reference.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'reference.g.dart';
+part '../../generated/model/entities/reference.g.dart';
 
 class DateTimeConverter extends JsonConverter<DateTime, String> {
  const DateTimeConverter();