Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Hando Lukats

See merge request teis/xroad-gateway!135

CHANGELOG.md

 # Changelog
 
+## [2.3.0] - 2022-09-16
+
+* TEIS-3434: fixed datetime conversion for ljvis xml
+
 ## [2.2.0] - 2022-08-26
 
 * TEIS-3402: improved getting certs from KIRST logic; minor other fixes

gradle.properties

 theGroup=ee.sm.ti.teis
-theVersion=2.2.0
+theVersion=2.3.0
 commonsVersion=2.7.0
 commonApiGatewayVersion=2.6.0
 pluginVersion=2.3.0

service/src/main/java/ee/sm/ti/teis/xroadgateway/ljvis/service/LJVISXroadComposeService.java

@@ -113,9 +113,13 @@ public class LJVISXroadComposeService {
         return infringementsNumbers;
     }
 
-    private XMLGregorianCalendar getXMLGregorianCalendar(LocalDateTime dateTime) {
+    public XMLGregorianCalendar getXMLGregorianCalendar(LocalDateTime dateTime) {
+        String dateTimeString = dateTime.toString();
+        if (dateTime.getSecond() == 0 && dateTime.getNano() == 0) {
+            dateTimeString += ":00";
+        }
         try {
-            return DatatypeFactory.newInstance().newXMLGregorianCalendar(dateTime.toString());
+            return DatatypeFactory.newInstance().newXMLGregorianCalendar(dateTimeString);
         } catch (DatatypeConfigurationException e) {
             throw new TeisIllegalArgumentException("Error encoding LocalDate to XMLGregorianCalendar format");
         }

service/src/test/java/ee/sm/ti/teis/xroadgateway/ljvis/service/LJVISXroadComposeServiceTest.java

@@ -11,6 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -67,6 +68,20 @@ class LJVISXroadComposeServiceTest {
         assertThrows(ArithmeticException.class, () -> composeService.composeInspectionData(payload));
     }
 
+    @Test
+    void getXMLGregorianCalendar_keepsProvidedSeconds_seconds() {
+        LocalDateTime dateTime = LocalDateTime.of(2012, 10, 1, 12, 12, 12);
+        XMLGregorianCalendar xmlGregorianCalendar = composeService.getXMLGregorianCalendar(dateTime);
+        assertThat(xmlGregorianCalendar.getSecond()).isEqualTo(12);
+    }
+
+    @Test
+    void getXMLGregorianCalendar_addsSecondsIfNotProvided_success() {
+        LocalDateTime dateTime = LocalDateTime.of(2012, 10, 1, 12, 12);
+        XMLGregorianCalendar xmlGregorianCalendar = composeService.getXMLGregorianCalendar(dateTime);
+        assertThat(xmlGregorianCalendar.getSecond()).isEqualTo(0);
+    }
+
     private LJVISDriversInspectionData composeData() {
         return LJVISDriversInspectionData.builder()
                 .convictedPersonCode("12")