From 7ed1632c6f7d47db56045c5ca229f0ed9a658ea5 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Thu, 18 Apr 2024 20:58:35 +0300 Subject: [PATCH 1/4] RED-8701 - Move files to customer data repositories - use git lfs to store customer files --- .gitlab-ci.yml | 4 ++++ .gitmodules | 8 ++++++++ .../ocr-service-server/src/test/resources/files/basf | 1 + .../ocr-service-server/src/test/resources/files/syngenta | 1 + 4 files changed, 14 insertions(+) create mode 100644 .gitmodules create mode 160000 ocr-service-v1/ocr-service-server/src/test/resources/files/basf create mode 160000 ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf9660c..4f73412 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +variables: + # SONAR_PROJECT_KEY: 'ocr-service:ocr-service-server' + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_FORCE_HTTPS: 'true' include: - project: 'gitlab/gitlab' ref: 'main' diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..98dbe89 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta"] + path = ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta + url = https://gitlab.knecon.com/fforesight/documents/syngenta.git + update = merge +[submodule "ocr-service-v1/ocr-service-server/src/test/resources/files/basf"] + path = ocr-service-v1/ocr-service-server/src/test/resources/files/basf + url = https://gitlab.knecon.com/fforesight/documents/basf.git + update = merge diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/basf b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf new file mode 160000 index 0000000..fd99b2e --- /dev/null +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf @@ -0,0 +1 @@ +Subproject commit fd99b2ed29dcb11d8beb16bdedc7a393f73d1ae0 diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta new file mode 160000 index 0000000..d76c2fe --- /dev/null +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta @@ -0,0 +1 @@ +Subproject commit d76c2fe273c27e3beea0b94e56f8821b1f715985 From d55f245c5ef5a86abd74785bf039344f6e5eab63 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 22 Apr 2024 14:06:56 +0300 Subject: [PATCH 2/4] RED-8701 - Move files to customer data repositories - update unit tests with the new path to submodules for customer files - remove customer files from project --- .../ocr/v1/server/OcrServiceIntegrationTest.java | 10 +++++----- .../ocr-service-server/src/test/resources/files/basf | 2 +- .../src/test/resources/files/syngenta | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java b/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java index 4e6c751..a995fe3 100644 --- a/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java +++ b/ocr-service-v1/ocr-service-server/src/test/java/com/knecon/fforesight/service/ocr/v1/server/OcrServiceIntegrationTest.java @@ -50,9 +50,9 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testOCRMetrics() { - testOCR("files/Watermark.pdf"); - testOCR("files/Watermark.pdf"); - testOCR("files/Watermark.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); + testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf"); var ocrOnDocumentMeter = registry.getMeters().stream().filter(m -> m.getId().getName().equalsIgnoreCase("redactmanager_runOcrOnDocument")).findAny(); assertThat(ocrOnDocumentMeter.isPresent()).isTrue(); @@ -81,7 +81,7 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testMergeImages() { // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there - String text = testOCR("files/merge_images.pdf"); + String text = testOCR("files/syngenta/CustomerFiles/SinglePages/merge_images - Page241_18 Chlorothalonil RAR 08 Volume 3CA B 6a Oct 2017.pdf"); assertThat(text).contains("Bodyweight change of dams with live young - group mean values", "Control", "mg/g day", @@ -101,7 +101,7 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test public void testOCRWatermark() { - assertThat(testOCR("files/Watermark.pdf")).contains("syngenta"); + assertThat(testOCR("files/syngenta/CustomerFiles/SinglePages/Watermark_Page1_10.SYN524464 FS (A16148C) - Absorção cutânea.pdf")).contains("syngenta"); } diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/basf b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf index fd99b2e..9dc6c23 160000 --- a/ocr-service-v1/ocr-service-server/src/test/resources/files/basf +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/basf @@ -1 +1 @@ -Subproject commit fd99b2ed29dcb11d8beb16bdedc7a393f73d1ae0 +Subproject commit 9dc6c2337dea32e63aef53271dba0692537c6605 diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta index d76c2fe..1541e57 160000 --- a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit d76c2fe273c27e3beea0b94e56f8821b1f715985 +Subproject commit 1541e57e45c74a963e5b453db38a253ec33524be From 253bb705196a6f8f45417094d634876b058bc7cc Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 23 Apr 2024 10:44:48 +0300 Subject: [PATCH 3/4] RED-8701 - Move files to customer data repositories - update syngenta submodule --- .../ocr-service-server/src/test/resources/files/syngenta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta index 1541e57..c067cc3 160000 --- a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit 1541e57e45c74a963e5b453db38a253ec33524be +Subproject commit c067cc38414ed1c3ba759af5e32ebdfb78720204 From b469ea417424710d0fbf214ad811c2b001fe4377 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Tue, 23 Apr 2024 14:56:57 +0300 Subject: [PATCH 4/4] RED-8701 - Move files to customer data repositories - update syngenta submodule --- .../ocr-service-server/src/test/resources/files/syngenta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta index c067cc3..21fefb6 160000 --- a/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta +++ b/ocr-service-v1/ocr-service-server/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit c067cc38414ed1c3ba759af5e32ebdfb78720204 +Subproject commit 21fefb64bf27ca2b3329a6c69d90a27450b17930