Old project humanId pattern added

diff --git a/lis-app/src/main/resources/application-dev.yaml b/lis-app/src/main/resources/application-dev.yaml
index e6be8ad327005f2b7acfa8d58460bffe6a5b92b6..41de24ff86b5a7506ed794cb5bd129134ce561b8 100644 (file)
--- 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 991aeaaf0766aa07fca80a94b9aae63524207840..dcbe26ae5a8b154b65fc8793a5101b3d21af417e 100644 (file)
--- 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 c2754515a0fae0f69e08f7f3323c47864698b864..6409a0fbaa54ae7184e0a76b8156cd13e620bdae 100644 (file)
--- 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