Skip to content

Commit 6f0ca49

Browse files
goekaygoekay
committed
split "street_and_house_number" into "street" and "house_number" in db
1 parent 16e8e59 commit 6f0ca49

9 files changed

Lines changed: 30 additions & 33 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public void delete(DSLContext ctx, SelectConditionStep<Record1<Integer>> address
7777

7878
private Integer insert(DSLContext ctx, Address ad) {
7979
int count = ctx.insertInto(ADDRESS)
80-
.set(ADDRESS.STREET_AND_HOUSE_NUMBER, ad.getStreetAndHouseNumber())
80+
.set(ADDRESS.STREET, ad.getStreet())
81+
.set(ADDRESS.HOUSE_NUMBER, ad.getHouseNumber())
8182
.set(ADDRESS.ZIP_CODE, ad.getZipCode())
8283
.set(ADDRESS.CITY, ad.getCity())
8384
.set(ADDRESS.COUNTRY, ad.getCountry())
@@ -94,7 +95,8 @@ private Integer insert(DSLContext ctx, Address ad) {
9495

9596
private void update(DSLContext ctx, Address ad) {
9697
int count = ctx.update(ADDRESS)
97-
.set(ADDRESS.STREET_AND_HOUSE_NUMBER, ad.getStreetAndHouseNumber())
98+
.set(ADDRESS.STREET, ad.getStreet())
99+
.set(ADDRESS.HOUSE_NUMBER, ad.getHouseNumber())
98100
.set(ADDRESS.ZIP_CODE, ad.getZipCode())
99101
.set(ADDRESS.CITY, ad.getCity())
100102
.set(ADDRESS.COUNTRY, ad.getCountry())

‎src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public static Address recordToDto(AddressRecord record) {
2020
Address address = new Address();
2121
if (record != null) {
2222
address.setAddressPk(record.getAddressPk());
23-
address.setStreetAndHouseNumber(record.getStreetAndHouseNumber());
23+
address.setStreet(record.getStreet());
24+
address.setHouseNumber(record.getHouseNumber());
2425
address.setZipCode(record.getZipCode());
2526
address.setCity(record.getCity());
2627
address.setCountry(record.getCountry());

‎src/main/java/de/rwth/idsg/steve/web/dto/Address.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ public class Address {
1414
// Internal database id
1515
private Integer addressPk;
1616

17-
private String streetAndHouseNumber;
17+
private String street;
18+
private String houseNumber;
1819
private String zipCode;
1920
private String city;
2021
private String country;
2122

2223
public boolean isEmpty() {
2324
return addressPk == null
24-
&& streetAndHouseNumber == null
25+
&& street == null
26+
&& houseNumber == null
2527
&& zipCode == null
2628
&& city == null
2729
&& country == null;

‎src/main/resources/db/migration/V0_8_7__update.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--
2+
-- split "street_and_house_number" into "street" and "house_number"
3+
--
4+
5+
ALTER TABLE `address`
6+
CHANGE COLUMN `street_and_house_number` `street` VARCHAR(1000),
7+
ADD house_number varchar(255) AFTER `street`;

‎src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
2+
<table class="userInput">
3+
<thead><tr><th>Address</th><th></th></thead>
4+
<tr><td>Street:</td><td><form:input path="address.street"/></td></tr>
5+
<tr><td>House Number:</td><td><form:input path="address.houseNumber"/></td></tr>
6+
<tr><td>Zip code:</td><td><form:input path="address.zipCode"/></td></tr>
7+
<tr><td>City:</td><td><form:input path="address.city"/></td></tr>
8+
<tr><td>Country:</td><td><form:input path="address.country"/></td></tr>
9+
</table>

‎src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@
2828
</tbody>
2929
</table>
3030

31-
<table class="userInput">
32-
<thead><tr><th>Address</th><th></th></thead>
33-
<tr><td>Street and House Number:</td><td><form:input path="address.streetAndHouseNumber"/></td></tr>
34-
<tr><td>Zip code:</td><td><form:input path="address.zipCode"/></td></tr>
35-
<tr><td>City:</td><td><form:input path="address.city"/></td></tr>
36-
<tr><td>Country:</td><td><form:input path="address.country"/></td></tr>
37-
</table>
31+
<%@ include file="00-address.jsp" %>
3832

3933
<table class="userInput">
4034
<thead><tr><th>Misc.</th><th></th></thead>

‎src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,7 @@
5050
</table>
5151

5252
<form:hidden path="address.addressPk" readonly="true"/>
53-
<table class="userInput">
54-
<thead><tr><th>Address</th><th></th></thead>
55-
<tr><td>Street and House Number:</td><td><form:input path="address.streetAndHouseNumber"/></td></tr>
56-
<tr><td>Zip code:</td><td><form:input path="address.zipCode"/></td></tr>
57-
<tr><td>City:</td><td><form:input path="address.city"/></td></tr>
58-
<tr><td>Country:</td><td><form:input path="address.country"/></td></tr>
59-
</table>
53+
<%@ include file="00-address.jsp" %>
6054

6155
<table class="userInput">
6256
<thead><tr><th>Misc.</th><th></th></thead>

‎src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@
3535
<tr><td>Additional Note:</td><td><form:input path="note"/></td></tr>
3636
</table>
3737

38-
<table class="userInput">
39-
<thead><tr><th>Address</th><th></th></thead>
40-
<tr><td>Street and House Number:</td><td><form:input path="address.streetAndHouseNumber"/></td></tr>
41-
<tr><td>Zip code:</td><td><form:input path="address.zipCode"/></td></tr>
42-
<tr><td>City:</td><td><form:input path="address.city"/></td></tr>
43-
<tr><td>Country:</td><td><form:input path="address.country"/></td></tr>
44-
</table>
38+
<%@ include file="00-address.jsp" %>
4539

4640
<table class="userInput">
4741
<thead><tr><th>OCPP</th><th></th></thead>

‎src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@
3737
</table>
3838

3939
<form:hidden path="address.addressPk" readonly="true"/>
40-
<table class="userInput">
41-
<thead><tr><th>Address</th><th></th></thead>
42-
<tr><td>Street and House Number:</td><td><form:input path="address.streetAndHouseNumber"/></td></tr>
43-
<tr><td>Zip code:</td><td><form:input path="address.zipCode"/></td></tr>
44-
<tr><td>City:</td><td><form:input path="address.city"/></td></tr>
45-
<tr><td>Country:</td><td><form:input path="address.country"/></td></tr>
46-
</table>
40+
<%@ include file="00-address.jsp" %>
4741

4842
<table class="userInput">
4943
<thead><tr><th>OCPP</th><th></th></thead>

0 commit comments

Comments
 (0)