Project Initialisation - implementing shortname

diff --git a/lis-app/src/test/java/hu/user/lis/workflow/PrepareProjectIT.java b/lis-app/src/test/java/hu/user/lis/workflow/PrepareProjectIT.java
index 9fdc08e3ab9d9289b045089b54bec787421e31ae..517fc23ca7f14dcb4dea0c67fc4fd3e2cc85488a 100644 (file)
--- a/lis-app/src/test/java/hu/user/lis/workflow/PrepareProjectIT.java
+++ b/lis-app/src/test/java/hu/user/lis/workflow/PrepareProjectIT.java
@@ -55,6 +55,7 @@ public class PrepareProjectIT extends BpmnTest {
     public void testPrepareProject() throws InterruptedException {
         Partner partner = partnerRepository.findAll().get(0);
         partner.setAddress("1039 Budapest, Kovács utca 772.");
+        partner.setShortName("AAAA");
         partnerRepository.saveAndFlush(partner);
         Project project = Project.builder().partner(partner).projectStatus(projectStatusRepository.findAll().get(0)).name("Teszt projekt").humanId("2092-1123").contactName("Gipsz Jakab").active(true).build();
         WorkflowProperties.PrepareProject pp = workflowProperties.getPrepareProject();

diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CopyCalculationXlsx.java b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CopyCalculationXlsx.java
index 18a001b67233844f388adf52a8936483b464fe99..921e17a0e8978e1f63d1f2b42bd21eae81c60a86 100644 (file)
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CopyCalculationXlsx.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CopyCalculationXlsx.java
@@ -25,7 +25,7 @@ public class CopyCalculationXlsx extends CreateProjectStructure {
         log.info("Creating Calculation Xlsx project ID {}", projectId);
         log.info("Creating Calculation Xlsx Name {}", project.getName());
 //        delegateExecution.setVariableLocal("invoices", invoices);
-        copyCalculation(project.getPartner().getName(), project.getHumanId(), project.getName());
+        copyCalculation(project.getPartner().getShortName(), project.getHumanId(), project.getName());
 
     }
 

diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateEnglishProposal.java b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateEnglishProposal.java
index 2e6c8051a7f0910fa5ed615a762684a0a3cdef57..39e9ae5d7f5d41f9405dd025b40647c2a23634cd 100644 (file)
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateEnglishProposal.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateEnglishProposal.java
@@ -25,7 +25,7 @@ public class CreateEnglishProposal extends CreateProjectStructure {
         log.info("Creating English Proposal project ID {}", projectId);
         log.info("Creating English Proposal project Name {}", project.getName());
 //        delegateExecution.setVariableLocal("invoices", invoices);
-        createProposalEN(project.getPartner().getName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName());
+        createProposalEN(project.getPartner().getShortName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName());
 
     }
 

diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateHungarianProposal.java b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateHungarianProposal.java
index fcfcf74222edb7f8cd58095b099a19cf915fa531..bceb6a55f0d1320d48b85bd40f76c13d761a411b 100644 (file)
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateHungarianProposal.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateHungarianProposal.java
@@ -27,7 +27,7 @@ public class CreateHungarianProposal extends CreateProjectStructure {
         log.info("Creating Hungarian Proposal for project ID {}", projectId);
         log.info("Creating Hungarian Proposal for project Name {}", project.getName());
 //        delegateExecution.setVariableLocal("invoices", invoices);
-        createProposalHUN(project.getPartner().getName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName());
+        createProposalHUN(project.getPartner().getShortName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName());
 
     }
 

diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateProjectFolders.java b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateProjectFolders.java
index 3a79638830f5444410fb0eed0c40efe003d024fe..3fa89d320b99132e02333df6c6cfd9f9ee73c6c6 100644 (file)
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateProjectFolders.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateProjectFolders.java
@@ -19,7 +19,7 @@ public class CreateProjectFolders extends CreateProjectStructure {
         project = projectRepository.findById(projectId).orElseThrow(EntityNotFoundException::new);
         log.info("Executing on project ID {}", projectId);
         log.info("Executing on project Name {}", project.getName());
-        createFolder(project.getPartner().getName(), project.getHumanId(), project.getName());
+        createFolder(project.getPartner().getShortName(), project.getHumanId(), project.getName());
 //        delegateExecution.setVariableLocal("invoices", invoices);
 
 

diff --git a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateTIG.java b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateTIG.java
index 57cab99718ecdfb159e77b5e66922eab72925c91..7ef5af8deb5513ac7293d46c5ae39db38bdb2163 100644 (file)
--- a/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateTIG.java
+++ b/lis-workflow/src/main/java/hu/user/lis/workflow/project/CreateTIG.java
@@ -22,7 +22,7 @@ public class CreateTIG extends CreateProjectStructure {
         log.info("Creating TIG for project ID {}", projectId);
         log.info("Creating TIG for project Name {}", project.getName());
 //        delegateExecution.setVariableLocal("invoices", invoices);
-        createTIG(project.getPartner().getName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName(), project.getPartner().getAddress());
+        createTIG(project.getPartner().getShortName(), project.getPartner().getName(), project.getHumanId(), project.getName(), project.getContactName(), project.getPartner().getAddress());
     }
 
     public void createTIG(String partnerShortName, String partnerName, String projectID, String projectName, String partnerContact, String partnerAddress) throws ProcessEngineException {