Merge pull request #465 from bounswe/feat/289-mentor-functionalities-mobile

Feat/289 mentor functionalities mobile

Author: burcukilic

apps/jobboard-mobile/lib/core/constants/app_constants.dart

@@ -6,7 +6,7 @@ class AppConstants {
   static String get baseUrl => _devBaseUrl;
 
   static String _getBaseUrl() {
-    return 'https://jobboard-backend-728855696411.europe-west1.run.app/api';
+    return 'https://jobboard-backend-test-728855696411.europe-west1.run.app/api';
     //return 'https://jobboard-backend-test-728855696411.europe-west1.run.app/api';
     //return 'http://localhost:8080/api';
     //return 'http://10.0.2.2:8080/api';

apps/jobboard-mobile/lib/core/models/mentor_profile.dart

@@ -1,46 +1,61 @@
 import 'dart:convert';
 import 'user.dart';
+import 'mentor_review.dart';
 
 class MentorProfile {
-  final int id;
-  final User user;
-  final int capacity;
-  final int currentMenteeCount;
+  final String id;
+  final String username;
+  final List<String> expertise;
+  final int currentMentees;
+  final int maxMentees;
   final double averageRating;
   final int reviewCount;
-  final bool isAvailable;
+  final List<MentorReview> reviews;
+
+  /// Derived availability: backend no longer has `isAvailable`,
+  /// so we infer it as "has capacity left".
+  bool get isAvailable => currentMentees < maxMentees;
 
   MentorProfile({
     required this.id,
-    required this.user,
-    required this.capacity,
-    required this.currentMenteeCount,
+    required this.username,
+    required this.expertise,
+    required this.currentMentees,
+    required this.maxMentees,
     required this.averageRating,
     required this.reviewCount,
-    required this.isAvailable,
+    this.reviews = const [],
   });
 
   factory MentorProfile.fromJson(Map<String, dynamic> json) {
     return MentorProfile(
-      id: json['id'],
-      user: User.fromJson(json['user']),
-      capacity: json['capacity'],
-      currentMenteeCount: json['currentMenteeCount'],
-      averageRating: json['averageRating']?.toDouble() ?? 0.0,
-      reviewCount: json['reviewCount'],
-      isAvailable: json['isAvailable'],
+      id: json['id']?.toString() ?? '',
+      username: json['username'] ?? '',
+      expertise: (json['expertise'] as List<dynamic>?)
+          ?.map((e) => e.toString())
+          .toList() ??
+          const [],
+      currentMentees: json['currentMentees'] ?? 0,
+      maxMentees: json['maxMentees'] ?? 0,
+      averageRating: (json['averageRating'] ?? 0.0).toDouble(),
+      reviewCount: json['reviewCount'] ?? 0,
+      reviews: (json['reviews'] as List<dynamic>?)
+          ?.map((e) => MentorReview.fromJson(e))
+          .toList() ??
+          const [],
     );
   }
 
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'user': user.toJson(),
-      'capacity': capacity,
-      'currentMenteeCount': currentMenteeCount,
+      'username': username,
+      'expertise': expertise,
+      'currentMentees': currentMentees,
+      'maxMentees': maxMentees,
       'averageRating': averageRating,
       'reviewCount': reviewCount,
-      'isAvailable': isAvailable,
+      'reviews': reviews.map((r) => r.toJson()).toList(),
     };
   }
 }

apps/jobboard-mobile/lib/core/models/mentor_review.dart

@@ -3,47 +3,38 @@ import 'user.dart';
 
 class MentorReview {
   final int id;
-  final User mentor;
-  final User mentee;
-  final int rating;
+  final String reviewerUsername;
+  final double rating;
   final String? comment;
   final DateTime createdAt;
-  final DateTime? updatedAt;
 
   MentorReview({
     required this.id,
-    required this.mentor,
-    required this.mentee,
+    required this.reviewerUsername,
     required this.rating,
     this.comment,
     required this.createdAt,
-    this.updatedAt,
   });
 
   factory MentorReview.fromJson(Map<String, dynamic> json) {
     return MentorReview(
-      id: json['id'] as int,
-      mentor: User.fromJson(json['mentor'] as Map<String, dynamic>),
-      mentee: User.fromJson(json['mentee'] as Map<String, dynamic>),
-      rating: json['rating'] as int,
-      comment: json['comment'] as String?,
+      id: json['id'] is int
+          ? json['id'] as int
+          : int.tryParse(json['id']?.toString() ?? '0') ?? 0,
+      reviewerUsername: json['reviewerUsername'] ?? '',
+      rating: (json['rating'] ?? 0.0).toDouble(),
+      comment: json['comment'],
       createdAt: DateTime.parse(json['createdAt'] as String),
-      updatedAt:
-          json['updatedAt'] == null
-              ? null
-              : DateTime.parse(json['updatedAt'] as String),
     );
   }
 
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'mentor': mentor,
-      'mentee': mentee,
+      'reviewerUsername': reviewerUsername,
       'rating': rating,
       'comment': comment,
       'createdAt': createdAt.toIso8601String(),
-      'updatedAt': updatedAt?.toIso8601String(),
     };
   }
 }

apps/jobboard-mobile/lib/core/models/mentorship_request.dart

@@ -1,62 +1,114 @@
 import 'dart:convert';
 import 'user.dart';
-
 enum MentorshipRequestStatus {
   PENDING,
   ACCEPTED,
   REJECTED,
-  COMPLETED,
   CANCELLED,
+  COMPLETED,
+  UNKNOWN,
 }
 
+MentorshipRequestStatus _parseStatus(String? raw) {
+  if (raw == null) return MentorshipRequestStatus.UNKNOWN;
+  final upper = raw.toUpperCase();
+  switch (upper) {
+    case 'PENDING':
+      return MentorshipRequestStatus.PENDING;
+    case 'ACCEPTED':
+      return MentorshipRequestStatus.ACCEPTED;
+    case 'REJECTED':
+      return MentorshipRequestStatus.REJECTED;
+    case 'CANCELLED':
+      return MentorshipRequestStatus.CANCELLED;
+    case 'COMPLETED':
+      return MentorshipRequestStatus.COMPLETED;
+    default:
+      return MentorshipRequestStatus.UNKNOWN;
+  }
+}
 class MentorshipRequest {
-  final int id;
-  final User mentor;
-  final User mentee;
-  final String message;
+  /// Primary ID (string for generic requests, mentee view `mentorshipRequestId`)
+  final String id;
+
+  /// Requester user ID (if present in response)
+  final String? requesterId;
+  String? requesterUsername;
+
+
+  /// Mentor user ID (string or int in payload; normalized to string)
+  final String mentorId;
+
+  /// Request status
   final MentorshipRequestStatus status;
+
+  /// When the request was created
   final DateTime createdAt;
-  final DateTime? updatedAt;
-  final String? channelId;
+
+  /// Extra mentee-view fields:
+  final String? mentorUsername;
+  final int? resumeReviewId;
+  final String? reviewStatus;
+  final int? conversationId;
 
   MentorshipRequest({
     required this.id,
-    required this.mentor,
-    required this.mentee,
-    required this.message,
+    required this.requesterId,
+    required this.requesterUsername,
+    required this.mentorId,
     required this.status,
     required this.createdAt,
-    this.updatedAt,
-    this.channelId,
+    this.mentorUsername,
+    this.resumeReviewId,
+    this.reviewStatus,
+    this.conversationId,
+
   });
 
   factory MentorshipRequest.fromJson(Map<String, dynamic> json) {
+    // Mentee view (`mentorshipRequestId` etc.)
+    if (json.containsKey('mentorshipRequestId')) {
+      return MentorshipRequest(
+        id: json['mentorshipRequestId'].toString(),
+        requesterId: null, // not present here
+        requesterUsername: json['requesterUsername']?.toString() ?? '',
+        mentorId: json['mentorId']?.toString() ?? '',
+        status: _parseStatus(json['requestStatus']?.toString()),
+        createdAt: DateTime.parse(json['requestCreatedAt'] as String),
+        mentorUsername: json['mentorUsername']?.toString(),
+        resumeReviewId: json['resumeReviewId'] as int?,
+        reviewStatus: json['reviewStatus']?.toString(),
+        conversationId: json['conversationId'] as int?,
+      );
+    }
+
+    // Generic request shape
     return MentorshipRequest(
-      id: json['id'],
-      mentor: User.fromJson(json['mentor']),
-      mentee: User.fromJson(json['mentee']),
-      message: json['message'],
-      status: MentorshipRequestStatus.values.firstWhere(
-        (e) => e.toString().split('.').last == json['status'],
-        orElse: () => MentorshipRequestStatus.PENDING,
-      ),
-      createdAt: DateTime.parse(json['createdAt']),
-      updatedAt:
-          json['updatedAt'] != null ? DateTime.parse(json['updatedAt']) : null,
-      channelId: json['channelId'],
+      id: json['id']?.toString() ?? '',
+      requesterId: json['requesterId']?.toString(),
+      requesterUsername: json['requesterUsername']?.toString() ?? '',
+      mentorId: json['mentorId']?.toString() ?? '',
+      status: _parseStatus(json['status']?.toString()),
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      mentorUsername: null,
+      resumeReviewId: null,
+      reviewStatus: null,
+      conversationId: null,
     );
   }
 
   Map<String, dynamic> toJson() {
     return {
       'id': id,
-      'mentor': mentor,
-      'mentee': mentee,
-      'message': message,
-      'status': status.toString().split('.').last,
+      'requesterId': requesterId,
+      'requesterUsername': requesterUsername,
+      'mentorId': mentorId,
+      'status': status.name,
       'createdAt': createdAt.toIso8601String(),
-      'updatedAt': updatedAt?.toIso8601String(),
-      'channelId': channelId,
+      'mentorUsername': mentorUsername,
+      'resumeReviewId': resumeReviewId,
+      'reviewStatus': reviewStatus,
+      'conversationId': conversationId,
     };
   }
-}
+}

apps/jobboard-mobile/lib/core/models/profile.dart

@@ -38,8 +38,8 @@ class Profile {
         .toList() ?? [];
 
     return Profile(
-      id: json['id'],
-      userId: json['userId'],
+      id: json['id'] ?? json['userId'],
+      userId: json['userId'] ?? json['id'],
       fullName: fullName,
       phone: json['phone'],
       location: json['location'],

apps/jobboard-mobile/lib/core/models/user.dart

@@ -14,6 +14,8 @@ class User {
   final String? employerId; // Added: Specific ID for employer operations
   final MentorshipStatus? mentorshipStatus;
   final int? maxMenteeCount;
+  final List<String>? expertise;
+
   // Add other fields later: profilePicUrl, education, skills, etc.
 
   User({
@@ -29,6 +31,7 @@ class User {
     this.employerId, // Add to constructor
     this.mentorshipStatus,
     this.maxMenteeCount,
+    this.expertise,
   });
 
   // Computed property to get full name
@@ -59,6 +62,7 @@ class User {
               ? MentorshipStatus.values.byName(json['mentorshipStatus'])
               : null,
       maxMenteeCount: json['maxMenteeCount'],
+      expertise: List<String>.from(json['expertise'] ?? []),
     );
   }
 
@@ -76,6 +80,40 @@ class User {
       'employerId': employerId,
       'mentorshipStatus': mentorshipStatus?.name,
       'maxMenteeCount': maxMenteeCount,
+      'expertise': expertise,
     };
   }
+
+  User copyWith({
+    String? id,
+    String? username,
+    String? email,
+    UserType? role,
+    String? firstName,
+    String? lastName,
+    String? jobTitle,
+    String? company,
+    String? bio,
+    String? employerId,
+    MentorshipStatus? mentorshipStatus,
+    int? maxMenteeCount,
+    List<String>? expertise,
+  }) {
+    return User(
+      id: id ?? this.id,
+      username: username ?? this.username,
+      email: email ?? this.email,
+      role: role ?? this.role,
+      firstName: firstName ?? this.firstName,
+      lastName: lastName ?? this.lastName,
+      jobTitle: jobTitle ?? this.jobTitle,
+      company: company ?? this.company,
+      bio: bio ?? this.bio,
+      employerId: employerId ?? this.employerId,
+      mentorshipStatus: mentorshipStatus ?? this.mentorshipStatus,
+      maxMenteeCount: maxMenteeCount ?? this.maxMenteeCount,
+      expertise: expertise ?? this.expertise,
+    );
+  }
+
 }