fix deserialization and date field for journalpost, and cleanup code

FINTLabs · Apr 13, 2023 · d08f017 · d08f017
1 parent c1293f4
commit d08f017
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 31 deletions.
diff --git a/src/main/java/no/fintlabs/EgrunnervervJournalpostInstanceToDispatchMappingService.java b/src/main/java/no/fintlabs/EgrunnervervJournalpostInstanceToDispatchMappingService.java
@@ -118,7 +118,7 @@ public EgrunnervervJournalpostInstanceToDispatch map(SakResource sakResource, Lo
                         .tittel(journalpostResource.getTittel())
                         .dokumentDato(
                                 journalpostResource
-                                        .getDokumentetsDato()
+                                        .getOpprettetDato()
                                         .toInstant()
                                         .atZone(ZoneId.systemDefault())
                                         .toLocalDateTime()

diff --git a/src/main/java/no/fintlabs/InstanceConsumerConfiguration.java b/src/main/java/no/fintlabs/InstanceConsumerConfiguration.java
@@ -147,72 +147,74 @@ public ConcurrentMessageListenerContainer<String, InstanceToDispatchEntity> inst
         ).createContainer(topic);
     }
 
-    private Optional<InstanceToDispatchEntity> storeJournalpostInstanceToDispatch(
+    private Optional<InstanceToDispatchEntity> storeSakInstanceToDispatch(
             String tableName,
             String sourceApplicationInstanceId,
             String archiveInstanceId
     ) throws JsonProcessingException {
-        String[] splitArchiveInstanceId = archiveInstanceId.split("-");
-        String caseId = splitArchiveInstanceId[0];
-        Long journalpostNummer = Long.parseLong(
-                splitArchiveInstanceId[1]
-                        .replace("[", "")
-                        .replace("]", "")
-        );
-        SakResource sakResource = caseRequestService.getByMappeId(caseId).orElseThrow();
-        EgrunnervervJournalpostInstanceToDispatch egrunnervervJournalpostInstanceToDispatch =
-                journalpostInstanceToDispatchMappingService.map(sakResource, journalpostNummer);
+        SakResource sakResource = caseRequestService.getByMappeId(archiveInstanceId).orElseThrow();
+
+        EgrunnervervSakInstanceToDispatch egrunnervervSakInstanceToDispatch = EgrunnervervSakInstanceToDispatch.builder()
+                .arkivnummer(archiveInstanceId)
+                .opprettelse_i_elements_fullfort(
+                        sakResource
+                                .getOpprettetDato()
+                                .toInstant()
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime()
+                                .format(DateTimeFormatter.ofPattern(EGRUNNERVERV_DATETIME_FORMAT))
+                )
+                .build();
 
         String uri = UriComponentsBuilder.newInstance()
                 .pathSegment(
                         tableName,
                         sourceApplicationInstanceId
                 )
+                .queryParam("sysparm_fields", "arkivnummer")
                 .queryParam("sysparm_query_no_domain", "true")
                 .toUriString();
 
         InstanceToDispatchEntity instanceToDispatchEntity = InstanceToDispatchEntity.builder()
                 .sourceApplicationInstanceId(sourceApplicationInstanceId)
-                .instanceToDispatch(objectMapper.writeValueAsString(egrunnervervJournalpostInstanceToDispatch))
-                .classType(EgrunnervervJournalpostInstanceToDispatch.class)
+                .instanceToDispatch(objectMapper.writeValueAsString(egrunnervervSakInstanceToDispatch))
+                .classType(EgrunnervervSakInstanceToDispatch.class)
                 .uri(uri)
                 .build();
 
         instanceToDispatchEntityRepository.save(instanceToDispatchEntity);
         return Optional.of(instanceToDispatchEntity);
     }
 
-    private Optional<InstanceToDispatchEntity> storeSakInstanceToDispatch(
+    private Optional<InstanceToDispatchEntity> storeJournalpostInstanceToDispatch(
             String tableName,
             String sourceApplicationInstanceId,
             String archiveInstanceId
     ) throws JsonProcessingException {
-        SakResource sakResource = caseRequestService.getByMappeId(archiveInstanceId).orElseThrow();
-
-        EgrunnervervSakInstanceToDispatch egrunnervervSakInstanceToDispatch = EgrunnervervSakInstanceToDispatch.builder()
-                .arkivnummer(archiveInstanceId)
-                .opprettelse_i_elements_fullfort(
-                        sakResource
-                                .getOpprettetDato()
-                                .toInstant()
-                                .atZone(ZoneId.systemDefault())
-                                .toLocalDateTime()
-                                .format(DateTimeFormatter.ofPattern(EGRUNNERVERV_DATETIME_FORMAT))
-                )
-                .build();
+        String[] splitArchiveInstanceId = archiveInstanceId.split("-");
+        String caseId = splitArchiveInstanceId[0];
+        Long journalpostNummer = Long.parseLong(
+                splitArchiveInstanceId[1]
+                        .replace("[", "")
+                        .replace("]", "")
+        );
+        SakResource sakResource = caseRequestService.getByMappeId(caseId).orElseThrow();
+        EgrunnervervJournalpostInstanceToDispatch egrunnervervJournalpostInstanceToDispatch =
+                journalpostInstanceToDispatchMappingService.map(sakResource, journalpostNummer);
 
         String uri = UriComponentsBuilder.newInstance()
                 .pathSegment(
                         tableName,
                         sourceApplicationInstanceId
                 )
+                .queryParam("sysparm_fields", "journalpostid")
                 .queryParam("sysparm_query_no_domain", "true")
                 .toUriString();
 
         InstanceToDispatchEntity instanceToDispatchEntity = InstanceToDispatchEntity.builder()
                 .sourceApplicationInstanceId(sourceApplicationInstanceId)
-                .instanceToDispatch(objectMapper.writeValueAsString(egrunnervervSakInstanceToDispatch))
-                .classType(EgrunnervervSakInstanceToDispatch.class)
+                .instanceToDispatch(objectMapper.writeValueAsString(egrunnervervJournalpostInstanceToDispatch))
+                .classType(EgrunnervervJournalpostInstanceToDispatch.class)
                 .uri(uri)
                 .build();
 

diff --git a/src/main/java/no/fintlabs/WebClientRequestService.java b/src/main/java/no/fintlabs/WebClientRequestService.java
@@ -36,6 +36,8 @@ public void dispatchInstance(InstanceToDispatchEntity instanceToDispatchEntity)
             Object instanceToDispatch;
             instanceToDispatch = objectMapper.readValue(instanceToDispatchEntity.getInstanceToDispatch(), instanceToDispatchEntity.getClassType());
 
+            log.debug("instanceToDispatch=" + instanceToDispatchEntity.getInstanceToDispatch());
+
             webClient.patch()
                     .uri(instanceToDispatchEntity.getUri())
                     .body(Mono.just(instanceToDispatch), instanceToDispatchEntity.getClassType())
@@ -44,7 +46,6 @@ public void dispatchInstance(InstanceToDispatchEntity instanceToDispatchEntity)
                     .publishOn(Schedulers.boundedElastic())
                     .doOnSuccess(success -> {
                         log.info("success {}", success);
-                        log.debug("instanceToDispatch="+instanceToDispatchEntity.getInstanceToDispatch());
                         instanceToDispatchEntityRepository.delete(instanceToDispatchEntity);
                     })
                     .doOnError(error -> log.error("Error msg from webclient: " + error.getMessage()))

diff --git a/src/main/java/no/fintlabs/model/EgrunnervervJournalpostInstanceToDispatch.java b/src/main/java/no/fintlabs/model/EgrunnervervJournalpostInstanceToDispatch.java
@@ -3,10 +3,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
+import lombok.extern.jackson.Jacksonized;
 
 @Getter
 @Builder
 @ToString
+@Jacksonized
 public class EgrunnervervJournalpostInstanceToDispatch {
     private final String journalpostnr;
     private final String tittel;

diff --git a/src/main/java/no/fintlabs/model/EgrunnervervSakInstanceToDispatch.java b/src/main/java/no/fintlabs/model/EgrunnervervSakInstanceToDispatch.java
@@ -3,10 +3,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
+import lombok.extern.jackson.Jacksonized;
 
 @Getter
 @Builder
 @ToString
+@Jacksonized
 public class EgrunnervervSakInstanceToDispatch {
     private final String arkivnummer;
     private final String opprettelse_i_elements_fullfort;