Hamza/saqel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Saqel Platform: 2026-09-08 18:55:21

Browse Source
This commit is contained in:
Hamza-Ayed
2026-09-08 18:55:21 +03:00
parent 9198a2f974
commit 590326baa0
6 changed files with 283 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin_app/lib/core/utils/app_logger.dart
+19 -9
View File
@@ -21,21 +21,25 @@ class AppLogger {
if (!kDebugMode) return;
final buffer = StringBuffer();
buffer.writeln('\n🌐 ─── [HTTP REQUEST (ADMIN)] ───────────────────────────────────');
buffer.writeln(
'\n🌐 ─── [HTTP REQUEST (ADMIN)] ───────────────────────────────────');
buffer.writeln('➡️ Method: $method');
buffer.writeln('🔗 URL: $uri');
if (headers != null && headers.isNotEmpty) {
final safeHeaders = Map<String, String>.from(headers);
if (safeHeaders.containsKey('Authorization')) {
final auth = safeHeaders['Authorization']!;
safeHeaders['Authorization'] = auth.length > 20 ? '${auth.substring(0, 15)}...' : 'Bearer [REDACTED]';
safeHeaders['Authorization'] = auth.length > 20
? '${auth.substring(0, 15)}...'
: 'Bearer [REDACTED]';
}
buffer.writeln('📋 Headers: ${jsonEncode(safeHeaders)}');
}
if (body != null) {
buffer.writeln('📦 Body: ${body is String ? body : jsonEncode(body)}');
}
buffer.writeln('───────────────────────────────────────────────────────────────');
buffer.writeln(
'───────────────────────────────────────────────────────────────');
debugPrint(buffer.toString());
}
@@ -52,24 +56,29 @@ class AppLogger {
final emoji = isSuccess ? '✅' : '⚠️';
final buffer = StringBuffer();
buffer.writeln('\n$emoji ─── [HTTP RESPONSE $statusCode (ADMIN)] ───────────────────────');
buffer.writeln(
'\n$emoji ─── [HTTP RESPONSE $statusCode (ADMIN)] ───────────────────────');
buffer.writeln('⬅️ Method: $method');
buffer.writeln('🔗 URL: $uri');
if (duration != null) {
buffer.writeln('⏱️ Time: ${duration.inMilliseconds}ms');
}
if (responseBody != null) {
buffer.writeln('📦 Data: ${responseBody is String ? responseBody : jsonEncode(responseBody)}');
buffer.writeln(
'📦 Data: ${responseBody is String ? responseBody : jsonEncode(responseBody)}');
}
buffer.writeln('───────────────────────────────────────────────────────────────');
buffer.writeln(
'───────────────────────────────────────────────────────────────');
debugPrint(buffer.toString());
}
static void error(String message, {dynamic error, StackTrace? stackTrace, String tag = 'ADMIN_ERROR'}) {
static void error(String message,
{dynamic error, StackTrace? stackTrace, String tag = 'ADMIN_ERROR'}) {
if (!kDebugMode) return;
final buffer = StringBuffer();
buffer.writeln('\n🚨 ─── [ERROR: $tag] ──────────────────────────────────────────');
buffer.writeln(
'\n🚨 ─── [ERROR: $tag] ──────────────────────────────────────────');
buffer.writeln('❌ Message: $message');
if (error != null) {
buffer.writeln('⚠️ Error: $error');
@@ -77,7 +86,8 @@ class AppLogger {
if (stackTrace != null) {
buffer.writeln('📍 Trace: \n$stackTrace');
}
buffer.writeln('───────────────────────────────────────────────────────────────');
buffer.writeln(
'───────────────────────────────────────────────────────────────');
debugPrint(buffer.toString());
}
}
apps/admin_app/lib/services/directorate_api_service.dart
+100 -56
View File
@@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
import '../core/services/storage_service.dart';
import '../core/utils/app_logger.dart';
import '../data/models/directorate_models.dart';
/// Authenticated API client for principals, supervisors, and directorates.
@@ -29,15 +30,25 @@ class DirectorateApiService {
}
static Map<String, dynamic> _decode(http.Response response) {
AppLogger.response(
method: response.request?.method ?? 'HTTP',
uri: response.request?.url ?? Uri.parse(baseUrl),
statusCode: response.statusCode,
responseBody: response.body,
);
Map<String, dynamic> data = {};
if (response.bodyBytes.isNotEmpty) {
final decoded = json.decode(utf8.decode(response.bodyBytes));
if (decoded is Map) data = Map<String, dynamic>.from(decoded);
}
if (response.statusCode < 200 || response.statusCode >= 300) {
throw StateError(
data['message']?.toString() ?? 'فشل طلب الخادم (${response.statusCode}).',
final error = StateError(
data['message']?.toString() ??
'فشل طلب الخادم (${response.statusCode}).',
);
AppLogger.error('Admin API request failed',
error: error, tag: 'ADMIN_API');
throw error;
}
return data;
}
@@ -46,11 +57,16 @@ class DirectorateApiService {
required String phoneNumber,
required String role,
}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/auth/otp/request'),
headers: const {'Accept': 'application/json', 'Content-Type': 'application/json'},
body: json.encode({'phone_number': phoneNumber, 'role': role}),
).timeout(const Duration(seconds: 30));
final response = await http
.post(
Uri.parse('$baseUrl/api/auth/otp/request'),
headers: const {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: json.encode({'phone_number': phoneNumber, 'role': role}),
)
.timeout(const Duration(seconds: 30));
_decode(response);
}
@@ -59,16 +75,21 @@ class DirectorateApiService {
required String otp,
required String role,
}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/auth/otp/verify'),
headers: const {'Accept': 'application/json', 'Content-Type': 'application/json'},
body: json.encode({
'phone_number': phoneNumber,
'otp': otp,
'role': role,
'device_fingerprint': 'saqel_admin_flutter',
}),
).timeout(const Duration(seconds: 30));
final response = await http
.post(
Uri.parse('$baseUrl/api/auth/otp/verify'),
headers: const {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: json.encode({
'phone_number': phoneNumber,
'otp': otp,
'role': role,
'device_fingerprint': 'saqel_admin_flutter',
}),
)
.timeout(const Duration(seconds: 30));
final data = _decode(response);
final payload = Map<String, dynamic>.from(data['data'] as Map? ?? const {});
final token = payload['token']?.toString() ?? '';
@@ -79,10 +100,12 @@ class DirectorateApiService {
static Future<bool> hasValidSession() async {
try {
final response = await http.get(
Uri.parse('$baseUrl/api/auth/me'),
headers: await _headers(),
).timeout(const Duration(seconds: 15));
final response = await http
.get(
Uri.parse('$baseUrl/api/auth/me'),
headers: await _headers(),
)
.timeout(const Duration(seconds: 15));
_decode(response);
return true;
} catch (_) {
@@ -91,18 +114,22 @@ class DirectorateApiService {
}
static Future<Map<String, dynamic>> fetchDirectorateDashboard() async {
final response = await http.get(
Uri.parse('$baseUrl/api/directorate/dashboard'),
headers: await _headers(),
).timeout(const Duration(seconds: 15));
final response = await http
.get(
Uri.parse('$baseUrl/api/directorate/dashboard'),
headers: await _headers(),
)
.timeout(const Duration(seconds: 15));
return _decode(response);
}
static Future<Map<String, dynamic>> fetchSchoolDashboard({int schoolId = 1}) async {
static Future<Map<String, dynamic>> fetchSchoolDashboard(
{int schoolId = 1}) async {
final uri = Uri.parse('$baseUrl/api/supervisor/school-dashboard').replace(
queryParameters: {'school_id': '$schoolId'},
);
final response = await http.get(uri, headers: await _headers())
final response = await http
.get(uri, headers: await _headers())
.timeout(const Duration(seconds: 15));
return _decode(response);
}
@@ -118,7 +145,8 @@ class DirectorateApiService {
List<int>? fileBytes,
required String fileName,
}) async {
final request = http.MultipartRequest('POST', Uri.parse('$baseUrl/api/supervisor/record-lesson'));
final request = http.MultipartRequest(
'POST', Uri.parse('$baseUrl/api/supervisor/record-lesson'));
final headers = await _headers();
headers.remove('Content-Type');
request.headers.addAll(headers);
@@ -131,9 +159,11 @@ class DirectorateApiService {
'duration_minutes': '$durationMinutes',
});
if (fileBytes != null) {
request.files.add(http.MultipartFile.fromBytes('video', fileBytes, filename: fileName));
request.files.add(
http.MultipartFile.fromBytes('video', fileBytes, filename: fileName));
} else if (filePath != null) {
request.files.add(await http.MultipartFile.fromPath('video', filePath, filename: fileName));
request.files.add(await http.MultipartFile.fromPath('video', filePath,
filename: fileName));
} else {
throw StateError('لم يتم اختيار ملف فيديو حقيقي.');
}
@@ -145,12 +175,15 @@ class DirectorateApiService {
);
}
static Future<bool> pushExamToLab({required int examId, required int schoolId}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/supervisor/exam/push-to-lab'),
headers: await _headers(),
body: json.encode({'exam_id': examId, 'school_id': schoolId}),
).timeout(const Duration(seconds: 30));
static Future<bool> pushExamToLab(
{required int examId, required int schoolId}) async {
final response = await http
.post(
Uri.parse('$baseUrl/api/supervisor/exam/push-to-lab'),
headers: await _headers(),
body: json.encode({'exam_id': examId, 'school_id': schoolId}),
)
.timeout(const Duration(seconds: 30));
return _decode(response)['status'] == 'success';
}
@@ -160,15 +193,18 @@ class DirectorateApiService {
List<int>? fileBytes,
required String fileName,
}) async {
final request = http.MultipartRequest('POST', Uri.parse('$baseUrl/api/supervisor/exam/upload-panoramic'));
final request = http.MultipartRequest(
'POST', Uri.parse('$baseUrl/api/supervisor/exam/upload-panoramic'));
final headers = await _headers();
headers.remove('Content-Type');
request.headers.addAll(headers);
request.fields['session_id'] = '$sessionId';
if (fileBytes != null) {
request.files.add(http.MultipartFile.fromBytes('video', fileBytes, filename: fileName));
request.files.add(
http.MultipartFile.fromBytes('video', fileBytes, filename: fileName));
} else if (filePath != null) {
request.files.add(await http.MultipartFile.fromPath('video', filePath, filename: fileName));
request.files.add(await http.MultipartFile.fromPath('video', filePath,
filename: fileName));
} else {
throw StateError('لم يتم اختيار عينة فيديو حقيقية.');
}
@@ -185,7 +221,8 @@ class DirectorateApiService {
final uri = Uri.parse('$baseUrl/api/unified-exams/dual-forms').replace(
queryParameters: {'subject': subject, 'grade_level': gradeLevel},
);
final response = await http.get(uri, headers: await _headers())
final response = await http
.get(uri, headers: await _headers())
.timeout(const Duration(seconds: 30));
final data = _decode(response);
return Map<String, dynamic>.from(data['data'] as Map? ?? const {});
@@ -194,21 +231,26 @@ class DirectorateApiService {
static Future<Map<String, dynamic>> evaluateExamSessionIntegrity({
List<Map<String, dynamic>> submissions = const [],
}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/unified-exams/evaluate-integrity'),
headers: await _headers(),
body: json.encode({'submissions': submissions}),
).timeout(const Duration(seconds: 30));
final response = await http
.post(
Uri.parse('$baseUrl/api/unified-exams/evaluate-integrity'),
headers: await _headers(),
body: json.encode({'submissions': submissions}),
)
.timeout(const Duration(seconds: 30));
final data = _decode(response);
return Map<String, dynamic>.from(data['data'] as Map? ?? const {});
}
static Future<Map<String, dynamic>> dispatchParentReports({int schoolId = 1}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/parent-reports/dispatch'),
headers: await _headers(),
body: json.encode({'school_id': schoolId}),
).timeout(const Duration(minutes: 2));
static Future<Map<String, dynamic>> dispatchParentReports(
{int schoolId = 1}) async {
final response = await http
.post(
Uri.parse('$baseUrl/api/parent-reports/dispatch'),
headers: await _headers(),
body: json.encode({'school_id': schoolId}),
)
.timeout(const Duration(minutes: 2));
return _decode(response);
}
@@ -216,11 +258,13 @@ class DirectorateApiService {
int schoolId = 1,
required List<Map<String, dynamic>> records,
}) async {
final response = await http.post(
Uri.parse('$baseUrl/api/school-roster/import'),
headers: await _headers(),
body: json.encode({'school_id': schoolId, 'records': records}),
).timeout(const Duration(minutes: 2));
final response = await http
.post(
Uri.parse('$baseUrl/api/school-roster/import'),
headers: await _headers(),
body: json.encode({'school_id': schoolId, 'records': records}),
)
.timeout(const Duration(minutes: 2));
return _decode(response);
}
}
apps/super_admin_app/lib/core/utils/app_logger.dart
+21
View File
@@ -0,0 +1,21 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
/// Debug-only HTTP diagnostics. Tokens are never printed.
class AppLogger {
AppLogger._();
static void response(
{required String method,
required Uri uri,
required int statusCode,
dynamic body}) {
if (!kDebugMode) return;
debugPrint(
'[SUPER_ADMIN_HTTP] $method $uri -> $statusCode\\n${body is String ? body : jsonEncode(body)}');
}
static void error(String message, Object error) {
if (kDebugMode) debugPrint('[SUPER_ADMIN_ERROR] $message: $error');
}
}
apps/super_admin_app/lib/data/repositories/super_admin_repository.dart
+101 -40
View File
@@ -4,6 +4,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:http/http.dart' as http;
import '../../core/config/app_config.dart';
import '../../core/utils/app_logger.dart';
import '../models/super_admin_models.dart';
class SuperAdminRepository {
@@ -12,7 +13,8 @@ class SuperAdminRepository {
Future<Map<String, String>> _headers() async {
final token = await _storage.read(key: _tokenKey);
if (token == null || token.isEmpty) throw StateError('جلسة السوبر أدمن غير متوفرة.');
if (token == null || token.isEmpty)
throw StateError('جلسة السوبر أدمن غير متوفرة.');
return {
'Accept': 'application/json',
'Authorization': 'Bearer $token',
@@ -21,34 +23,57 @@ class SuperAdminRepository {
}
Map<String, dynamic> _decode(http.Response response) {
final decoded = response.bodyBytes.isEmpty ? <String, dynamic>{} : json.decode(utf8.decode(response.bodyBytes));
final data = decoded is Map ? Map<String, dynamic>.from(decoded) : <String, dynamic>{};
AppLogger.response(
method: response.request?.method ?? 'HTTP',
uri: response.request?.url ?? Uri.parse(AppConfig.apiBaseUrl),
statusCode: response.statusCode,
body: response.body,
);
final decoded = response.bodyBytes.isEmpty
? <String, dynamic>{}
: json.decode(utf8.decode(response.bodyBytes));
final data = decoded is Map
? Map<String, dynamic>.from(decoded)
: <String, dynamic>{};
if (response.statusCode < 200 || response.statusCode >= 300) {
throw StateError(data['message']?.toString() ?? 'فشل طلب الخادم (${response.statusCode}).');
final error = StateError(data['message']?.toString() ??
'فشل طلب الخادم (${response.statusCode}).');
AppLogger.error('Super-admin API request failed', error);
throw error;
}
return data;
}
Future<void> requestOtp(String phone) async {
final response = await http.post(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/otp/request'),
headers: const {'Accept': 'application/json', 'Content-Type': 'application/json'},
body: json.encode({'phone_number': phone, 'role': 'super_admin'}),
).timeout(const Duration(seconds: 30));
final response = await http
.post(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/otp/request'),
headers: const {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: json.encode({'phone_number': phone, 'role': 'super_admin'}),
)
.timeout(const Duration(seconds: 30));
_decode(response);
}
Future<void> verifyOtp(String phone, String otp) async {
final response = await http.post(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/otp/verify'),
headers: const {'Accept': 'application/json', 'Content-Type': 'application/json'},
body: json.encode({
'phone_number': phone,
'otp': otp,
'role': 'super_admin',
'device_fingerprint': 'saqel_super_admin_flutter',
}),
).timeout(const Duration(seconds: 30));
final response = await http
.post(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/otp/verify'),
headers: const {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
body: json.encode({
'phone_number': phone,
'otp': otp,
'role': 'super_admin',
'device_fingerprint': 'saqel_super_admin_flutter',
}),
)
.timeout(const Duration(seconds: 30));
final body = _decode(response);
final payload = Map<String, dynamic>.from(body['data'] as Map? ?? const {});
final token = payload['token']?.toString() ?? '';
@@ -58,10 +83,12 @@ class SuperAdminRepository {
Future<bool> hasValidSession() async {
try {
final response = await http.get(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/me'),
headers: await _headers(),
).timeout(const Duration(seconds: 15));
final response = await http
.get(
Uri.parse('${AppConfig.apiBaseUrl}/api/auth/me'),
headers: await _headers(),
)
.timeout(const Duration(seconds: 15));
_decode(response);
return true;
} catch (_) {
@@ -70,48 +97,82 @@ class SuperAdminRepository {
}
Future<dynamic> _get(String path) async {
final response = await http.get(Uri.parse('${AppConfig.apiBaseUrl}$path'), headers: await _headers())
final response = await http
.get(Uri.parse('${AppConfig.apiBaseUrl}$path'),
headers: await _headers())
.timeout(const Duration(seconds: 20));
return _decode(response)['data'];
}
Future<dynamic> _post(String path, Map<String, dynamic> body) async {
final response = await http.post(Uri.parse('${AppConfig.apiBaseUrl}$path'), headers: {
...await _headers(), 'Content-Type': 'application/json',
}, body: json.encode(body)).timeout(const Duration(seconds: 20));
final response = await http
.post(Uri.parse('${AppConfig.apiBaseUrl}$path'),
headers: {
...await _headers(),
'Content-Type': 'application/json',
},
body: json.encode(body))
.timeout(const Duration(seconds: 20));
return _decode(response)['data'];
}
Future<List<Map<String, dynamic>>> getSchools() async =>
(await _get('/api/super-admin/schools') as List).map((e) => Map<String, dynamic>.from(e as Map)).toList();
(await _get('/api/super-admin/schools') as List)
.map((e) => Map<String, dynamic>.from(e as Map))
.toList();
Future<List<Map<String, dynamic>>> getStaff() async =>
(await _get('/api/super-admin/staff') as List).map((e) => Map<String, dynamic>.from(e as Map)).toList();
(await _get('/api/super-admin/staff') as List)
.map((e) => Map<String, dynamic>.from(e as Map))
.toList();
Future<void> saveSchool(Map<String, dynamic> body) async {
await _post('/api/super-admin/schools/save', body);
}
Future<void> toggleSchool(int id) async {
await _post('/api/super-admin/schools/toggle', {'id': id});
}
Future<void> saveStaff(Map<String, dynamic> body) async {
await _post('/api/super-admin/staff/save', body);
}
Future<void> toggleStaff(int id) async {
await _post('/api/super-admin/staff/toggle', {'id': id});
}
Future<void> saveSchool(Map<String, dynamic> body) async { await _post('/api/super-admin/schools/save', body); }
Future<void> toggleSchool(int id) async { await _post('/api/super-admin/schools/toggle', {'id': id}); }
Future<void> saveStaff(Map<String, dynamic> body) async { await _post('/api/super-admin/staff/save', body); }
Future<void> toggleStaff(int id) async { await _post('/api/super-admin/staff/toggle', {'id': id}); }
Future<List<Map<String, dynamic>>> getDirectorates() async =>
(await _get('/api/super-admin/directorates') as List).map((e) => Map<String, dynamic>.from(e as Map)).toList();
Future<void> saveDirectorate(Map<String, dynamic> body) async { await _post('/api/super-admin/directorates/save', body); }
Future<void> toggleDirectorate(int id) async { await _post('/api/super-admin/directorates/toggle', {'id': id}); }
(await _get('/api/super-admin/directorates') as List)
.map((e) => Map<String, dynamic>.from(e as Map))
.toList();
Future<void> saveDirectorate(Map<String, dynamic> body) async {
await _post('/api/super-admin/directorates/save', body);
}
Future<void> toggleDirectorate(int id) async {
await _post('/api/super-admin/directorates/toggle', {'id': id});
}
Future<MacroTelemetryModel> getMacroTelemetry() async =>
MacroTelemetryModel.fromJson(Map<String, dynamic>.from(await _get('/api/super-admin/overview') as Map));
MacroTelemetryModel.fromJson(Map<String, dynamic>.from(
await _get('/api/super-admin/overview') as Map));
Future<List<AiClusterNodeModel>> getAiClusterNodes() async =>
(await _get('/api/super-admin/ai-nodes') as List)
.map((item) => AiClusterNodeModel.fromJson(Map<String, dynamic>.from(item as Map)))
.map((item) => AiClusterNodeModel.fromJson(
Map<String, dynamic>.from(item as Map)))
.toList();
Future<List<PayoutQueueItemModel>> getPayoutQueue() async =>
(await _get('/api/super-admin/payouts') as List)
.map((item) => PayoutQueueItemModel.fromJson(Map<String, dynamic>.from(item as Map)))
.map((item) => PayoutQueueItemModel.fromJson(
Map<String, dynamic>.from(item as Map)))
.toList();
Future<List<SecurityIntegrityAlertModel>> getSecurityAlerts() async =>
(await _get('/api/super-admin/security-alerts') as List)
.map((item) => SecurityIntegrityAlertModel.fromJson(Map<String, dynamic>.from(item as Map)))
.map((item) => SecurityIntegrityAlertModel.fromJson(
Map<String, dynamic>.from(item as Map)))
.toList();
}
apps/teacher_app/lib/data/repositories/teacher_repository.dart
+25 -1
View File
@@ -365,11 +365,13 @@ class TeacherRepository {
String? filePath,
Uint8List? fileBytes,
}) async {
final stopwatch = Stopwatch()..start();
final uploadUri = Uri.parse('$baseUrl${AppConfig.uploadVideoEndpoint}');
try {
final headers = await _authHeaders();
final request = http.MultipartRequest(
'POST',
Uri.parse('$baseUrl${AppConfig.uploadVideoEndpoint}'),
uploadUri,
);
request.headers.addAll(headers..remove('Content-Type'));
request.fields.addAll({
@@ -380,6 +382,19 @@ class TeacherRepository {
'subject': subject,
'curriculum_key': curriculumKey,
});
AppLogger.request(
method: 'POST',
uri: uploadUri,
headers: request.headers,
body: {
'title': title,
'grade_level': gradeLevel,
'subject': subject,
'curriculum_key': curriculumKey,
'file_name': fileName,
'file_size_mb': fileSizeMb
},
);
final resolvedName = fileName ?? 'lesson.mp4';
if (filePath != null && filePath.isNotEmpty) {
@@ -401,6 +416,13 @@ class TeacherRepository {
final streamed =
await _client.send(request).timeout(const Duration(minutes: 10));
final response = await http.Response.fromStream(streamed);
AppLogger.response(
method: 'POST',
uri: uploadUri,
statusCode: response.statusCode,
responseBody: response.body,
duration: stopwatch.elapsed,
);
final decoded = json.decode(response.body) as Map<String, dynamic>;
if (response.statusCode == 200 || response.statusCode == 201)
@@ -410,6 +432,8 @@ class TeacherRepository {
} on StateError {
rethrow;
} catch (error) {
AppLogger.error('Lesson upload request failed',
error: error, tag: 'TEACHER_REPO');
throw StateError('تعذر رفع الحصة: $error');
}
}