From ae092ecf82b92ed7f929a492ed9a883ee9a2cc04 Mon Sep 17 00:00:00 2001 From: fdai7887 Date: Thu, 8 Feb 2024 19:14:28 +0100 Subject: [PATCH] refactoring: Moved dropProfFromCourse to Administration class --- src/main/java/org/example/Administration.java | 44 +++++++++++++++++++ src/main/java/org/example/Main.java | 40 +---------------- 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/example/Administration.java b/src/main/java/org/example/Administration.java index e5e4a69..fedf350 100644 --- a/src/main/java/org/example/Administration.java +++ b/src/main/java/org/example/Administration.java @@ -432,6 +432,50 @@ public class Administration { } + public void dropProfFromCourse(){ + System.out.println("Please enter Professor ID"); + String profID = scanner.next(); + while(this.findProfessorById(profID) == null){ + System.out.println("This Professor does not exist"); + System.out.println("Please enter a new Professor ID"); + profID = scanner.next(); + } + + Professor prof = this.findProfessorById(profID); + List courseList = prof.getCoursesTaught(); + + System.out.println("Please enter Course ID"); + String courseID = scanner.next(); + + boolean isDeleted = false; + while(!isDeleted) { + //Checks if course exists + while(this.findCourseByID(courseID) == null ){ + System.out.println("This Course does not exist"); + System.out.println("Please enter a new Course ID"); + courseID = scanner.next(); + + } + //Checks if Prof is enrolled in course + for (Course course : courseList) { + if (course.getCourseID().equals(courseID)) { + courseList.remove(this.findCourseByID(courseID)); + prof.setCoursesTaught(courseList); + System.out.println("Course deleted successfully"); + isDeleted = true; + break; + } + System.out.println("The Professor is not enrolled in this course"); + System.out.println("Please enter a new Course ID"); + courseID = scanner.next(); + } + + } + + + + + } } diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/example/Main.java index 810ca44..a5ebe9f 100644 --- a/src/main/java/org/example/Main.java +++ b/src/main/java/org/example/Main.java @@ -50,45 +50,7 @@ public class Main { break; case 4: // Drop Prof from Course - System.out.println("Please enter Professor ID"); - String profID = scanner.next(); - while(administration.findProfessorById(profID) == null){ - System.out.println("This Professor does not exist"); - System.out.println("Please enter a new Professor ID"); - profID = scanner.next(); - } - - Professor prof = administration.findProfessorById(profID); - List courseList = prof.getCoursesTaught(); - - System.out.println("Please enter Course ID"); - String courseID = scanner.next(); - - boolean isDeleted = false; - while(!isDeleted) { - //Checks if course exists - while(administration.findCourseByID(courseID) == null ){ - System.out.println("This Course does not exist"); - System.out.println("Please enter a new Course ID"); - courseID = scanner.next(); - - } - //Checks if Prof is enrolled in course - for (Course course : courseList) { - if (course.getCourseID().equals(courseID)) { - courseList.remove(administration.findCourseByID(courseID)); - prof.setCoursesTaught(courseList); - System.out.println("Course deleted successfully"); - isDeleted = true; - break; - } - System.out.println("The Professor is not enrolled in this course"); - System.out.println("Please enter a new Course ID"); - System.out.println("To return to main menu enter '0'"); - courseID = scanner.next(); - } - - } + administration.dropProfFromCourse(); break; case 5: