feat: Refactor repositories and modules to remove FirebaseAuth dependency and utilize DataConnectService
This commit is contained in:
Achintha Isuru
@@ -1,4 +1,3 @@
|
||||
import 'package:firebase_auth/firebase_auth.dart' as firebase;
|
||||
import 'package:firebase_data_connect/firebase_data_connect.dart' as fdc;
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:krow_data_connect/krow_data_connect.dart' as dc;
|
||||
@@ -6,151 +5,132 @@ import 'package:krow_domain/krow_domain.dart' as domain;
|
||||
import '../../domain/repositories/i_view_orders_repository.dart';
|
||||
|
||||
/// Implementation of [IViewOrdersRepository] using Data Connect.
|
||||
class ViewOrdersRepositoryImpl
|
||||
with dc.DataErrorHandler
|
||||
implements IViewOrdersRepository {
|
||||
final firebase.FirebaseAuth _firebaseAuth;
|
||||
final dc.ExampleConnector _dataConnect;
|
||||
class ViewOrdersRepositoryImpl implements IViewOrdersRepository {
|
||||
final dc.DataConnectService _service;
|
||||
|
||||
ViewOrdersRepositoryImpl({
|
||||
required firebase.FirebaseAuth firebaseAuth,
|
||||
required dc.ExampleConnector dataConnect,
|
||||
}) : _firebaseAuth = firebaseAuth,
|
||||
_dataConnect = dataConnect;
|
||||
required dc.DataConnectService service,
|
||||
}) : _service = service;
|
||||
|
||||
@override
|
||||
Future<List<domain.OrderItem>> getOrdersForRange({
|
||||
required DateTime start,
|
||||
required DateTime end,
|
||||
}) async {
|
||||
final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
|
||||
if (businessId == null || businessId.isEmpty) {
|
||||
await _firebaseAuth.signOut();
|
||||
throw Exception('Business is missing. Please sign in again.');
|
||||
}
|
||||
|
||||
final fdc.Timestamp startTimestamp = _toTimestamp(_startOfDay(start));
|
||||
final fdc.Timestamp endTimestamp = _toTimestamp(_endOfDay(end));
|
||||
final fdc.QueryResult<dc.ListShiftRolesByBusinessAndDateRangeData,
|
||||
dc.ListShiftRolesByBusinessAndDateRangeVariables> result =
|
||||
await executeProtected(() => _dataConnect
|
||||
.listShiftRolesByBusinessAndDateRange(
|
||||
businessId: businessId,
|
||||
start: startTimestamp,
|
||||
end: endTimestamp,
|
||||
)
|
||||
.execute());
|
||||
print(
|
||||
'ViewOrders range start=${start.toIso8601String()} end=${end.toIso8601String()} shiftRoles=${result.data.shiftRoles.length}',
|
||||
);
|
||||
|
||||
final String businessName =
|
||||
dc.ClientSessionStore.instance.session?.business?.businessName ??
|
||||
'Your Company';
|
||||
|
||||
return result.data.shiftRoles.map((dc.ListShiftRolesByBusinessAndDateRangeShiftRoles shiftRole) {
|
||||
final DateTime? shiftDate = shiftRole.shift.date?.toDateTime().toLocal();
|
||||
final String dateStr = shiftDate == null
|
||||
? ''
|
||||
: DateFormat('yyyy-MM-dd').format(shiftDate);
|
||||
final String startTime = _formatTime(shiftRole.startTime);
|
||||
final String endTime = _formatTime(shiftRole.endTime);
|
||||
final int filled = shiftRole.assigned ?? 0;
|
||||
final int workersNeeded = shiftRole.count;
|
||||
final double hours = shiftRole.hours ?? 0;
|
||||
final double totalValue = shiftRole.totalValue ?? 0;
|
||||
final double hourlyRate = _hourlyRate(shiftRole.totalValue, shiftRole.hours);
|
||||
// final String status = filled >= workersNeeded ? 'filled' : 'open';
|
||||
final String status = shiftRole.shift.status?.stringValue ?? 'OPEN';
|
||||
return _service.run(() async {
|
||||
final String businessId = await _service.getBusinessId();
|
||||
|
||||
final fdc.Timestamp startTimestamp = _service.toTimestamp(_startOfDay(start));
|
||||
final fdc.Timestamp endTimestamp = _service.toTimestamp(_endOfDay(end));
|
||||
final fdc.QueryResult<dc.ListShiftRolesByBusinessAndDateRangeData,
|
||||
dc.ListShiftRolesByBusinessAndDateRangeVariables> result =
|
||||
await _service.connector
|
||||
.listShiftRolesByBusinessAndDateRange(
|
||||
businessId: businessId,
|
||||
start: startTimestamp,
|
||||
end: endTimestamp,
|
||||
)
|
||||
.execute();
|
||||
print(
|
||||
'ViewOrders item: date=$dateStr status=$status shiftId=${shiftRole.shiftId} '
|
||||
'roleId=${shiftRole.roleId} start=${shiftRole.startTime?.toJson()} '
|
||||
'end=${shiftRole.endTime?.toJson()} hours=$hours totalValue=$totalValue',
|
||||
'ViewOrders range start=${start.toIso8601String()} end=${end.toIso8601String()} shiftRoles=${result.data.shiftRoles.length}',
|
||||
);
|
||||
|
||||
final String eventName =
|
||||
shiftRole.shift.order.eventName ?? shiftRole.shift.title;
|
||||
final String businessName =
|
||||
dc.ClientSessionStore.instance.session?.business?.businessName ?? 'Your Company';
|
||||
|
||||
return domain.OrderItem(
|
||||
id: _shiftRoleKey(shiftRole.shiftId, shiftRole.roleId),
|
||||
orderId: shiftRole.shift.order.id,
|
||||
title: '${shiftRole.role.name} - $eventName',
|
||||
clientName: businessName,
|
||||
status: status,
|
||||
date: dateStr,
|
||||
startTime: startTime,
|
||||
endTime: endTime,
|
||||
location: shiftRole.shift.location ?? '',
|
||||
locationAddress: shiftRole.shift.locationAddress ?? '',
|
||||
filled: filled,
|
||||
workersNeeded: workersNeeded,
|
||||
hourlyRate: hourlyRate,
|
||||
hours: hours,
|
||||
totalValue: totalValue,
|
||||
confirmedApps: const <Map<String, dynamic>>[],
|
||||
);
|
||||
}).toList();
|
||||
return result.data.shiftRoles.map((dc.ListShiftRolesByBusinessAndDateRangeShiftRoles shiftRole) {
|
||||
final DateTime? shiftDate = shiftRole.shift.date?.toDateTime().toLocal();
|
||||
final String dateStr = shiftDate == null ? '' : DateFormat('yyyy-MM-dd').format(shiftDate);
|
||||
final String startTime = _formatTime(shiftRole.startTime);
|
||||
final String endTime = _formatTime(shiftRole.endTime);
|
||||
final int filled = shiftRole.assigned ?? 0;
|
||||
final int workersNeeded = shiftRole.count;
|
||||
final double hours = shiftRole.hours ?? 0;
|
||||
final double totalValue = shiftRole.totalValue ?? 0;
|
||||
final double hourlyRate = _hourlyRate(shiftRole.totalValue, shiftRole.hours);
|
||||
// final String status = filled >= workersNeeded ? 'filled' : 'open';
|
||||
final String status = shiftRole.shift.status?.stringValue ?? 'OPEN';
|
||||
|
||||
print(
|
||||
'ViewOrders item: date=$dateStr status=$status shiftId=${shiftRole.shiftId} '
|
||||
'roleId=${shiftRole.roleId} start=${shiftRole.startTime?.toJson()} '
|
||||
'end=${shiftRole.endTime?.toJson()} hours=$hours totalValue=$totalValue',
|
||||
);
|
||||
|
||||
final String eventName = shiftRole.shift.order.eventName ?? shiftRole.shift.title;
|
||||
|
||||
return domain.OrderItem(
|
||||
id: _shiftRoleKey(shiftRole.shiftId, shiftRole.roleId),
|
||||
orderId: shiftRole.shift.order.id,
|
||||
title: '${shiftRole.role.name} - $eventName',
|
||||
clientName: businessName,
|
||||
status: status,
|
||||
date: dateStr,
|
||||
startTime: startTime,
|
||||
endTime: endTime,
|
||||
location: shiftRole.shift.location ?? '',
|
||||
locationAddress: shiftRole.shift.locationAddress ?? '',
|
||||
filled: filled,
|
||||
workersNeeded: workersNeeded,
|
||||
hourlyRate: hourlyRate,
|
||||
hours: hours,
|
||||
totalValue: totalValue,
|
||||
confirmedApps: const <Map<String, dynamic>>[],
|
||||
);
|
||||
}).toList();
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Map<String, List<Map<String, dynamic>>>> getAcceptedApplicationsForDay(
|
||||
DateTime day,
|
||||
) async {
|
||||
final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
|
||||
if (businessId == null || businessId.isEmpty) {
|
||||
await _firebaseAuth.signOut();
|
||||
throw Exception('Business is missing. Please sign in again.');
|
||||
}
|
||||
return _service.run(() async {
|
||||
final String businessId = await _service.getBusinessId();
|
||||
|
||||
final fdc.Timestamp dayStart = _toTimestamp(_startOfDay(day));
|
||||
final fdc.Timestamp dayEnd = _toTimestamp(_endOfDay(day));
|
||||
final fdc.QueryResult<dc.ListAcceptedApplicationsByBusinessForDayData,
|
||||
dc.ListAcceptedApplicationsByBusinessForDayVariables> result =
|
||||
await executeProtected(() => _dataConnect
|
||||
.listAcceptedApplicationsByBusinessForDay(
|
||||
businessId: businessId,
|
||||
dayStart: dayStart,
|
||||
dayEnd: dayEnd,
|
||||
)
|
||||
.execute());
|
||||
final fdc.Timestamp dayStart = _service.toTimestamp(_startOfDay(day));
|
||||
final fdc.Timestamp dayEnd = _service.toTimestamp(_endOfDay(day));
|
||||
final fdc.QueryResult<dc.ListAcceptedApplicationsByBusinessForDayData,
|
||||
dc.ListAcceptedApplicationsByBusinessForDayVariables> result =
|
||||
await _service.connector
|
||||
.listAcceptedApplicationsByBusinessForDay(
|
||||
businessId: businessId,
|
||||
dayStart: dayStart,
|
||||
dayEnd: dayEnd,
|
||||
)
|
||||
.execute();
|
||||
|
||||
print(
|
||||
'ViewOrders day=${day.toIso8601String()} applications=${result.data.applications.length}',
|
||||
);
|
||||
|
||||
final Map<String, List<Map<String, dynamic>>> grouped = <String, List<Map<String, dynamic>>>{};
|
||||
for (final dc.ListAcceptedApplicationsByBusinessForDayApplications application in result.data.applications) {
|
||||
print(
|
||||
'ViewOrders app: shiftId=${application.shiftId} roleId=${application.roleId} '
|
||||
'checkIn=${application.checkInTime?.toJson()} checkOut=${application.checkOutTime?.toJson()}',
|
||||
'ViewOrders day=${day.toIso8601String()} applications=${result.data.applications.length}',
|
||||
);
|
||||
final String key = _shiftRoleKey(application.shiftId, application.roleId);
|
||||
grouped.putIfAbsent(key, () => <Map<String, dynamic>>[]);
|
||||
grouped[key]!.add(<String, dynamic>{
|
||||
'id': application.id,
|
||||
'worker_id': application.staff.id,
|
||||
'worker_name': application.staff.fullName,
|
||||
'status': 'confirmed',
|
||||
'photo_url': application.staff.photoUrl,
|
||||
'phone': application.staff.phone,
|
||||
'rating': application.staff.averageRating,
|
||||
});
|
||||
}
|
||||
return grouped;
|
||||
|
||||
final Map<String, List<Map<String, dynamic>>> grouped = <String, List<Map<String, dynamic>>>{};
|
||||
for (final dc.ListAcceptedApplicationsByBusinessForDayApplications application
|
||||
in result.data.applications) {
|
||||
print(
|
||||
'ViewOrders app: shiftId=${application.shiftId} roleId=${application.roleId} '
|
||||
'checkIn=${application.checkInTime?.toJson()} checkOut=${application.checkOutTime?.toJson()}',
|
||||
);
|
||||
final String key = _shiftRoleKey(application.shiftId, application.roleId);
|
||||
grouped.putIfAbsent(key, () => <Map<String, dynamic>>[]);
|
||||
grouped[key]!.add(<String, dynamic>{
|
||||
'id': application.id,
|
||||
'worker_id': application.staff.id,
|
||||
'worker_name': application.staff.fullName,
|
||||
'status': 'confirmed',
|
||||
'photo_url': application.staff.photoUrl,
|
||||
'phone': application.staff.phone,
|
||||
'rating': application.staff.averageRating,
|
||||
});
|
||||
}
|
||||
return grouped;
|
||||
});
|
||||
}
|
||||
|
||||
String _shiftRoleKey(String shiftId, String roleId) {
|
||||
return '$shiftId:$roleId';
|
||||
}
|
||||
|
||||
fdc.Timestamp _toTimestamp(DateTime dateTime) {
|
||||
final DateTime utc = dateTime.toUtc();
|
||||
final int seconds = utc.millisecondsSinceEpoch ~/ 1000;
|
||||
final int nanoseconds = (utc.microsecondsSinceEpoch % 1000000) * 1000;
|
||||
return fdc.Timestamp(nanoseconds, seconds);
|
||||
}
|
||||
|
||||
DateTime _startOfDay(DateTime dateTime) {
|
||||
return DateTime(dateTime.year, dateTime.month, dateTime.day);
|
||||
}
|
||||
|
||||
@@ -80,23 +80,6 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Formats the date string for display.
|
||||
String _formatDate({required String dateStr}) {
|
||||
try {
|
||||
final DateTime date = DateTime.parse(dateStr);
|
||||
final DateTime now = DateTime.now();
|
||||
final DateTime today = DateTime(now.year, now.month, now.day);
|
||||
final DateTime tomorrow = today.add(const Duration(days: 1));
|
||||
final DateTime checkDate = DateTime(date.year, date.month, date.day);
|
||||
|
||||
if (checkDate == today) return t.client_view_orders.card.today;
|
||||
if (checkDate == tomorrow) return t.client_view_orders.card.tomorrow;
|
||||
return DateFormat('EEE, MMM d').format(date);
|
||||
} catch (_) {
|
||||
return dateStr;
|
||||
}
|
||||
}
|
||||
|
||||
/// Formats the time string for display.
|
||||
String _formatTime({required String timeStr}) {
|
||||
if (timeStr.isEmpty) return '';
|
||||
@@ -829,10 +812,7 @@ class _OrderEditSheetState extends State<_OrderEditSheet> {
|
||||
final String dateText = orderDate == null
|
||||
? widget.order.date
|
||||
: DateFormat('yyyy-MM-dd').format(orderDate);
|
||||
final String location = firstShift.order.teamHub?.hubName ??
|
||||
firstShift.locationAddress ??
|
||||
firstShift.location ??
|
||||
widget.order.locationAddress;
|
||||
final String location = firstShift.order.teamHub.hubName;
|
||||
|
||||
_dateController.text = dateText;
|
||||
_globalLocationController.text = location;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_modular/flutter_modular.dart';
|
||||
import 'package:krow_data_connect/krow_data_connect.dart';
|
||||
import 'package:firebase_auth/firebase_auth.dart' as firebase;
|
||||
|
||||
import 'data/repositories/view_orders_repository_impl.dart';
|
||||
import 'domain/repositories/i_view_orders_repository.dart';
|
||||
@@ -21,24 +20,14 @@ class ViewOrdersModule extends Module {
|
||||
@override
|
||||
void binds(Injector i) {
|
||||
// Repositories
|
||||
i.add<IViewOrdersRepository>(
|
||||
() => ViewOrdersRepositoryImpl(
|
||||
firebaseAuth: firebase.FirebaseAuth.instance,
|
||||
dataConnect: ExampleConnector.instance,
|
||||
),
|
||||
);
|
||||
i.add<IViewOrdersRepository>(ViewOrdersRepositoryImpl.new);
|
||||
|
||||
// UseCases
|
||||
i.add(GetOrdersUseCase.new);
|
||||
i.add(GetAcceptedApplicationsForDayUseCase.new);
|
||||
|
||||
// BLoCs
|
||||
i.add(
|
||||
() => ViewOrdersCubit(
|
||||
getOrdersUseCase: i.get<GetOrdersUseCase>(),
|
||||
getAcceptedAppsUseCase: i.get<GetAcceptedApplicationsForDayUseCase>(),
|
||||
),
|
||||
);
|
||||
i.add(ViewOrdersCubit.new);
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
Reference in New Issue
Block a user