Exported add list to external method

AkashDeepSinghJassal · Jan 10, 2021 · 9256227 · 9256227
1 parent 97fc885
commit 9256227
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 31 deletions.
diff --git a/src/hospital/services/DoctorSql.java b/src/hospital/services/DoctorSql.java
@@ -3,6 +3,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 
 import hospital.model.Doctor;
 import hospital.model.GENDER;
@@ -14,18 +15,24 @@ public class DoctorSql {
 	/**
 	 * Get all paients from the database.
 	 * 
-	 * @return a {@link ResultSet} containing all paients from the database
+	 * @return a {@link ArrayList} of type {@link Doctor} containing all doctors
+	 *         from the database
 	 */
-	public static ResultSet getDoctors() {
-		ResultSet resultSet = null;
+	public static ArrayList<Doctor> getDoctors() {
+		ArrayList<Doctor> doctors = new ArrayList<Doctor>();
 		try {
 			PreparedStatement statement = Main.conn
 					.prepareStatement("select id, name, age, gender, speciality, contact, address from doctor");
-			resultSet = statement.executeQuery();
+			ResultSet resultSet = statement.executeQuery();
+			while (resultSet.next()) {
+				doctors.add(generateDoctor(resultSet));
+			}
+			return doctors;
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
-		return resultSet;
+
+		return null;
 	}
 
 	/**
@@ -123,8 +130,7 @@ public static int updateDoctor(Doctor doctor) {
 	public static String getIdOfLastDoctor() {
 		String id = "";
 		try {
-			PreparedStatement statement = Main.conn
-					.prepareStatement("SELECT id FROM doctor ORDER BY id DESC LIMIT 1;");
+			PreparedStatement statement = Main.conn.prepareStatement("SELECT id FROM doctor ORDER BY id DESC LIMIT 1;");
 			ResultSet resultSet = statement.executeQuery();
 			if (resultSet.next())
 				id = resultSet.getString(1);

diff --git a/src/hospital/services/PatientSql.java b/src/hospital/services/PatientSql.java
@@ -3,6 +3,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 
 import hospital.model.GENDER;
 import hospital.model.GenerateGender;
@@ -14,18 +15,24 @@ public class PatientSql {
 	/**
 	 * Get all paients from the database.
 	 * 
-	 * @return a {@link ResultSet} containing all paients from the database
+	 * @return a {@link ArrayList} of type {@link Patient} containing all patients
+	 *         from the database
 	 */
-	public static ResultSet getPatients() {
-		ResultSet resultSet = null;
+	public static ArrayList<Patient> getPatients() {
+		ArrayList<Patient> patients = new ArrayList<Patient>();
 		try {
 			PreparedStatement statement = Main.conn
 					.prepareStatement("select id, name, age, gender, contact, address from patient");
-			resultSet = statement.executeQuery();
+			ResultSet resultSet = statement.executeQuery();
+			while (resultSet.next()) {
+				patients.add(generatePatient(resultSet));
+			}
+			return patients;
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
-		return resultSet;
+
+		return null;
 	}
 
 	/**

diff --git a/src/hospital/ui/view/doctor/DoctorOverviewController.java b/src/hospital/ui/view/doctor/DoctorOverviewController.java
@@ -43,15 +43,7 @@ public class DoctorOverviewController {
 	ResultSet resultSet = null;
 
 	public DoctorOverviewController() {
-		try {
-			resultSet = DoctorSql.getDoctors();
-			while (resultSet.next()) {
-				Doctor doctor = DoctorSql.generateDoctor(resultSet);
-				doctorList.add(doctor);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+		doctorList.addAll(DoctorSql.getDoctors());
 	}
 
 	@FXML

diff --git a/src/hospital/ui/view/patient/PatientOverviewController.java b/src/hospital/ui/view/patient/PatientOverviewController.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 import hospital.model.GENDER;
 import hospital.model.Patient;
@@ -39,15 +38,7 @@ public class PatientOverviewController {
 	ResultSet resultSet = null;
 
 	public PatientOverviewController() {
-		try {
-			resultSet = PatientSql.getPatients();
-			while (resultSet.next()) {
-				Patient patient = PatientSql.generatePatient(resultSet);
-				patientList.add(patient);
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+		patientList.addAll(PatientSql.getPatients());
 	}
 
 	@FXML