src/main/java/de/hitec/nhplus/fixtures/MedicationFixture.java

@@ -67,6 +67,7 @@ public class MedicationFixture implements Fixture<Medication> {
         Ingredient warfarinnatrium = new Ingredient("Warfarinnatrium");
 
         medications.add(new Medication(
+                1,
                 "Metformin",
                 "AstraZeneca",
                 List.of(
@@ -80,6 +81,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 100
         ));
         medications.add(new Medication(
+                2,
                 "Lisinopril",
                 "Teva Pharmaceuticals",
                 List.of(
@@ -93,6 +95,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 150
         ));
         medications.add(new Medication(
+                3,
                 "Simvastatin",
                 "Mylan",
                 List.of(
@@ -106,6 +109,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 80
         ));
         medications.add(new Medication(
+                4,
                 "Enoxaparin",
                 "Sanofi",
                 List.of(
@@ -118,6 +122,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 120
         ));
         medications.add(new Medication(
+                5,
                 "Levothyroxin",
                 "Sandoz",
                 List.of(
@@ -131,6 +136,7 @@ public class MedicationFixture implements Fixture<Medication> {
                 90
         ));
         medications.add(new Medication(
+                6,
                 "Warfarin",
                 "Apotex Inc.",
                 List.of(

src/main/java/de/hitec/nhplus/medication/database/MedicationDao.java

@@ -29,7 +29,6 @@ public class MedicationDao implements Dao<Medication> {
 
     @Override
     public void create(Medication medication) throws SQLException {
-        connection.setAutoCommit(false); //Switch to Manual Commit, to do an SQL Transaction
         final String medicationSQL = """
                     INSERT INTO medication
                     (name, manufacturer, possibleSideEffects, administrationMethod, currentStock)
@@ -43,15 +42,6 @@ public class MedicationDao implements Dao<Medication> {
         medicationStatement.setInt(5, medication.getCurrentStock());
         medicationStatement.execute();
 
-        ResultSet generatedKeys = connection.createStatement().executeQuery("SELECT last_insert_rowid()");
-        connection.commit(); //Finish SQL Transaction
-        connection.setAutoCommit(true); //Switch back Mode
-
-        if (!generatedKeys.next()) {
-            return;
-        }
-        int newId = generatedKeys.getInt(1);
-
         final String ingredientSQL = """
                     INSERT INTO medication_ingredient
                     (id, name)
@@ -59,7 +49,7 @@ public class MedicationDao implements Dao<Medication> {
                 """;
         for (Ingredient ingredient : medication.getIngredients()) {
             PreparedStatement ingredientStatement = this.connection.prepareStatement(ingredientSQL);
-            ingredientStatement.setInt(1, newId);
+            ingredientStatement.setInt(1, medication.getId());
             ingredientStatement.setString(2, ingredient.getName());
             ingredientStatement.execute();
         }
@@ -114,9 +104,6 @@ public class MedicationDao implements Dao<Medication> {
             lastMedicationId = currentMedicationId;
         }
         for (Medication medication : medications) {
-            if(!ingredientMap.containsKey(medication.getId())){
-                continue;
-            }
             medication.setIngredients(ingredientMap.get(medication.getId()));
         }