add DB migration and repository impl changes

Author: goekay

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

@@ -99,6 +99,8 @@ private Integer insert(DSLContext ctx, Address ad) {
                       .set(ADDRESS.ZIP_CODE, ad.getZipCode())
                       .set(ADDRESS.CITY, ad.getCity())
                       .set(ADDRESS.COUNTRY, ad.getCountryAlpha2OrNull())
+                      .set(ADDRESS.LATITUDE, ad.getLatitude())
+                      .set(ADDRESS.LONGITUDE, ad.getLongitude())
                       .returning(ADDRESS.ADDRESS_PK)
                       .fetchOne()
                       .getAddressPk();
@@ -114,6 +116,8 @@ private void update(DSLContext ctx, Address ad) {
                        .set(ADDRESS.ZIP_CODE, ad.getZipCode())
                        .set(ADDRESS.CITY, ad.getCity())
                        .set(ADDRESS.COUNTRY, ad.getCountryAlpha2OrNull())
+                       .set(ADDRESS.LATITUDE, ad.getLatitude())
+                       .set(ADDRESS.LONGITUDE, ad.getLongitude())
                        .where(ADDRESS.ADDRESS_PK.eq(ad.getAddressPk()))
                        .execute();
 

src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java

@@ -347,8 +347,6 @@ private int addChargePointInternal(DSLContext ctx, ChargePointForm form, Integer
         return ctx.insertInto(CHARGE_BOX)
                   .set(CHARGE_BOX.CHARGE_BOX_ID, form.getChargeBoxId())
                   .set(CHARGE_BOX.DESCRIPTION, form.getDescription())
-                  .set(CHARGE_BOX.LOCATION_LATITUDE, form.getLocationLatitude())
-                  .set(CHARGE_BOX.LOCATION_LONGITUDE, form.getLocationLongitude())
                   .set(CHARGE_BOX.INSERT_CONNECTOR_STATUS_AFTER_TRANSACTION_MSG, form.getInsertConnectorStatusAfterTransactionMsg())
                   .set(CHARGE_BOX.REGISTRATION_STATUS, form.getRegistrationStatus())
                   .set(CHARGE_BOX.NOTE, form.getNote())
@@ -362,8 +360,6 @@ private int addChargePointInternal(DSLContext ctx, ChargePointForm form, Integer
     private void updateChargePointInternal(DSLContext ctx, ChargePointForm form, Integer addressPk) {
         ctx.update(CHARGE_BOX)
            .set(CHARGE_BOX.DESCRIPTION, form.getDescription())
-           .set(CHARGE_BOX.LOCATION_LATITUDE, form.getLocationLatitude())
-           .set(CHARGE_BOX.LOCATION_LONGITUDE, form.getLocationLongitude())
            .set(CHARGE_BOX.INSERT_CONNECTOR_STATUS_AFTER_TRANSACTION_MSG, form.getInsertConnectorStatusAfterTransactionMsg())
            .set(CHARGE_BOX.REGISTRATION_STATUS, form.getRegistrationStatus())
            .set(CHARGE_BOX.NOTE, form.getNote())

src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java

@@ -40,6 +40,8 @@ public static Address recordToDto(AddressRecord record) {
             address.setZipCode(record.getZipCode());
             address.setCity(record.getCity());
             address.setCountry(CountryCode.getByCode(record.getCountry()));
+            address.setLatitude(record.getLatitude());
+            address.setLongitude(record.getLongitude());
         }
         return address;
     }

src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java

@@ -39,8 +39,6 @@ public static ChargePointForm mapToForm(ChargePoint.Details cp) {
         form.setChargeBoxId(chargeBox.getChargeBoxId());
         form.setNote(chargeBox.getNote());
         form.setDescription(chargeBox.getDescription());
-        form.setLocationLatitude(chargeBox.getLocationLatitude());
-        form.setLocationLongitude(chargeBox.getLocationLongitude());
         form.setInsertConnectorStatusAfterTransactionMsg(chargeBox.getInsertConnectorStatusAfterTransactionMsg());
         form.setAdminAddress(chargeBox.getAdminAddress());
         form.setRegistrationStatus(chargeBox.getRegistrationStatus());

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

@@ -22,6 +22,9 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
+
+import java.math.BigDecimal;
 
 /**
  * @author Sevket Goekay <[email protected]>
@@ -41,13 +44,21 @@ public class Address {
     private String city;
     private CountryCode country;
 
+    @Range(min = -90, max = 90, message = "Latitude must be between {min} and {max}")
+    private BigDecimal latitude;
+
+    @Range(min = -180, max = 180, message = "Longitude must be between {min} and {max}")
+    private BigDecimal longitude;
+
     public boolean isEmpty() {
         return addressPk == null
                 && street == null
                 && houseNumber == null
                 && zipCode == null
                 && city == null
-                && country == null;
+                && country == null
+                && latitude == null
+                && longitude == null;
     }
 
     /**

src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java

@@ -19,6 +19,7 @@
 package de.rwth.idsg.steve.web.dto;
 
 import de.rwth.idsg.steve.web.validation.ChargeBoxId;
+import jakarta.validation.Valid;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -51,14 +52,9 @@ public class ChargePointForm {
     @NotNull
     private Boolean insertConnectorStatusAfterTransactionMsg;
 
+    @Valid
     private Address address;
 
-    @Range(min = -90, max = 90, message = "Latitude must be between {min} and {max}")
-    private BigDecimal locationLatitude;
-
-    @Range(min = -180, max = 180, message = "Longitude must be between {min} and {max}")
-    private BigDecimal locationLongitude;
-
     private String description;
     private String note;
 

src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java

@@ -19,6 +19,7 @@
 package de.rwth.idsg.steve.web.dto;
 
 import de.rwth.idsg.steve.NotificationFeature;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.AssertTrue;
 import lombok.Getter;
 import lombok.Setter;
@@ -60,6 +61,7 @@ public class UserForm {
 
     private List<NotificationFeature> notificationFeatures;
 
+    @Valid
     private Address address;
 
     @AssertTrue(message = "Some of the selected notification features cannot be enabled for a user")

src/main/resources/db/migration/V1_1_0__update.sql

@@ -0,0 +1,39 @@
+START TRANSACTION;
+
+-- Step 1: Add latitude and longitude columns to address table
+ALTER TABLE address
+    ADD COLUMN latitude DECIMAL(11, 8),
+    ADD COLUMN longitude DECIMAL(11, 8);
+
+-- Step 2: Migrate existing lat/long data from charge_box to address table
+-- For charge boxes that already have an address
+UPDATE address a
+    INNER JOIN charge_box cb ON a.address_pk = cb.address_pk
+    SET a.latitude = cb.location_latitude,
+        a.longitude = cb.location_longitude
+WHERE cb.location_latitude IS NOT NULL
+  AND cb.location_longitude IS NOT NULL;
+
+-- Step 3a: Create new address rows for charge boxes without an address but with lat/long
+INSERT INTO address (latitude, longitude)
+SELECT location_latitude, location_longitude
+FROM charge_box
+WHERE address_pk IS NULL
+  AND location_latitude IS NOT NULL
+  AND location_longitude IS NOT NULL;
+
+-- Step 3b: Update charge_box to reference the newly created addresses
+UPDATE charge_box cb
+    INNER JOIN address a ON cb.location_latitude = a.latitude
+    AND cb.location_longitude = a.longitude
+    SET cb.address_pk = a.address_pk
+WHERE cb.address_pk IS NULL
+  AND cb.location_latitude IS NOT NULL
+  AND cb.location_longitude IS NOT NULL;
+
+-- Step 4: Drop the old columns from charge_box
+ALTER TABLE charge_box
+DROP COLUMN location_latitude,
+DROP COLUMN location_longitude;
+
+COMMIT;