fix: port 7 web features and repair the endless-loading screens
Root cause behind most "stuck loading" reports: the backend changed shape (schedules became an array, location_preferences a string) while the mobile parser still hard-cast to Map/int. The TypeError was swallowed by a silent catch that returned null, and screens only handled the success state, so a parse failure rendered as a permanent spinner. Same class of bug appeared across service lists via non-null map lookups and a total absence of request timeouts. Ported from prosappweb: - in-app suggestions (POST /suggestions) - policies/terms from GET /settings/policies - configurable appointment length (slot_duration_minutes) - block/unblock calendar slots (POST /services/block) - GPS city detection on the profile (Nominatim) - server-side professional search with haversine distance - retry cooldown after a rejected professional application Reliability: - parse schedules array (day_of_week 0=Mon) and string location_preferences - read times as wall clock, so 08:00 stays 08:00 across timezones - carry minutes into hours in TimeOfDay.add; a minute-based step used to loop forever and freeze the calendar (covered by test/time_slots_test.dart) - semver update check instead of string equality, which blocked every build that did not exactly match the configured version - request timeouts across all repositories - surface HTTP >= 400 instead of reporting failed writes as success - error states with retry instead of an indefinite shimmer Includes pre-existing uncommitted work from the UI redesign. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
06a89df690
commit
8631e6f729
@@ -1 +1,2 @@
|
||||
export '/src/entities/setting_entity.dart';
|
||||
export '/src/entities/policies_entity.dart';
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
class PoliciesEntity extends Equatable {
|
||||
final String privacy;
|
||||
final String terms;
|
||||
|
||||
const PoliciesEntity({
|
||||
required this.privacy,
|
||||
required this.terms,
|
||||
});
|
||||
|
||||
static PoliciesEntity fromDocument(Map<String, dynamic> doc) {
|
||||
return PoliciesEntity(
|
||||
privacy: doc['privacy'] as String? ?? '',
|
||||
terms: doc['terms'] as String? ?? '',
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => [privacy, terms];
|
||||
}
|
||||
@@ -19,6 +19,7 @@ class SettingEntity extends Equatable {
|
||||
final String? terminosCondiciones;
|
||||
final String? terminosCondicionesTitle;
|
||||
final String? terminosCondicionesBody;
|
||||
final num? rejectionWaitDays;
|
||||
|
||||
const SettingEntity({
|
||||
required this.tarifas,
|
||||
@@ -39,6 +40,7 @@ class SettingEntity extends Equatable {
|
||||
required this.terminosCondiciones,
|
||||
required this.terminosCondicionesTitle,
|
||||
required this.terminosCondicionesBody,
|
||||
this.rejectionWaitDays,
|
||||
});
|
||||
|
||||
static SettingEntity fromDocument(Map<String, dynamic> doc) {
|
||||
@@ -61,6 +63,7 @@ class SettingEntity extends Equatable {
|
||||
terminosCondiciones: doc['terminos_condiciones'] as String?,
|
||||
terminosCondicionesTitle: doc['terminos_condiciones_title'] as String?,
|
||||
terminosCondicionesBody: doc['terminos_condiciones_body'] as String?,
|
||||
rejectionWaitDays: doc['rejection_wait_days'] as num?,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -84,6 +87,7 @@ class SettingEntity extends Equatable {
|
||||
terminosCondiciones,
|
||||
terminosCondicionesTitle,
|
||||
terminosCondicionesBody,
|
||||
rejectionWaitDays,
|
||||
];
|
||||
|
||||
@override
|
||||
|
||||
@@ -5,6 +5,8 @@ import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:setting_repository/src/entities/entities.dart';
|
||||
import 'package:setting_repository/src/repositories/setting_repo.dart';
|
||||
|
||||
const _kHttpTimeout = Duration(seconds: 20);
|
||||
|
||||
const _base = 'https://backend.prosapp.co/api/v1';
|
||||
|
||||
class ApiSettingRepository implements SettingRepository {
|
||||
@@ -27,22 +29,29 @@ class ApiSettingRepository implements SettingRepository {
|
||||
final res = await http.get(
|
||||
Uri.parse('$_base/settings'),
|
||||
headers: await _headers(),
|
||||
);
|
||||
final data = jsonDecode(res.body);
|
||||
).timeout(_kHttpTimeout);
|
||||
final data = jsonDecode(res.body) as Map<String, dynamic>;
|
||||
|
||||
// Backend returns {key: string, value: any}[] or a flat map
|
||||
Map<String, dynamic> doc = {};
|
||||
if (data is List) {
|
||||
for (final entry in data) {
|
||||
if (entry is Map) {
|
||||
final key = entry['key']?.toString();
|
||||
final value = entry['value'];
|
||||
if (key != null) doc[key] = value;
|
||||
}
|
||||
}
|
||||
} else if (data is Map) {
|
||||
doc = Map<String, dynamic>.from(data);
|
||||
}
|
||||
// Backend returns nested structure: {version: {android, ios}, soporte: {...}, politicas: {...}}
|
||||
final version = data['version'] as Map<String, dynamic>? ?? {};
|
||||
final soporte = data['soporte'] as Map<String, dynamic>? ?? {};
|
||||
final politicas = data['politicas'] as Map<String, dynamic>? ?? {};
|
||||
|
||||
final doc = <String, dynamic>{
|
||||
'version_android': version['android'],
|
||||
'version_ios': version['ios'],
|
||||
'titulo_soporte': soporte['titulo'] ?? data['support_title'],
|
||||
'parrafo_soporte': soporte['descripcion'] ??
|
||||
soporte['parrafo'] ??
|
||||
data['support_description'],
|
||||
'email_soporte': soporte['email'] ?? data['support_email'],
|
||||
'numero_soporte': soporte['telefono'] ?? data['support_phone'],
|
||||
'dias_soporte': soporte['dias'] ?? data['support_days'],
|
||||
'horas_soporte': soporte['horas'] ?? data['support_hours'],
|
||||
'politicas_privacidad_title': politicas['titulo'],
|
||||
'politicas_privacidad_body': politicas['body'],
|
||||
'rejection_wait_days': data['rejection_wait_days'],
|
||||
};
|
||||
|
||||
return SettingEntity.fromDocument(doc);
|
||||
} catch (_) {
|
||||
@@ -69,4 +78,14 @@ class ApiSettingRepository implements SettingRepository {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<PoliciesEntity> getPolicies() async {
|
||||
final res = await http.get(
|
||||
Uri.parse('$_base/settings/policies'),
|
||||
headers: await _headers(),
|
||||
).timeout(_kHttpTimeout);
|
||||
final data = jsonDecode(res.body) as Map<String, dynamic>;
|
||||
return PoliciesEntity.fromDocument(data);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,4 +2,5 @@ import 'package:setting_repository/src/entities/entities.dart';
|
||||
|
||||
abstract class SettingRepository {
|
||||
Future<SettingEntity> getSettings();
|
||||
Future<PoliciesEntity> getPolicies();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user