Merge pull request #1709 from OSGP/feature/SMHE-2453_Bij_een_retry_de_actuele_ip_gegevens_gebruiken

Feature/smhe 2453 bij een retry de actuele ip gegevens gebruiken

Author: natasja-n

osgp/platform/osgp-core/src/test/java/org/opensmartgridplatform/core/application/services/DeviceResponseMessageServiceTest.java

@@ -30,7 +30,7 @@
 
 /** test class for DeviceResponseMessageService */
 @ExtendWith(MockitoExtension.class)
-public class DeviceResponseMessageServiceTest {
+class DeviceResponseMessageServiceTest {
 
   private static final String DOMAIN = "Domain";
   private static final String DOMAIN_VERSION = "1.0";
@@ -60,7 +60,7 @@ public class DeviceResponseMessageServiceTest {
 
   /** test processMessage with a scheduled task that failed */
   @Test
-  public void testProcessScheduledMessageFailed() {
+  void testProcessScheduledMessageFailed() {
     final ResponseMessageResultType result = ResponseMessageResultType.NOT_OK;
     final Calendar calendar = Calendar.getInstance();
     calendar.add(Calendar.DATE, 1);
@@ -89,7 +89,7 @@ public void testProcessScheduledMessageFailed() {
 
   /** test processMessage with a scheduled task that must be retried */
   @Test
-  public void testProcessScheduledMessageRetry() {
+  void testProcessScheduledMessageRetry() {
     final String exceptionMessage = "message";
     this.testProcessScheduledMessageRetry(exceptionMessage, exceptionMessage);
   }
@@ -141,7 +141,7 @@ private void testProcessScheduledMessageRetry(
    * than 255 characters
    */
   @Test
-  public void testProcessScheduledMessageRetryWithTruncatedError() {
+  void testProcessScheduledMessageRetryWithTruncatedError() {
     final String exceptionMessageWith255Characters = StringUtils.repeat('x', 255);
     final String tooLongExceptionMessage = exceptionMessageWith255Characters + "extra";
     this.testProcessScheduledMessageRetry(
@@ -150,7 +150,7 @@ public void testProcessScheduledMessageRetryWithTruncatedError() {
 
   /** test processMessage with a scheduled task that has been successful */
   @Test
-  public void testProcessScheduledMessageSuccess() {
+  void testProcessScheduledMessageSuccess() {
     final ProtocolResponseMessage message =
         new ProtocolResponseMessage.Builder()
             .messageMetadata(MESSAGE_METADATA.builder().withScheduled(true).build())

osgp/platform/osgp-core/src/test/java/org/opensmartgridplatform/core/application/tasks/ScheduledTaskExecutorServiceTest.java

@@ -207,7 +207,7 @@ void testMetadataOfScheduledTaskToRetryRequest() throws FunctionalException {
     final String deviceIdentification = "device-1";
     final String deviceModelCode = "E,M1,M2,M3,M4";
     final MessageMetadata messageMetadata =
-        this.createMessageMetadata(deviceIdentification, deviceModelCode);
+        this.createMessageMetadata(deviceIdentification, deviceModelCode, null);
     final ScheduledTask scheduledTask =
         new ScheduledTask(messageMetadata, DOMAIN, DOMAIN, DATA_OBJECT, INITIAL_SCHEDULED_TIME);
     final Device device = new Device();
@@ -241,6 +241,50 @@ void testMetadataOfScheduledTaskToRetryRequest() throws FunctionalException {
     assertThat(protocolRequestMessage.getDeviceModelCode()).isEqualTo(deviceModelCode);
   }
 
+  @Test
+  void testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress()
+      throws FunctionalException {
+    final String deviceIdentification = "device-1";
+    final String deviceModelCode = "E,M1,M2,M3,M4";
+    final String oldNetworkAddress = "oldNetworkAddress";
+    final String newNetworkAddress = "newNetworkAddress";
+    final MessageMetadata messageMetadata =
+        this.createMessageMetadata(deviceIdentification, deviceModelCode, oldNetworkAddress);
+
+    final ScheduledTask scheduledTask =
+        new ScheduledTask(messageMetadata, DOMAIN, DOMAIN, DATA_OBJECT, INITIAL_SCHEDULED_TIME);
+    final Device device = new Device();
+    device.setNetworkAddress(newNetworkAddress);
+
+    when(this.scheduledTaskExecutorJobConfig.scheduledTaskPendingDurationMaxSeconds())
+        .thenReturn(-1L);
+    when(this.scheduledTaskExecutorJobConfig.scheduledTaskPageSize()).thenReturn(30);
+    when(this.scheduledTaskRepository.updateStatus(
+            scheduledTask.getId(), ScheduledTaskStatusType.PENDING))
+        .thenReturn(1);
+    when(this.deviceRepository.findByDeviceIdentification(deviceIdentification)).thenReturn(device);
+    when(this.scheduledTaskRepository.findByStatusAndScheduledTimeLessThan(
+            eq(ScheduledTaskStatusType.PENDING), any(Timestamp.class), any(Pageable.class)))
+        .thenReturn(new ArrayList<>());
+    when(this.scheduledTaskRepository.findByStatusAndScheduledTimeLessThan(
+            eq(ScheduledTaskStatusType.NEW), any(Timestamp.class), any(Pageable.class)))
+        .thenReturn(List.of(scheduledTask), Collections.emptyList());
+    when(this.scheduledTaskRepository.findByStatusAndScheduledTimeLessThan(
+            eq(ScheduledTaskStatusType.RETRY), any(Timestamp.class), any(Pageable.class)))
+        .thenReturn(new ArrayList<>());
+    when(this.scheduledTaskExecutorJobConfig.getScheduledTaskThreadPoolSize()).thenReturn(1);
+
+    this.scheduledTaskExecutorService.processScheduledTasks();
+
+    verify(this.deviceRequestMessageService)
+        .processMessage(this.protocolRequestMessageCaptor.capture());
+    final ProtocolRequestMessage protocolRequestMessage =
+        this.protocolRequestMessageCaptor.getValue();
+    assertThat(protocolRequestMessage).isNotNull();
+
+    assertThat(protocolRequestMessage.getIpAddress()).isEqualTo(newNetworkAddress);
+  }
+
   private void whenFindByStatusAndScheduledTime(
       final List<ScheduledTask> pendingTasks,
       final List<ScheduledTask> newTasks,
@@ -295,14 +339,17 @@ private MessageMetadata createExpiredMessageMetadata() {
   }
 
   private MessageMetadata createMessageMetadata() {
-    return this.createMessageMetadata("retryable", null);
+    return this.createMessageMetadata("retryable", null, null);
   }
 
   private MessageMetadata createMessageMetadata(
-      final String deviceIdentification, final String deviceModelCode) {
+      final String deviceIdentification,
+      final String deviceModelCode,
+      final String networkAddress) {
     return this.createMessageMetadataBuilder()
         .withDeviceIdentification(deviceIdentification)
         .withDeviceModelCode(deviceModelCode)
+        .withNetworkAddress(networkAddress)
         .build();
   }