Update src/main/java/Main.java

src/main/java/Main.java

@@ -71,9 +71,9 @@ public class Main {
         switch (choice) {
             case 1:
                 success = school.registerStudent(username, password);
-                if(success){
+                if (success) {
                     System.out.println(" Student registered successfully!");
-                }else {
+                } else {
                     System.out.println(" Username already exists!");
                 }
                 break;
@@ -108,10 +108,10 @@ public class Main {
 
         switch (choice) {
             case 1:
-                Student student = school.loginStudent(username , password);
+                Student student = school.loginStudent(username, password);
-                if(student != null){
+                if (student != null) {
                     studentMenu(student);
-                }else{
+                } else {
                     System.out.println(" Invalid username or password!");
                 }
                 break;
@@ -151,7 +151,7 @@ public class Main {
                     enrollInCourse(student);
                     break;
                 case 3:
-                    //System.out.print(student.getMyCoursesDisplay());
+                    System.out.print(student.getMyCoursesDisplay());
                     break;
                 case 4:
                     System.out.println(" Goodbye, " + student.getUsername() + "!");
@@ -164,16 +164,18 @@ public class Main {
 
     private static void enrollInCourse(Student student) {
         System.out.print(school.getAllCoursesDisplay());
-        System.out.print("\n Enter Course ID to enroll: ");
+        System.out.print("\nEnter Course ID to enroll: ");
         int courseId = getIntInput();
+
         Course course = school.findCourseById(courseId);
-        if(course == null){
+        if (course == null) {
             System.out.println(" Course not found! Please enter a valid ID.");
             return;
         }
-        if(student.enrolledCourses(course)){
+
-            System.out.println("Successfully enrolled in" + course.getName());
+        if (student.enrollInCourse(course)) {
-        }else{
+            System.out.println(" Successfully enrolled in " + course.getName());
+        } else {
             System.out.println(" You are already enrolled in this course!");
         }
     }

src/main/java/models/Student.java

@@ -11,8 +11,8 @@ public class Student extends User {
         this.enrolledCourses = new ArrayList<>();
     }
 
-    public boolean enrolledCourses(Course course){
+    public boolean enrollInCourse(Course course) {
-        if(enrolledCourses.contains(course)){
+        if (enrolledCourses.contains(course)) {
             return false;
         }
         enrolledCourses.add(course);
@@ -20,17 +20,17 @@ public class Student extends User {
         return true;
     }
 
-    public List <Course> getEnrolledCourses(){
+    public List<Course> getEnrolledCourses() {
         return enrolledCourses;
     }
 
-    public String getMyCoursesDisplay(){
+    public String getMyCoursesDisplay() {
-        if(enrolledCourses.isEmpty()){
+        if (enrolledCourses.isEmpty()) {
             return " You are not enrolled in any course yet.";
-        }else{
+        } else {
-            StringBuilder sb = new StringBuilder("\n My Course: \n");
+            StringBuilder sb = new StringBuilder("\n My Courses:\n");
             for (int i = 0; i < enrolledCourses.size(); i++) {
-                sb.append(" ").append(i+1).append(". ").append(enrolledCourses.get(i)).append("\n");
+                sb.append("  ").append(i+1).append(". ").append(enrolledCourses.get(i)).append("\n");
             }
             return sb.toString();
         }

src/main/java/services/SchoolSystem.java

@@ -16,16 +16,16 @@ public class SchoolSystem {
     }
 
     // ========== Student Management ==========
-    public boolean registerStudent(String username , String password){
+    public boolean registerStudent(String username, String password) {
-        if(findStudent(username) != null){
+        if (findStudent(username) != null) {
             return false;
         }
-        students.add(new Student(username , password));
+        students.add(new Student(username, password));
         return true;
     }
 
     public Student loginStudent(String username, String password) {
-        Student student  = findStudent(username);
+        Student student = findStudent(username);
         if (student != null && student.checkPassword(password)) {
             return student;
         }
@@ -65,8 +65,8 @@ public class SchoolSystem {
 
     // ========== Course Management ==========
     public boolean addCourseToSystem(String courseName) {
-        for (Course c : allCourses){
+        for (Course c : allCourses) {
-            if(c.getName().equals(courseName)){
+            if (c.getName().equals(courseName)) {
                 return false;
             }
         }
@@ -75,10 +75,8 @@ public class SchoolSystem {
     }
 
     public Course findCourseById(int id) {
-        for(Course c : allCourses){
+        for (Course c : allCourses) {
-            if (c.getId() == id){
+            if (c.getId() == id) return c;
-                return c;
-            }
         }
         return null;
     }