🐛 (#195): fix PR requests (#225)

Co-authored-by: Manuel Klaus <[email protected]>
hopps-app · Dec 30, 2024 · 52ae33f · 52ae33f
1 parent 9108a38
commit 52ae33f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/backend/app.hopps.az-document-ai/src/main/java/app/hopps/auth/FinRestClientImpl.java b/backend/app.hopps.az-document-ai/src/main/java/app/hopps/auth/FinRestClientImpl.java
@@ -16,6 +16,12 @@ public FinRestClientImpl(URL path) throws URISyntaxException {
                 .build(FinRestClient.class);
     }
 
+    /**
+     * @param accessToken
+     *            without "Bearer "
+     *
+     * @return document in byte array
+     */
     public byte[] getDocumentBase64(String accessToken) {
         try (InputStream document = getDocument(accessToken)) {
             return document.readAllBytes();
@@ -24,7 +30,7 @@ public byte[] getDocumentBase64(String accessToken) {
         }
     }
 
-    public InputStream getDocument(String accessToken) {
+    private InputStream getDocument(String accessToken) {
         return restClient.getDocument("Bearer " + accessToken);
     }
 }
diff --git a/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/TransactionRecordConverter.java b/backend/app.hopps.fin/src/main/java/app/hopps/fin/jpa/TransactionRecordConverter.java
diff --git a/backend/app.hopps.fin/src/test/java/app/hopps/fin/endpoint/DocumentResourceTest.java b/backend/app.hopps.fin/src/test/java/app/hopps/fin/endpoint/DocumentResourceTest.java
@@ -23,6 +23,8 @@
 @TestSecurity(authorizationEnabled = false)
 @TestHTTPEndpoint(DocumentResource.class)
 class DocumentResourceTest {
+    private static final String IMAGE_KEY = "imageKey";
+
     @Inject
     Flyway flyway;
 
@@ -42,7 +44,7 @@ void setup() {
             byte[] byteArray = IOUtils.toByteArray(zugferdInputStream);
 
             s3Client.putObject(PutObjectRequest.builder()
-                    .key("imageKey")
+                    .key(IMAGE_KEY)
                     .bucket(bucketName)
                     .build(), RequestBody.fromBytes(byteArray));
         } catch (Exception ignored) {
@@ -63,7 +65,7 @@ void shouldNotGetFile() {
     void shouldGetFile() {
         given()
                 .when()
-                .get("{documentKey}", "imageKey")
+                .get("{documentKey}", IMAGE_KEY)
                 .then()
                 .statusCode(Response.Status.OK.getStatusCode());
     }

diff --git a/backend/app.hopps.zugferd/src/main/java/app/hopps/zugferd/KafkaConnector.java b/backend/app.hopps.zugferd/src/main/java/app/hopps/zugferd/KafkaConnector.java
@@ -36,19 +36,19 @@ public KafkaConnector(ZugFerdService zugFerdService, @Channel("document-data-out
 
     @Incoming("document-data-in")
     public void process(DocumentData documentData) throws URISyntaxException {
-        LOG.info("Received new document data");
+        LOG.info("{}: Received new document data", documentData.referenceKey());
         FinRestClientImpl restClient = new FinRestClientImpl(documentData.internalFinUrl());
 
         String accessToken = tokensHelper.getTokens(oidcClient).await().atMost(Duration.ofSeconds(3)).getAccessToken();
         // Process the incoming message payload and return an updated payload
         try (InputStream invoice = restClient.getDocument(accessToken)) {
-            LOG.info("Document successful downloaded");
+            LOG.info("{}: Document successful downloaded", documentData.referenceKey());
             InvoiceData invoiceData = zugFerdService.scanInvoice(documentData.referenceKey(), invoice);
-            LOG.info("Invoice scanned");
+            LOG.info("{}: Invoice scanned", documentData.referenceKey());
             emitter.send(invoiceData);
-            LOG.info("Invoice sent");
+            LOG.info("{}: Invoice sent", documentData.referenceKey());
         } catch (Exception e) {
-            LOG.error("Could not fetch or process document", e);
+            LOG.error("{}: Could not fetch or process document", documentData.referenceKey(), e);
         }
     }
 }
diff --git a/backend/app.hopps.zugferd/src/main/java/app/hopps/zugferd/auth/FinRestClientImpl.java b/backend/app.hopps.zugferd/src/main/java/app/hopps/zugferd/auth/FinRestClientImpl.java
@@ -15,6 +15,12 @@ public FinRestClientImpl(URL path) throws URISyntaxException {
                 .build(FinRestClient.class);
     }
 
+    /**
+     * @param accessToken
+     *            without "Bearer "
+     *
+     * @return document
+     */
     public InputStream getDocument(String accessToken) {
         return restClient.getDocument("Bearer " + accessToken);
     }