migrate to postgres (#65)

Author: JacquesBorsenberger

README.md

@@ -6,15 +6,11 @@
 
 ### Run integration tests
 
-To run the integration tests, a cassandra distribution is downloaded automatically once for all the projects at the first execution for your user. It is stored in $HOME/.embedded-cassandra . For this first execution, you need http internet access, and if you are a on a restricted network requiring a proxy, you need to set the proxy details. In addition to the standard java system properties -DproxyHost, -DproxyPort, we use -DproxyUser and -DproxyPassword for authenticated proxies. In IDEs, set them in the tests system properties (usually in the "Edit run configuration" menu). For maven CLI, either set them in MAVEN_OPTS or directly on the command line:
+Please read [liquibase usage](https://github.com/powsybl/powsybl-parent/#liquibase-usage) for instructions to automatically generate changesets.
+After you generated a changeset do not forget to add it to git and in src/resource/db/changelog/db.changelog-master.yml
 
-```bash
-$ export MAVEN_OPTS="-DproxyHost=proxy.com -DproxyPort=8080 -DproxyUser=user -DproxyPassword=XXXX"
-$ mvn verify
-```
-
-OR
 
-```bash
-$ mvn verify -DproxyHost=proxy.com -DproxyPort=8080 -DproxyUser=user -DproxyPassword=XXXX
+The old way to automatically generate the sql schema file (directly using hibernate) can still be used for debugging. Use the following command:
+```
+mvn package -DskipTests && rm -f src/main/resources/geoData.sql && java  -jar target/gridsuite-geo-data-server-1.0.0-SNAPSHOT-exec.jar --spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create 
 ```

geo-data-server/pom.xml

@@ -20,6 +20,9 @@
     <name>Geo data server</name>
     <description>Geographical data server</description>
 
+    <properties>
+        <liquibase-hibernate-package>org.gridsuite.geodata.server</liquibase-hibernate-package>
+    </properties>
     <build>
         <pluginManagement>
             <plugins>
@@ -52,14 +55,11 @@
 
     <dependencies>
         <!-- compile scope -->
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-cassandra</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -89,20 +89,36 @@
             <artifactId>gridsuite-geo-data-extensions</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
 
         <!-- runtime scope -->
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-config-classic</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
-        <!-- test scope -->
+        <!-- PostgreSQL -->
         <dependency>
-            <groupId>com.github.nosan</groupId>
-            <artifactId>embedded-cassandra-spring-test</artifactId>
-            <scope>test</scope>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <scope>runtime</scope>
         </dependency>
+
+        <!-- test scope -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -117,13 +133,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
-            <!-- cassandra driver 4.0 already brings an org.json and vaadin json is only a subset of org.json -->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.vaadin.external.google</groupId>
-                    <artifactId>android-json</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -146,5 +155,11 @@
             <artifactId>powsybl-iidm-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>

geo-data-server/src/main/java/org/gridsuite/geodata/server/CassandraConfig.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.geodata.server;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * @author Jacques Borsenberger <jacques.borsenebrger at rte-france.com>
+ */
+
+@Configuration
+@PropertySource(value = {"classpath:database.properties"})
+@PropertySource(value = {"file:/config/database.properties"}, ignoreResourceNotFound = true)
+public class DataSourceConfig {
+}

geo-data-server/src/main/java/org/gridsuite/geodata/server/DataSourceConfig.java

@@ -18,6 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -27,6 +28,7 @@
 
 /**
  * @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
+ * @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
  */
 @Service
 public class GeoDataService {
@@ -42,15 +44,16 @@ public class GeoDataService {
     @Autowired
     private LineRepository lineRepository;
 
-    @Autowired
-    private LineCustomRepository lineCustomRepository;
+    private Set<String> toCountryIds(Collection<Country> countries) {
+        return countries.stream().map(Country::name).collect(Collectors.toSet());
+    }
 
     private Map<String, SubstationGeoData> readSubstationGeoDataFromDb(Set<Country> countries) {
         // read substations from DB
-        // TODO filter by country
         StopWatch stopWatch = StopWatch.createStarted();
 
-        List<SubstationEntity> substationEntities = substationRepository.findAll();
+        List<SubstationEntity> substationEntities = countries.isEmpty() ? substationRepository.findAll() :
+            substationRepository.findByCountryIn(toCountryIds(countries));
         Map<String, SubstationGeoData> substationsGeoDataDB = substationEntities.stream()
                 .map(SubstationEntity::toGeoData)
                 .collect(Collectors.toMap(SubstationGeoData::getId, Function.identity()));
@@ -300,26 +303,24 @@ private List<Coordinate> addCoordinates(Coordinate substationStart, List<Coordin
 
     }
 
-    List<LineGeoData> getLines(Network network, Set<Country> countries) {
+    @Transactional(readOnly = true)
+    public List<LineGeoData> getLines(Network network, Set<Country> countries) {
         LOGGER.info("Loading lines geo data for countries {} of network '{}'", countries, network.getId());
 
         Objects.requireNonNull(network);
         Objects.requireNonNull(countries);
 
         StopWatch stopWatch = StopWatch.createStarted();
+        Set<String> lineIds = new TreeSet<>();
 
+        network.getLines().forEach(l -> lineIds.add(l.getId()));
         // read lines from DB
-        // TODO filter by country
-        Map<String, LineGeoData> linesGeoDataDb = lineCustomRepository.getLines();
+        Map<String, LineGeoData> linesGeoDataDb  = lineRepository.findAllById(lineIds).stream().collect(Collectors.toMap(LineEntity::getId, this::toDto));
 
-        List<Line> lines = network.getLineStream()
-                .filter(line -> countries.isEmpty()
-                        || line.getTerminal1().getVoltageLevel().getSubstation().orElseThrow().getCountry().map(countries::contains).isPresent() // TODO
-                        || line.getTerminal2().getVoltageLevel().getSubstation().orElseThrow().getCountry().map(countries::contains).isPresent()) // TODO
-                .collect(Collectors.toList());
+        List<Line> lines = network.getLineStream().collect(Collectors.toList());
         // we also want the destination substation (so we add the neighbouring country)
         Set<Country> countryAndNextTo =
-            lines.stream().flatMap(line -> line.getTerminals().stream().map(term -> term.getVoltageLevel().getSubstation().orElseThrow().getNullableCountry()).filter(Objects::nonNull)) // TODO
+            lines.stream().flatMap(line -> line.getTerminals().stream().map(term -> term.getVoltageLevel().getSubstation().orElseThrow().getNullableCountry()).filter(Objects::nonNull))
             .collect(Collectors.toSet());
         Map<String, SubstationGeoData> substationGeoDataDb = getSubstationMap(network, countryAndNextTo);
         List<LineGeoData> lineGeoData = lines.stream().map(line -> getLineGeoDataWithEndSubstations(linesGeoDataDb, substationGeoDataDb, line))
@@ -329,6 +330,21 @@ List<LineGeoData> getLines(Network network, Set<Country> countries) {
         return lineGeoData;
     }
 
+    private LineGeoData toDto(LineEntity lineEntity) {
+        return new LineGeoData(lineEntity.getId(), toDtoCountry(lineEntity.getCountry()),
+            toDtoCountry(lineEntity.getOtherCountry()), lineEntity.getSubstationStart(), lineEntity.getSubstationEnd(),
+            toDto(lineEntity.getCoordinates())
+        );
+    }
+
+    private Country toDtoCountry(String country) {
+        return Country.valueOf(country);
+    }
+
+    private List<Coordinate> toDto(List<CoordinateEmbeddable> coordinates) {
+        return coordinates.stream().map(e -> new Coordinate(e.getLat(), e.getLon())).collect(Collectors.toList());
+    }
+
     private Map<String, SubstationGeoData> getSubstationMap(Network network, Set<Country> countries) {
         return getSubstations(network, countries).stream().collect(Collectors.toMap(SubstationGeoData::getId, Function.identity()));
     }

geo-data-server/src/main/java/org/gridsuite/geodata/server/GeoDataService.java

@@ -8,29 +8,32 @@
 
 import lombok.*;
 import org.gridsuite.geodata.extensions.Coordinate;
-import org.springframework.data.cassandra.core.mapping.UserDefinedType;
 
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
  * @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
  */
-@UserDefinedType("coordinate")
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter
 @Builder
 @ToString
-public class CoordinateEntity {
+@Embeddable
+public class CoordinateEmbeddable {
 
+    @Column(name = "latitude")
     private double lat;
 
+    @Column(name = "longitude")
     private double lon;
 
-    static List<CoordinateEntity> create(List<Coordinate> coordinates) {
+    static List<CoordinateEmbeddable> create(List<Coordinate> coordinates) {
         return coordinates.stream()
-                .map(p -> CoordinateEntity.builder()
+                .map(p -> CoordinateEmbeddable.builder()
                         .lat(p.getLat())
                         .lon(p.getLon())
                         .build())