feat(eoe): switch to imported version

backend/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.hikit</groupId>
             <artifactId>common</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>org.sec</groupId>

backend/src/main/java/org/sc/adapter/AltitudeServiceWrapper.kt

@@ -0,0 +1,21 @@
+package org.sc.adapter
+
+import org.hikit.common.adapter.AltitudeServiceAdapter
+import org.sc.common.rest.CoordinatesDto
+import org.sc.data.model.Coordinates
+import org.sc.data.model.Coordinates2D
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+
+
+@Service
+class AltitudeServiceWrapper @Autowired constructor(private val altitudeServiceAdapter: AltitudeServiceAdapter) {
+    fun mapCoordsWithElevations(coordinates: List<Coordinates2D>): List<Coordinates> =
+        altitudeServiceAdapter.getElevationsByLongLat(coordinates.map { Pair(it.latitude, it.longitude) })
+            .mapIndexed{ index, altitude ->
+                CoordinatesDto(coordinates[index].latitude,
+                    coordinates[index].longitude, altitude) }
+
+    fun getElevationsByLongLat(latitude: Double, longitude: Double) = altitudeServiceAdapter.getElevationsByLongLat(latitude, longitude)
+    fun getElevationsByLongLat(coordinates: List<Pair<Double, Double>>) = altitudeServiceAdapter.getElevationsByLongLat(coordinates)
+}

backend/src/main/java/org/sc/controller/AccessibilityReportController.java

@@ -1,9 +1,11 @@
 package org.sc.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+import org.apache.commons.lang3.StringUtils;
 import org.hikit.common.response.ControllerPagination;
 import org.sc.common.rest.AccessibilityReportDto;
 import org.sc.common.rest.CountDto;
+import org.sc.common.rest.SortOrderDto;
 import org.sc.common.rest.Status;
 import org.sc.common.rest.response.AccessibilityReportResponse;
 import org.sc.common.rest.response.CountResponse;

backend/src/main/java/org/sc/data/entity/mapper/AccessibilityNotificationMapper.java

@@ -55,7 +55,7 @@ public Document mapToDocument(final AccessibilityNotification accessibilityNotif
                 .append(AccessibilityNotification.IS_MINOR, accessibilityNotification.isMinor())
                 .append(AccessibilityNotification.COORDINATES,
                         coordinatesMapper.mapToDocument(accessibilityNotification.getCoordinates()))
-                .append(AccessibilityNotification.RESOLUTION, accessibilityNotification.getResolution())
+                .append(AccessibilityNotification.RESOLUTION, accessibilityNotification.getNotificationId())
                 .append(AccessibilityNotification.RECORD_DETAILS,
                         recordDetailsMapper.mapToDocument(accessibilityNotification.getRecordDetails()));
     }

backend/src/main/java/org/sc/data/mapper/AccessibilityReportMapper.java

@@ -8,6 +8,7 @@
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR)
 public interface AccessibilityReportMapper {
+    @Mapping(target = "sortKeys", ignore = true)
     AccessibilityReportDto map(AccessibilityReport ar);
 
     @Mapping(target = "validationId", ignore = true)

backend/src/main/java/org/sc/data/repository/AccessibilityNotificationDAO.java → backend/src/main/java/org/sc/data/repository/AccessibilityNotificationDao.java

@@ -26,23 +26,24 @@
 import static org.sc.data.repository.MongoUtils.*;
 
 @Repository
-public class AccessibilityNotificationDAO {
-    private static final Logger LOGGER = getLogger(AccessibilityNotificationDAO.class);
+public class AccessibilityNotificationDao {
+    private static final Logger LOGGER = getLogger(AccessibilityNotificationDao.class);
     public static final String COLLECTION_REALM_STRUCTURE = AccessibilityNotification.RECORD_DETAILS + DOT + FileDetails.REALM;
 
     private final MongoCollection<Document> collection;
 
     private final AccessibilityNotificationMapper mapper;
 
     @Autowired
-    public AccessibilityNotificationDAO(final Datasource dataSource,
+    public AccessibilityNotificationDao(final Datasource dataSource,
                                         final AccessibilityNotificationMapper mapper) {
         this.collection = dataSource.getDB().getCollection(AccessibilityNotification.COLLECTION_NAME);
         this.mapper = mapper;
     }
 
     public List<AccessibilityNotification> getUnresolved(final int skip,
-                                                         final int limit, String realm) {
+                                                         final int limit,
+                                                         String realm) {
         return toNotificationList(collection.find(
                         MongoUtils.getConditionalEqFilter(realm, COLLECTION_REALM_STRUCTURE)
                                 .append(AccessibilityNotification.RESOLUTION, ""))

backend/src/main/java/org/sc/data/repository/AccessibilityReportDao.java

@@ -118,7 +118,7 @@ public List<AccessibilityReport> getUnapgradedByRealm(final String realm, final
                         new Document(AccessibilityReport.RECORD_DETAILS + "." + RecordDetails.REALM, realm)
                                 .append(AccessibilityReport.ISSUE_ID, "")
                                 .append(AccessibilityReport.IS_VALID, true))
-                .sort(new Document(AccessibilityReport.REPORT_DATE, MongoUtils.ASCENDING_ORDER))
+                .sort(new Document(AccessibilityReport.REPORT_DATE, MongoUtils.DESCENDING_ORDER))
                 .skip(skip)
                 .limit(limit)
         );

backend/src/main/java/org/sc/manager/AccessibilityNotificationManager.kt

@@ -6,14 +6,14 @@ import org.sc.configuration.auth.AuthFacade
 import org.sc.data.mapper.AccessibilityNotificationMapper
 import org.sc.data.model.Coordinates2D
 import org.sc.data.model.RecordDetails
-import org.sc.data.repository.AccessibilityNotificationDAO
+import org.sc.data.repository.AccessibilityNotificationDao
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import java.util.*
 
 @Component
 class AccessibilityNotificationManager @Autowired constructor(
-    private val accessibilityDAO: AccessibilityNotificationDAO,
+    private val accessibilityDAO: AccessibilityNotificationDao,
     private val accessibilityMapper: AccessibilityNotificationMapper,
     private val authFacade: AuthFacade
 ) {

backend/src/main/java/org/sc/manager/GeoToolManager.kt

@@ -1,13 +1,13 @@
 package org.sc.manager
 
-import org.sc.adapter.AltitudeServiceAdapter
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.CoordinatesDto
 import org.sc.processor.TrailsStatsCalculator
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
 @Component
-class GeoToolManager @Autowired constructor(private val altitudeService : AltitudeServiceAdapter,
+class GeoToolManager @Autowired constructor(private val altitudeService : AltitudeServiceWrapper,
                                             private val trailsStatsCalculator: TrailsStatsCalculator) {
 
     fun getAltitudeByLongLat(latitude: Double, longitude: Double) =

backend/src/main/java/org/sc/manager/PlaceManager.kt

@@ -1,6 +1,6 @@
 package org.sc.manager
 
-import org.sc.adapter.AltitudeServiceAdapter
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.*
 import org.sc.configuration.auth.AuthFacade
 import org.sc.data.mapper.LinkedMediaMapper
@@ -19,7 +19,7 @@ class PlaceManager @Autowired constructor(
         private val placeMapper: PlaceMapper,
         private val trailManager: TrailManager,
         private val linkedMediaMapper: LinkedMediaMapper,
-        private val altitudeServiceAdapter: AltitudeServiceAdapter,
+        private val altitudeServiceAdapter: AltitudeServiceWrapper,
         private val resourceManager: ResourceManager,
         private val authFacade: AuthFacade
 ) {

backend/src/main/java/org/sc/manager/TrailFileManager.kt

@@ -5,6 +5,7 @@ import de.micromata.opengis.kml.v_2_2_0.Kml
 import de.micromata.opengis.kml.v_2_2_0.LineString
 import io.jenetics.jpx.GPX
 import io.jenetics.jpx.Metadata
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.*
 import org.sc.configuration.AppProperties
 import org.sc.configuration.AppProperties.DISPLAYED_VERSION
@@ -15,7 +16,6 @@ import org.sc.data.validator.FileNameValidator
 import org.sc.processor.GpxFileHandlerHelper
 import org.sc.processor.TrailsStatsCalculator
 import org.sc.processor.pdf.PdfFileHelper
-import org.sc.adapter.AltitudeServiceAdapter
 import org.sc.configuration.auth.AuthData
 import org.sc.util.FileManagementUtil
 import org.springframework.beans.factory.annotation.Autowired
@@ -37,7 +37,7 @@ class TrailFileManager @Autowired constructor(
     private val gpxFileHandlerHelper: GpxFileHandlerHelper,
     private val pdfFileHandlerHelper: PdfFileHelper,
     private val trailsStatsCalculator: TrailsStatsCalculator,
-    private val altitudeService: AltitudeServiceAdapter,
+    private val altitudeService: AltitudeServiceWrapper,
     private val trailCoordinatesMapper: TrailCoordinatesMapper,
     private val fileManagementUtil: FileManagementUtil,
     private val fileNameValidator: FileNameValidator,

backend/src/main/java/org/sc/manager/TrailIntersectionManager.kt

@@ -1,6 +1,6 @@
 package org.sc.manager
 
-import org.sc.adapter.AltitudeServiceAdapter
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.TrailIntersectionDto
 import org.sc.common.rest.geo.GeoLineDto
 import org.sc.data.mapper.TrailIntersectionMapper
@@ -17,7 +17,7 @@ class TrailIntersectionManager @Autowired constructor(
     private val trailDAO: TrailDAO,
     private val trailIntersectionProcessor: TrailIntersectionProcessor,
     private val trailIntersectionMapper: TrailIntersectionMapper,
-    private val altitudeServiceAdapter: AltitudeServiceAdapter
+    private val altitudeServiceAdapter: AltitudeServiceWrapper
 ) {
 
     fun findIntersection(geoLineDto: GeoLineDto, skip: Int, limit: Int): List<TrailIntersectionDto> {

backend/src/main/java/org/sc/service/CustomItineraryService.kt

@@ -1,6 +1,6 @@
 package org.sc.service
 
-import org.sc.adapter.AltitudeServiceAdapter
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.CustomItineraryRequestDto
 import org.sc.common.rest.CustomItineraryResultDto
 import org.sc.common.rest.StatsTrailMetadataDto
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service
 class CustomItineraryService @Autowired constructor(
     private val trailPreviewMapper: TrailPreviewMapper,
     private val accessibilityNotificationManager: AccessibilityNotificationManager,
-    private val altitudeService: AltitudeServiceAdapter,
+    private val altitudeService: AltitudeServiceWrapper,
     private val trailsStatsCalculator: TrailsStatsCalculator,
     private val trailIntersectionManager: TrailIntersectionManager,
     private val trailFileManager: TrailFileManager

backend/src/main/java/org/sc/service/DiagnosticService.kt

@@ -1,6 +1,6 @@
 package org.sc.service
 
-import org.sc.adapter.AltitudeServiceAdapter
+import org.sc.adapter.AltitudeServiceWrapper
 import org.sc.common.rest.response.DiagnoseResponse
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
@@ -10,7 +10,7 @@ import java.util.concurrent.CompletionStage
 
 @Service
 class DiagnosticService @Autowired constructor(
-        private val altitudeServiceAdapter: AltitudeServiceAdapter) {
+        private val altitudeServiceAdapter: AltitudeServiceWrapper) {
 
     companion object {
         const val altitudeServiceName = "Altitude Service"

backend/src/main/resources/application.properties

@@ -2,10 +2,6 @@
 server.servlet.contextPath=/api/v1/
 server.port=8990
 
-# OpenAltitude Service
-service.altitude.port=8080
-service.altitude.host=localhost
-
 # DB settings
 db.name=prod
 db.uri=mongodb://localhost:27017
@@ -40,7 +36,7 @@ spring.mail.host=mail.tophost.it
 spring.mail.port=587
 spring.mail.username=sentieriecartografia.it88438
 spring.mail.from=dev-test@sentieriecartografia.it
-spring.mail.password=W?Bz08aZet
+spring.mail.password=6OQQ*gaW4R
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 
@@ -83,6 +79,11 @@ job.crossway.consistency.distance=50.0
 spring.jackson.serialization.write_dates_as_timestamps=false
 
 # Microservices
+
+# OpenAltitude Service
+microservice.oa.port=8090
+microservice.oa.host=localhost
+
 microservice.ert.localities.enabled=true
 microservice.ert.events.enabled=true
 microservice.ert.localities=http://localhost:8991/api/v1/locality