feat: sort by last active

Author: CK-7vn

backend/src/database/users.go

@@ -44,7 +44,12 @@ func (db *DB) GetCurrentUsers(args *models.QueryContext, role string) ([]models.
 		return nil, newGetRecordsDBError(err, "users")
 	}
 	users := make([]models.User, 0, args.PerPage)
-	if err := tx.Order(adjustUserOrderBy(args.OrderClause("users.name_last desc"))).
+	orderClause := adjustUserOrderBy(args.OrderClause("users.name_last desc"))
+	if strings.Contains(orderClause, "last_login") {
+		tx = tx.Joins("LEFT JOIN login_metrics ON login_metrics.user_id = users.id")
+		orderClause = adjustLastLoginOrderBy(orderClause)
+	}
+	if err := tx.Order(orderClause).
 		Offset(args.CalcOffset()).
 		Limit(args.PerPage).
 		Find(&users).
@@ -695,6 +700,16 @@ func adjustUserOrderBy(arg string) string {
 	return arg
 }
 
+func adjustLastLoginOrderBy(arg string) string {
+	if strings.Contains(arg, "last_login desc") {
+		return strings.Replace(arg, "last_login desc", "login_metrics.last_login desc NULLS LAST", 1)
+	}
+	if strings.Contains(arg, "last_login asc") {
+		return strings.Replace(arg, "last_login asc", "login_metrics.last_login asc NULLS FIRST", 1)
+	}
+	return arg
+}
+
 func (db *DB) UpdateFailedLogin(userID uint) error {
 	now := time.Now()
 	return db.Transaction(func(tx *gorm.DB) error {

frontend/src/Pages/AdminManagement.tsx

@@ -173,6 +173,8 @@ export default function AdminManagement() {
                             enumType={{
                                 'Name (A-Z)': 'name_last asc',
                                 'Name (Z-A)': 'name_last desc',
+                                'Last Active (Newest)': 'last_login desc',
+                                'Last Active (Oldest)': 'last_login asc',
                                 'Account Created (Newest) ': 'created_at desc',
                                 'Account Created (Oldest) ': 'created_at asc'
                             }}

frontend/src/Pages/StudentManagement.tsx

@@ -167,6 +167,8 @@ export default function StudentManagement() {
                             setState={setSortQuery}
                             enumType={{
                                 ...FilterResidentNames,
+                                'Last Active (Newest)': 'last_login desc',
+                                'Last Active (Oldest)': 'last_login asc',
                                 'Account Created (Newest) ': 'created_at desc',
                                 'Account Created  (Oldest)': 'created_at asc'
                             }}