From 55f3fd7c0decca6cfc82791e77cbae549d9d9b8b Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Mon, 7 May 2018 17:16:24 +0200
Subject: Add hasNef property to VehicleDatabaseDao.add
---
.../einsatzverwaltung/dao/VehicleDatabaseDao.java | 25 ++++++++++++----------
1 file changed, 14 insertions(+), 11 deletions(-)
(limited to 'src/main/java/at/ac/tuwien/sepm')
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
index 5ddb035..6beb994 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDao.java
@@ -24,12 +24,13 @@ public class VehicleDatabaseDao implements VehicleDAO {
}
public long add(Vehicle vehicle) throws PersistenceException {
- String query1 = "INSERT INTO VehicleVersion (name,constructionType,type) VALUES (?,?,?)";
+ String query1 =
+ "INSERT INTO VehicleVersion (name,hasNef,constructionType,type) VALUES (?,?,?,?)";
String query2 = "INSERT INTO Vehicle (version,status) VALUES (?,?)";
PreparedStatement p1 = null;
PreparedStatement p2 = null;
PreparedStatement p3 = null;
- String status = "abgemeldet";
+ String status = "ABGEMELDET";
String name = "";
int id = -1;
try {
@@ -38,11 +39,12 @@ public class VehicleDatabaseDao implements VehicleDAO {
.getConnection()
.prepareStatement(query1, PreparedStatement.RETURN_GENERATED_KEYS);
p1.setString(1, name);
- p1.setString(2, vehicle.constructionType().name());
+ p1.setBoolean(2, vehicle.hasNef());
+ p1.setString(3, vehicle.constructionType().name());
if (vehicle.type() == VehicleType.KTW_B) {
- p1.setString(3, "KTW-B");
+ p1.setString(4, "KTW-B");
} else {
- p1.setString(3, vehicle.type().name());
+ p1.setString(4, vehicle.type().name());
}
p1.executeUpdate();
@@ -115,12 +117,13 @@ public class VehicleDatabaseDao implements VehicleDAO {
while (rs.next()) {
Vehicle vehicle =
Vehicle.builder()
- .name(rs.getString(2))
- .constructionType(ConstructionType.valueOf(rs.getString(3)))
- .status(Status.valueOf(rs.getString(8)))
- .id(rs.getInt(6))
- .hasNef(rs.getBoolean(5))
- .type(VehicleType.valueOf(rs.getString(4)))
+ .name(rs.getString("name"))
+ .constructionType(
+ ConstructionType.valueOf(rs.getString("constructionType")))
+ .status(Status.valueOf(rs.getString("status")))
+ .id(rs.getInt("id"))
+ .hasNef(rs.getBoolean("hasNef"))
+ .type(VehicleType.valueOf(rs.getString("type")))
.build();
result.add(vehicle);
}
--
cgit v1.2.3-70-g09d2