From 0209d1a04dc7c3b017dbd2805603f8983bcf7ce6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Mon, 11 Dec 2023 15:34:52 +0100
Subject: [PATCH] Old project humanId pattern added

---
 lis-app/src/main/resources/application-dev.yaml          | 1 +
 .../lis/ui/editor/validator/ProjectFormValidator.java    | 9 ++++++---
 .../user/lis/workflow/properties/WorkflowProperties.java | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lis-app/src/main/resources/application-dev.yaml b/lis-app/src/main/resources/application-dev.yaml
index e6be8ad..41de24f 100644
--- a/lis-app/src/main/resources/application-dev.yaml
+++ b/lis-app/src/main/resources/application-dev.yaml
@@ -60,6 +60,7 @@ application:
     import-invoice:
       input-path: /temp/invoice-import
       project-id-pattern: \d{4}-\d{4}
+      old-project-id-pattern: \d{8}
 service:
   nav:
     trust:
diff --git a/lis-ui/src/main/java/hu/user/lis/ui/editor/validator/ProjectFormValidator.java b/lis-ui/src/main/java/hu/user/lis/ui/editor/validator/ProjectFormValidator.java
index 991aeaa..dcbe26a 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/editor/validator/ProjectFormValidator.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/editor/validator/ProjectFormValidator.java
@@ -14,18 +14,21 @@ public class ProjectFormValidator extends FormValidator<Project> {
     @Autowired
     private WorkflowProperties workflowProperties;
 
-    private Pattern pattern;
+    private Pattern projectIdpattern;
+    private Pattern oldProjectIdpattern;
 
     @PostConstruct
     public void postConstruct() {
-        pattern = Pattern.compile(String.format("^%s$", workflowProperties.getImportInvoice().getProjectIdPattern()));
+        projectIdpattern = Pattern.compile(String.format("^%s$", workflowProperties.getImportInvoice().getProjectIdPattern()));
+        oldProjectIdpattern = Pattern.compile(String.format("^%s$", workflowProperties.getImportInvoice().getOldProjectIdPattern()));
     }
 
     boolean validateHumanId(Object data) {
         if (Objects.isNull(data)) {
             return false;
         }
-        return pattern.matcher(String.valueOf(data)).matches();
+        return projectIdpattern.matcher(String.valueOf(data)).matches() ||
+                oldProjectIdpattern.matcher(String.valueOf(data)).matches();
     }
 
     @Override
diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/properties/WorkflowProperties.java b/lis-workflow/src/main/java/hu/user/lis/workflow/properties/WorkflowProperties.java
index c275451..6409a0f 100644
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/properties/WorkflowProperties.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/properties/WorkflowProperties.java
@@ -21,6 +21,8 @@ public class WorkflowProperties {
         private String inputPath;
 
         private String projectIdPattern;
+        
+        private String oldProjectIdPattern;
     }
 
     @Getter
-- 
2.54.0