fix: runtime fixes for service model and paginated responses
- Service.fromJson: string status/location enums, ISO8601 time parsing, additional_address field name
- _loadServices: unwrap {data:[...]} paginated response; extract embedded user from response instead of extra API calls
- calendar_services_provider: same response unwrap; fallback user when not embedded
- Add ProState import where needed
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
0ecca498ad
commit
a4a6099722
+33
-11
@@ -41,7 +41,22 @@ class Service {
|
||||
required this.location,
|
||||
});
|
||||
|
||||
static const _statusMap = {
|
||||
'pending': 0, 'accepted': 1, 'denied': 2, 'active': 3,
|
||||
'cancelled': 4, 'completed': 5, 'self_booked': 6,
|
||||
};
|
||||
|
||||
static Service fromJson(Map<String, dynamic> doc, String id) {
|
||||
final rawStatus = doc['status'];
|
||||
final statusInt = rawStatus is int ? rawStatus
|
||||
: rawStatus is String ? (_statusMap[rawStatus] ?? 0)
|
||||
: (rawStatus as num?)?.toInt() ?? 0;
|
||||
|
||||
final rawLoc = doc['location_preference'] ?? doc['location'];
|
||||
final locInt = rawLoc == 'delivery' ? 1
|
||||
: rawLoc == 'office' ? 0
|
||||
: (rawLoc as num?)?.toInt() ?? 0;
|
||||
|
||||
return Service(
|
||||
id: id,
|
||||
professionalId: doc['professional_id'] as String,
|
||||
@@ -49,17 +64,27 @@ class Service {
|
||||
userId: doc['user_id'] as String,
|
||||
userScored: doc['user_scored'] as bool? ?? false,
|
||||
address: doc['address'] as String? ?? '',
|
||||
aditionalAddress: doc['aditional_address'] as String? ?? '',
|
||||
aditionalAddress: (doc['additional_address'] ?? doc['aditional_address']) as String? ?? '',
|
||||
latitude: (doc['latitude'] as num?)?.toDouble() ?? 0.0,
|
||||
longitude: (doc['longitude'] as num?)?.toDouble() ?? 0.0,
|
||||
day: doc['day'] as String? ?? '',
|
||||
day: doc['day']?.toString() ?? '',
|
||||
createdAt: doc['created_at']?.toString() ?? '',
|
||||
description: doc['description'] as String? ?? '',
|
||||
range1Hour1: parseTimeOfDay(doc['range1_hour1'] as String? ?? '0:0'),
|
||||
range1Hour2: parseTimeOfDay(doc['range1_hour2'] as String? ?? '0:0'),
|
||||
status: intToEnumService((doc['status'] as num?)?.toInt() ?? 0),
|
||||
rate: doc['rate'] as String? ?? '',
|
||||
location: intToEnum((doc['location'] as num?)?.toInt() ?? 0),
|
||||
range1Hour1: _parseTime(doc['range1_hour1']?.toString() ?? '0:0'),
|
||||
range1Hour2: _parseTime(doc['range1_hour2']?.toString() ?? '0:0'),
|
||||
status: intToEnumService(statusInt),
|
||||
rate: doc['rate']?.toString() ?? '',
|
||||
location: intToEnum(locInt),
|
||||
);
|
||||
}
|
||||
|
||||
static TimeOfDay _parseTime(String t) {
|
||||
// Handle ISO8601 (e.g. "1970-01-01T08:30:00.000Z") or "H:M"
|
||||
final s = t.contains('T') ? t.split('T')[1] : t;
|
||||
final parts = s.split(':');
|
||||
return TimeOfDay(
|
||||
hour: int.tryParse(parts[0]) ?? 0,
|
||||
minute: int.tryParse(parts.length > 1 ? parts[1] : '0') ?? 0,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -85,10 +110,7 @@ class Service {
|
||||
};
|
||||
}
|
||||
|
||||
static TimeOfDay parseTimeOfDay(String timeString) {
|
||||
final parts = timeString.split(':');
|
||||
return TimeOfDay(hour: int.parse(parts[0]), minute: int.parse(parts[1]));
|
||||
}
|
||||
static TimeOfDay parseTimeOfDay(String timeString) => _parseTime(timeString);
|
||||
|
||||
String? formatTimeOfDay(TimeOfDay? time) {
|
||||
if (time != null) return '${time.hour}:${time.minute}';
|
||||
|
||||
Reference in New Issue
Block a user