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
@@ -22,6 +22,9 @@ class ProfessionalBloc extends Bloc<ProfessionalEvent, ProfessionalState> {
|
||||
bool isProModeActive = _professionalRepository.isProModeActive;
|
||||
final proInfo = _professionalRepository.lastProInfo();
|
||||
emit(LoadedModeProState(isProModeActive, proInfo));
|
||||
if (isProModeActive && proInfo == null) {
|
||||
_fetchMyProInfo();
|
||||
}
|
||||
|
||||
_professionalRepository.streamProInfo().listen((proInfo) {
|
||||
if (proInfo == null) {
|
||||
@@ -40,14 +43,33 @@ class ProfessionalBloc extends Bloc<ProfessionalEvent, ProfessionalState> {
|
||||
await _professionalRepository.switchProMode();
|
||||
});
|
||||
|
||||
on<ResetProfessionalApplicationEvent>((event, emit) async {
|
||||
emit(ResetProfessionalApplicationLoading());
|
||||
try {
|
||||
await _professionalRepository.deleteProfessionalInfo();
|
||||
emit(ResetProfessionalApplicationSuccess());
|
||||
} catch (e) {
|
||||
log(e.toString());
|
||||
emit(ProfessionalStateFailure(message: e.toString()));
|
||||
}
|
||||
});
|
||||
|
||||
on<UpdateProfessionalEvent>((event, emit) async {
|
||||
final proInfo = _professionalRepository.lastProInfo();
|
||||
emit(LoadedModeProState(event.isProModeActive, proInfo));
|
||||
if (event.isProModeActive && proInfo == null) {
|
||||
await _fetchMyProInfo();
|
||||
}
|
||||
});
|
||||
|
||||
on<SendProfessionalToReviewEvent>((event, emit) async {
|
||||
emit(SendProfessionalToReviewLoading());
|
||||
final myUser = await _userRepository.lastUser();
|
||||
if (myUser == null) return;
|
||||
if (myUser == null) {
|
||||
emit(const SendProfessionalToReviewFailure(
|
||||
message: 'No se pudo identificar tu usuario'));
|
||||
return;
|
||||
}
|
||||
try {
|
||||
final identificationPdfUrl = await _professionalRepository
|
||||
.uploadPdfCedula(event.identificationPicture, myUser.id);
|
||||
@@ -83,10 +105,18 @@ class ProfessionalBloc extends Bloc<ProfessionalEvent, ProfessionalState> {
|
||||
schedules: Schedules.empty,
|
||||
paymentMethods: PaymentMethodEntity.empty,
|
||||
));
|
||||
|
||||
emit(SendProfessionalToReviewSuccess());
|
||||
} catch (e) {
|
||||
log('error acceso a pro ${e.toString()}');
|
||||
emit(SendProfessionalToReviewFailure(message: e.toString()));
|
||||
}
|
||||
// _userRepository.updateUserInfo(myUser.copyWith(proState: ProState.pending));
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _fetchMyProInfo() async {
|
||||
final myUser = await _userRepository.lastUser();
|
||||
if (myUser == null) return;
|
||||
await _professionalRepository.updateFromFirebase(userId: myUser.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,10 @@ class SwitchProModeEvent extends ProfessionalEvent {
|
||||
const SwitchProModeEvent();
|
||||
}
|
||||
|
||||
class ResetProfessionalApplicationEvent extends ProfessionalEvent {
|
||||
const ResetProfessionalApplicationEvent();
|
||||
}
|
||||
|
||||
class SendProfessionalToReviewEvent extends ProfessionalEvent {
|
||||
final String id;
|
||||
final String identification;
|
||||
|
||||
@@ -17,6 +17,23 @@ class ProfessionalStateFailure extends ProfessionalState {
|
||||
|
||||
class ProfessionalStateProcess extends ProfessionalState {}
|
||||
|
||||
class ResetProfessionalApplicationLoading extends ProfessionalState {}
|
||||
|
||||
class ResetProfessionalApplicationSuccess extends ProfessionalState {}
|
||||
|
||||
class SendProfessionalToReviewLoading extends ProfessionalState {}
|
||||
|
||||
class SendProfessionalToReviewSuccess extends ProfessionalState {}
|
||||
|
||||
class SendProfessionalToReviewFailure extends ProfessionalState {
|
||||
final String? message;
|
||||
|
||||
const SendProfessionalToReviewFailure({this.message});
|
||||
|
||||
@override
|
||||
List<Object?> get props => [message];
|
||||
}
|
||||
|
||||
class LoadedModeProState extends ProfessionalState {
|
||||
final bool isProModeActive;
|
||||
final ProfessionalEntity? proInfo;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:math' as math;
|
||||
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:professional_repository/professional_repository.dart';
|
||||
@@ -24,27 +26,76 @@ class ProfessionalListBloc
|
||||
emit(ProfessionalListLoading());
|
||||
final users = await _userRepository.getUsersProfessionalActive();
|
||||
|
||||
final professionals =
|
||||
await _firebaseProfessionalRepository.getProfessionalInfo();
|
||||
final hasSearchParams = event.search != null ||
|
||||
event.city != null ||
|
||||
event.lat != null ||
|
||||
event.lng != null;
|
||||
|
||||
final professionalInfoMap = {for (var doc in professionals) doc.id: doc};
|
||||
if (!hasSearchParams) {
|
||||
final professionals =
|
||||
await _firebaseProfessionalRepository.getProfessionalInfo();
|
||||
|
||||
final usersMap = users
|
||||
.map((user) => UserProfessional(
|
||||
myUser: user,
|
||||
professionalInfo: professionalInfoMap[user.id]!,
|
||||
final professionalInfoMap = {for (var doc in professionals) doc.id: doc};
|
||||
|
||||
final usersMap = users
|
||||
.where((user) => professionalInfoMap.containsKey(user.id))
|
||||
.map((user) => UserProfessional(
|
||||
myUser: user,
|
||||
professionalInfo: professionalInfoMap[user.id]!,
|
||||
))
|
||||
.toList();
|
||||
|
||||
emit(ProfessionalListSuccess(users: usersMap));
|
||||
return;
|
||||
}
|
||||
|
||||
final usersDir = {for (var u in users) u.id: u};
|
||||
|
||||
final professionals = await _firebaseProfessionalRepository.searchProfessionals(
|
||||
search: event.search,
|
||||
city: event.city,
|
||||
lat: event.lat,
|
||||
lng: event.lng,
|
||||
);
|
||||
|
||||
final usersMap = professionals
|
||||
.where((p) => usersDir.containsKey(p.id))
|
||||
.map((p) => UserProfessional(
|
||||
myUser: usersDir[p.id]!,
|
||||
professionalInfo: p,
|
||||
distanceKm: (event.lat != null && event.lng != null)
|
||||
? _haversineKm(event.lat!, event.lng!, p.latitude, p.longitude)
|
||||
: null,
|
||||
))
|
||||
.toList();
|
||||
|
||||
emit(ProfessionalListSuccess(users: usersMap));
|
||||
}
|
||||
|
||||
double? _haversineKm(double lat1, double lng1, double lat2, double lng2) {
|
||||
if (lat2 == 0.0 && lng2 == 0.0) return null;
|
||||
const r = 6371.0;
|
||||
final dLat = (lat2 - lat1) * math.pi / 180;
|
||||
final dLng = (lng2 - lng1) * math.pi / 180;
|
||||
final a = math.sin(dLat / 2) * math.sin(dLat / 2) +
|
||||
math.cos(lat1 * math.pi / 180) *
|
||||
math.cos(lat2 * math.pi / 180) *
|
||||
math.sin(dLng / 2) *
|
||||
math.sin(dLng / 2);
|
||||
return r * 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a));
|
||||
}
|
||||
}
|
||||
|
||||
class UserProfessional {
|
||||
final MyUser myUser;
|
||||
final ProfessionalEntity professionalInfo;
|
||||
final double? distanceKm;
|
||||
|
||||
UserProfessional({required this.myUser, required this.professionalInfo});
|
||||
UserProfessional({
|
||||
required this.myUser,
|
||||
required this.professionalInfo,
|
||||
this.distanceKm,
|
||||
});
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
|
||||
@@ -8,8 +8,18 @@ abstract class ProfessionalListEvent extends Equatable {
|
||||
}
|
||||
|
||||
class ProfessionalListFetch extends ProfessionalListEvent {
|
||||
const ProfessionalListFetch();
|
||||
final String? search;
|
||||
final String? city;
|
||||
final double? lat;
|
||||
final double? lng;
|
||||
|
||||
const ProfessionalListFetch({this.search, this.city, this.lat, this.lng});
|
||||
|
||||
@override
|
||||
List<Object> get props => [];
|
||||
List<Object> get props => [
|
||||
search ?? '',
|
||||
city ?? '',
|
||||
lat ?? 0,
|
||||
lng ?? 0,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ class ProfessionalProfileBloc
|
||||
event.longitude,
|
||||
event.schedules,
|
||||
event.paymentMethods,
|
||||
slotDurationMinutes: event.slotDurationMinutes,
|
||||
);
|
||||
|
||||
emit(const UpdateProfessionalInfoSuccess());
|
||||
|
||||
@@ -28,6 +28,7 @@ class UpdateProfessionalProfileInfo extends ProfessionalProfileEvent {
|
||||
final double longitude;
|
||||
final Schedules schedules;
|
||||
final PaymentMethodEntity paymentMethods;
|
||||
final int slotDurationMinutes;
|
||||
|
||||
const UpdateProfessionalProfileInfo({
|
||||
required this.address,
|
||||
@@ -39,6 +40,7 @@ class UpdateProfessionalProfileInfo extends ProfessionalProfileEvent {
|
||||
required this.longitude,
|
||||
required this.schedules,
|
||||
required this.paymentMethods,
|
||||
this.slotDurationMinutes = 120,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -51,6 +53,7 @@ class UpdateProfessionalProfileInfo extends ProfessionalProfileEvent {
|
||||
latitude,
|
||||
longitude,
|
||||
schedules,
|
||||
paymentMethods
|
||||
paymentMethods,
|
||||
slotDurationMinutes,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
_professionalRepository = professionRepository,
|
||||
super(CreateServiceInitial()) {
|
||||
on<CreateService>(_onCreateService);
|
||||
on<BlockSlot>(_onBlockSlot);
|
||||
on<LoadService>(_onLoadService);
|
||||
on<UpdateServiceStatus>(_onUpdateServiceStatus);
|
||||
on<LoadServicesForUser>(_onLoadServicesForUser);
|
||||
@@ -72,6 +73,17 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
}
|
||||
}
|
||||
|
||||
void _onBlockSlot(BlockSlot event, Emitter<ServiceState> emit) async {
|
||||
try {
|
||||
emit(CreateServiceLoading());
|
||||
final serviceId = await _serviceRepository.blockSlot(event.day, event.hour1);
|
||||
emit(CreateServiceSuccess(serviceId));
|
||||
} catch (e) {
|
||||
log(e.toString());
|
||||
emit(CreateServiceFailure());
|
||||
}
|
||||
}
|
||||
|
||||
void _onLoadService(LoadService event, Emitter<ServiceState> emit) async {
|
||||
try {
|
||||
final serviceStream = _serviceRepository.getService(event.serviceId);
|
||||
@@ -108,7 +120,11 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
|
||||
final professionsDir = {for (var e in professionsList) e.id: e};
|
||||
|
||||
final servicesInfo = services.map((e) {
|
||||
final servicesInfo = services
|
||||
.where((e) =>
|
||||
usersDir.containsKey(e.professionalId) &&
|
||||
professionsDir.containsKey(e.professionalId))
|
||||
.map((e) {
|
||||
return ServiceInfoUI(
|
||||
service: e,
|
||||
user: usersDir[e.professionalId]!,
|
||||
@@ -141,7 +157,9 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
|
||||
final usersDir = {for (var e in users) e.id: e};
|
||||
|
||||
final servicesInfo = services.map((e) {
|
||||
final servicesInfo = services
|
||||
.where((e) => usersDir.containsKey(e.userId))
|
||||
.map((e) {
|
||||
return ServiceInfoUI(
|
||||
service: e,
|
||||
user: usersDir[e.userId]!,
|
||||
@@ -180,7 +198,11 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
|
||||
final professionsDir = {for (var e in professionsList) e.id: e};
|
||||
|
||||
final servicesInfo = services.map((e) {
|
||||
final servicesInfo = services
|
||||
.where((e) =>
|
||||
usersDir.containsKey(e.professionalId) &&
|
||||
professionsDir.containsKey(e.professionalId))
|
||||
.map((e) {
|
||||
return ServiceInfoUI(
|
||||
service: e,
|
||||
user: usersDir[e.professionalId]!,
|
||||
@@ -213,7 +235,9 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
|
||||
final usersDir = {for (var e in users) e.id: e};
|
||||
|
||||
final servicesInfo = services.map((e) {
|
||||
final servicesInfo = services
|
||||
.where((e) => usersDir.containsKey(e.userId))
|
||||
.map((e) {
|
||||
return ServiceInfoUI(
|
||||
service: e,
|
||||
user: usersDir[e.userId]!,
|
||||
@@ -246,7 +270,9 @@ class ServiceBloc extends Bloc<ServiceEvent, ServiceState> {
|
||||
|
||||
final usersDir = {for (var e in users) e.id: e};
|
||||
|
||||
final servicesInfo = services.map((e) {
|
||||
final servicesInfo = services
|
||||
.where((e) => usersDir.containsKey(e.userId))
|
||||
.map((e) {
|
||||
return ServiceInfoUI(
|
||||
service: e,
|
||||
user: usersDir[e.userId]!,
|
||||
|
||||
@@ -26,6 +26,16 @@ class UpdateServiceStatus extends ServiceEvent {
|
||||
List<Object> get props => [serviceId, newStatus];
|
||||
}
|
||||
|
||||
class BlockSlot extends ServiceEvent {
|
||||
final String day;
|
||||
final TimeOfDay hour1;
|
||||
|
||||
const BlockSlot({required this.day, required this.hour1});
|
||||
|
||||
@override
|
||||
List<Object> get props => [day, hour1];
|
||||
}
|
||||
|
||||
class LoadServicesForUser extends ServiceEvent {
|
||||
final String userId;
|
||||
|
||||
|
||||
@@ -22,7 +22,8 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
|
||||
await _userRepository.setUserData(user);
|
||||
emit(SignUpSuccess());
|
||||
} catch (e) {
|
||||
emit(SignUpFailure());
|
||||
final msg = e.toString().replaceFirst('Exception: ', '');
|
||||
emit(SignUpFailure(message: msg));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,12 @@ class SignUpInitial extends SignUpState {}
|
||||
|
||||
class SignUpSuccess extends SignUpState {}
|
||||
|
||||
class SignUpFailure extends SignUpState {}
|
||||
class SignUpFailure extends SignUpState {
|
||||
final String message;
|
||||
const SignUpFailure({this.message = 'Error al registrarse. Intenta de nuevo.'});
|
||||
|
||||
@override
|
||||
List<Object> get props => [message];
|
||||
}
|
||||
|
||||
class SignUpProcess extends SignUpState {}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import 'dart:developer';
|
||||
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:suggestion_repository/suggestion_repository.dart';
|
||||
|
||||
part 'suggestion_event.dart';
|
||||
part 'suggestion_state.dart';
|
||||
|
||||
class SuggestionBloc extends Bloc<SuggestionEvent, SuggestionState> {
|
||||
final ApiSuggestionRepository _suggestionRepository;
|
||||
|
||||
SuggestionBloc({required ApiSuggestionRepository suggestionRepository})
|
||||
: _suggestionRepository = suggestionRepository,
|
||||
super(SuggestionInitial()) {
|
||||
on<SubmitSuggestion>(_onSubmitSuggestion);
|
||||
}
|
||||
|
||||
void _onSubmitSuggestion(
|
||||
SubmitSuggestion event, Emitter<SuggestionState> emit) async {
|
||||
emit(SuggestionLoading());
|
||||
try {
|
||||
await _suggestionRepository.createSuggestion(event.message);
|
||||
emit(SuggestionSuccess());
|
||||
} catch (e) {
|
||||
log(e.toString());
|
||||
emit(SuggestionFailure(message: e.toString()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
part of 'suggestion_bloc.dart';
|
||||
|
||||
abstract class SuggestionEvent extends Equatable {
|
||||
const SuggestionEvent();
|
||||
|
||||
@override
|
||||
List<Object> get props => [];
|
||||
}
|
||||
|
||||
class SubmitSuggestion extends SuggestionEvent {
|
||||
final String message;
|
||||
|
||||
const SubmitSuggestion({required this.message});
|
||||
|
||||
@override
|
||||
List<Object> get props => [message];
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
part of 'suggestion_bloc.dart';
|
||||
|
||||
abstract class SuggestionState extends Equatable {
|
||||
const SuggestionState();
|
||||
|
||||
@override
|
||||
List<Object?> get props => [];
|
||||
}
|
||||
|
||||
class SuggestionInitial extends SuggestionState {}
|
||||
|
||||
class SuggestionLoading extends SuggestionState {}
|
||||
|
||||
class SuggestionSuccess extends SuggestionState {}
|
||||
|
||||
class SuggestionFailure extends SuggestionState {
|
||||
final String? message;
|
||||
|
||||
const SuggestionFailure({this.message});
|
||||
|
||||
@override
|
||||
List<Object?> get props => [message];
|
||||
}
|
||||
Reference in New Issue
Block a user