diff --git a/db/nursingHome.db b/db/nursingHome.db index b89b146..6bc0340 100644 Binary files a/db/nursingHome.db and b/db/nursingHome.db differ diff --git a/src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java b/src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java index 8dc9f96..bf67631 100644 --- a/src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java +++ b/src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java @@ -1,17 +1,17 @@ package de.hitec.nhplus.fixtures; -import de.hitec.nhplus.Main; -import de.hitec.nhplus.datastorage.DaoFactory; -import de.hitec.nhplus.medication.Ingredient; -import de.hitec.nhplus.medication.Medication; -import de.hitec.nhplus.medication.database.MedicationDao; - import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.SQLException; import java.util.*; +import de.hitec.nhplus.Main; +import de.hitec.nhplus.datastorage.DaoFactory; +import de.hitec.nhplus.medication.Ingredient; +import de.hitec.nhplus.medication.Medication; +import de.hitec.nhplus.medication.database.MedicationDao; + /** * {@link Fixture} for {@link Medication}. * @@ -20,11 +20,13 @@ import java.util.*; public class MedicationFixture implements Fixture { private static final String SCHEMA = "/de/hitec/nhplus/medication/database/Medication.sql"; private static final String INGREDIENT_SCHEMA = "/de/hitec/nhplus/medication/database/Medication_Ingredient.sql"; + private static final String ALTERNATIVE_SCHEMA = "/de/hitec/nhplus/medication/database/Medication_Alternative.sql"; @Override public void dropTable(Connection connection) throws SQLException { connection.createStatement().execute("DROP TABLE IF EXISTS medication"); - connection.createStatement().execute("DROP TABLE IF EXISTS medication_ingredient"); + connection.createStatement().execute("DROP TABLE IF EXISTS medication_ingredient"); + connection.createStatement().execute("DROP TABLE IF EXISTS medication_alternative"); } @Override @@ -32,16 +34,25 @@ public class MedicationFixture implements Fixture { final InputStream schema = Main.class.getResourceAsStream(SCHEMA); final InputStream ingredientSchema = Main.class.getResourceAsStream(INGREDIENT_SCHEMA); + final InputStream alterantiveSchema = Main.class.getResourceAsStream(ALTERNATIVE_SCHEMA); + assert schema != null; assert ingredientSchema != null; + assert alterantiveSchema != null; + String SQL = new Scanner(schema, StandardCharsets.UTF_8) - .useDelimiter("\\A") - .next(); + .useDelimiter("\\A") + .next(); String ingredientSQL = ";" + new Scanner(ingredientSchema, StandardCharsets.UTF_8) - .useDelimiter("\\A") - .next(); + .useDelimiter("\\A") + .next(); + String alternativeSQL = ";" + new Scanner(alterantiveSchema, StandardCharsets.UTF_8) + .useDelimiter("\\A") + .next(); + connection.createStatement().execute(SQL); connection.createStatement().execute(ingredientSQL); + connection.createStatement().execute(alternativeSQL); } @@ -67,81 +78,87 @@ public class MedicationFixture implements Fixture { Ingredient warfarinnatrium = new Ingredient("Warfarinnatrium"); medications.add(new Medication( - "Metformin", - "AstraZeneca", - List.of( - metforminhydrochlorid, - cellulose, - povidon, - magnesiumstearat - ), - "Übelkeit, Durchfall, Laktatazidose (selten)", - "Oral", - 100 + "Metformin", + "AstraZeneca", + List.of( + metforminhydrochlorid, + cellulose, + povidon, + magnesiumstearat + ), + "Übelkeit, Durchfall, Laktatazidose (selten)", + "Oral", + 100, + new ArrayList<>() )); medications.add(new Medication( - "Lisinopril", - "Teva Pharmaceuticals", - List.of( - lisinoprilDihydrat, - mannitol, - calciumphosphat, - magnesiumstearat - ), - "Schwindel, trockener Husten", - "Oral", - 150 + "Lisinopril", + "Teva Pharmaceuticals", + List.of( + lisinoprilDihydrat, + mannitol, + calciumphosphat, + magnesiumstearat + ), + "Schwindel, trockener Husten", + "Oral", + 150, + new ArrayList<>() )); medications.add(new Medication( - "Simvastatin", - "Mylan", - List.of( - simvastatin, - laktose, - cellulose, - magnesiumstearat - ), - "Muskelschmerzen, Leberprobleme(selten)", - "Oral", - 80 + "Simvastatin", + "Mylan", + List.of( + simvastatin, + laktose, + cellulose, + magnesiumstearat + ), + "Muskelschmerzen, Leberprobleme(selten)", + "Oral", + 80, + new ArrayList<>() )); medications.add(new Medication( - "Enoxaparin", - "Sanofi", - List.of( - enoxaparinNatrium, - benzylalkohol, - wasser - ), - "Blutungen, Reaktionen an der Injektionsstelle", - "Unterhautinjektion", - 120 + "Enoxaparin", + "Sanofi", + List.of( + enoxaparinNatrium, + benzylalkohol, + wasser + ), + "Blutungen, Reaktionen an der Injektionsstelle", + "Unterhautinjektion", + 120, + new ArrayList<>() )); medications.add(new Medication( - "Levothyroxin", - "Sandoz", - List.of( - levothyroxinnatrium, - laktose, - staerke, - akaziengummi - ), - "Herzrasen, Gewichtsverlust", - "Oral", - 90 + "Levothyroxin", + "Sandoz", + List.of( + levothyroxinnatrium, + laktose, + staerke, + akaziengummi + ), + "Herzrasen, Gewichtsverlust", + "Oral", + 90, + new ArrayList<>() )); medications.add(new Medication( - "Warfarin", - "Apotex Inc.", - List.of( - warfarinnatrium, - laktose, - staerke, - magnesiumstearat - ), - "Blutungen, Blutergüsse", - "Oral", - 110 + "Warfarin", + "Apotex Inc.", + List.of( + warfarinnatrium, + laktose, + staerke, + magnesiumstearat + ), + "Blutungen, Blutergüsse", + "Oral", + 110, + new ArrayList<>() )); MedicationDao dao = DaoFactory.getInstance().createMedicationDAO(); Map medicationsByName = new HashMap<>(); diff --git a/src/main/java/de/hitec/nhplus/medication/Medication.java b/src/main/java/de/hitec/nhplus/medication/Medication.java index 7fdce57..02971eb 100644 --- a/src/main/java/de/hitec/nhplus/medication/Medication.java +++ b/src/main/java/de/hitec/nhplus/medication/Medication.java @@ -23,6 +23,7 @@ public class Medication { private final SimpleStringProperty possibleSideEffects; private final SimpleStringProperty administrationMethod; private final SimpleIntegerProperty currentStock; + private final SimpleListProperty alternativeMedication; /** * This constructor allows instantiating a {@link Medication} object, @@ -37,7 +38,8 @@ public class Medication { List ingredients, String possibleSideEffects, String administrationMethod, - int currentStock + int currentStock, + List alternativeMedication ) { this.name = new SimpleStringProperty(name); this.manufacturer = new SimpleStringProperty(manufacturer); @@ -45,6 +47,7 @@ public class Medication { this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects); this.administrationMethod = new SimpleStringProperty(administrationMethod); this.currentStock = new SimpleIntegerProperty(currentStock); + this.alternativeMedication = new SimpleListProperty<>(FXCollections.observableArrayList(alternativeMedication)); } /** @@ -57,7 +60,8 @@ public class Medication { List ingredients, String possibleSideEffects, String administrationMethod, - int currentStock + int currentStock, + List alternativeMedication ) { this.id = new SimpleIntegerProperty(id); this.name = new SimpleStringProperty(name); @@ -66,6 +70,7 @@ public class Medication { this.possibleSideEffects = new SimpleStringProperty(possibleSideEffects); this.administrationMethod = new SimpleStringProperty(administrationMethod); this.currentStock = new SimpleIntegerProperty(currentStock); + this.alternativeMedication = new SimpleListProperty<>(FXCollections.observableArrayList(alternativeMedication)); } public int getId() { @@ -124,6 +129,18 @@ public class Medication { this.possibleSideEffects.set(possibleSideEffects); } + public ObservableList getAlternativeMedication() { + return alternativeMedication.get(); + } + + public SimpleListProperty alternativeMedicationProperty() { + return alternativeMedication; + } + + public void setAlternativeMedication(ObservableList alternativeMedication) { + this.alternativeMedication.set(alternativeMedication); + } + public String getAdministrationMethod() { return administrationMethod.get(); } @@ -162,6 +179,7 @@ public class Medication { .add("Possible Side Effects: " + this.getPossibleSideEffects()) .add("Administration Method: " + this.getAdministrationMethod()) .add("Current Stock: " + this.getCurrentStock()) + .add("Alternative Medication" + this.getAlternativeMedication()) .toString(); } diff --git a/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java b/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java index fa89b39..d30c609 100644 --- a/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java +++ b/src/main/java/de/hitec/nhplus/medication/MedicationModalController.java @@ -70,7 +70,8 @@ public class MedicationModalController { new ArrayList<>(), "", "", - 0 + 0, + new ArrayList<>() ); this.buttonSave.setDisable(true); } @@ -161,10 +162,11 @@ public class MedicationModalController { alternativeMediaction.add(new Medication( null, null, - List.of(), + new ArrayList<>(), null, null, - -1 + -1, + new ArrayList<>() )); } } diff --git a/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java b/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java index e226770..97d5fe6 100644 --- a/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java +++ b/src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java @@ -63,6 +63,18 @@ public class MedicationDao implements Dao { ingredientStatement.setString(2, ingredient.getName()); ingredientStatement.execute(); } + + final String alternativeMedicationSQL = """ + INSERT INTO medication_alternative + (id, alternativeId) + VALUES (?, ?); + """; + for (Medication alternative : medication.getAlternativeMedication()) { + PreparedStatement alternativeStatement = this.connection.prepareStatement(alternativeMedicationSQL); + alternativeStatement.setInt(1, newId); + alternativeStatement.setInt(2, alternative.getId()); + alternativeStatement.execute(); + } } @Override @@ -82,7 +94,7 @@ public class MedicationDao implements Dao { @Override public List readAll() throws SQLException { final String SQL = """ - SELECT medication.*, medication_ingredient.name + SELECT medication.*, medication_ingredient.name, medication_alternative.alternativeId FROM medication LEFT JOIN medication_ingredient ON medication.id = medication_ingredient.id """; @@ -103,7 +115,8 @@ public class MedicationDao implements Dao { new ArrayList<>(), result.getString(4), result.getString(5), - result.getInt(6) + result.getInt(6), + new ArrayList<>() ); medications.add(medication); } @@ -188,10 +201,11 @@ public class MedicationDao implements Dao { result.getInt(1), result.getString(2), result.getString(3), - List.of(), + new ArrayList<>(), result.getString(4), result.getString(5), - result.getInt(6) + result.getInt(6), + new ArrayList<>() ); List ingredients = new ArrayList<>(); diff --git a/src/main/resources/de/hitec/nhplus/medication/database/Medication_AlternativeMedication.sql b/src/main/resources/de/hitec/nhplus/medication/database/Medication_AlternativeMedication.sql new file mode 100644 index 0000000..76e3364 --- /dev/null +++ b/src/main/resources/de/hitec/nhplus/medication/database/Medication_AlternativeMedication.sql @@ -0,0 +1,7 @@ +CREATE TABLE medication_alternative +( + id INTEGER NOT NULL , + alternativeId INTEGER NOT NULL , + FOREIGN KEY (id) REFERENCES medication (id) ON DELETE CASCADE, + FOREIGN KEY (alternativeId) REFERENCES medication (id) ON DELETE CASCADE +) \ No newline at end of file