Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 21 additions & 7 deletions lib/models/menu_model.dart
Original file line number Diff line number Diff line change
@@ -1,24 +1,38 @@
// 1. 최상위 응답 모델
class MenuResponse {
final String date;
final String school;
final List<Cafeteria> cafeterias;
final School schools;

MenuResponse({
required this.date,
required this.school,
required this.cafeterias,
required this.schools,
});

factory MenuResponse.fromJson(Map<String, dynamic> json) {
return MenuResponse(
date: json['date'],
schools: School.fromJson(json['schools']),
);
}
}

class School {
final String schoolName;
final List<Cafeteria> cafeterias;

School({
required this.schoolName,
required this.cafeterias,
});

factory School.fromJson(Map<String, dynamic> json) {
// 'cafeterias' 배열을 Cafeteria 객체 리스트로 변환
var cafeteriaList = (json['cafeterias'] as List)
.map((item) => Cafeteria.fromJson(item))
.toList();

return MenuResponse(
date: json['date'],
school: json['school'],
return School(
schoolName: json['schoolName'],
cafeterias: cafeteriaList,
);
}
Expand Down
3 changes: 2 additions & 1 deletion lib/repositories/meal_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ class MealRepository {
await isar.meals.filter().dateEqualTo(responseDate).deleteAll();

final newMeals = <Meal>[];
for (var cafeteria in response.cafeterias) {

for (var cafeteria in response.schools.cafeterias) {
final restaurant = await _getOrCreateRestaurant(cafeteria, isToday);
final meals = _createMealsFromCafeteria(
cafeteria,
Expand Down
5 changes: 4 additions & 1 deletion lib/services/menu_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ class MenuService {
String formattedDate =
'${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';

final response = await http.get(Uri.parse('$_baseUrl?date=$formattedDate'));
// TODO: 나중에 학교 선택에 따라 달라지게 처리 (임시로 인하대학교로 고정)
final response = await http.get(
Uri.parse('$_baseUrl?date=$formattedDate&school=인하대학교'),
);

if (response.statusCode == 200) {
// 성공하면, JSON 문자열을 Map<String, dynamic>으로 디코딩
Expand Down