From dfc52a86423d6c749df29841f9c1411e31d697f5 Mon Sep 17 00:00:00 2001 From: marcellszabo-spedinfo Date: Mon, 11 Dec 2023 21:00:37 +0100 Subject: [PATCH] Project Initialisation - implementing shortname --- .../src/test/java/hu/user/lis/workflow/PrepareProjectIT.java | 1 + .../java/hu/user/lis/workflow/project/CopyCalculationXlsx.java | 2 +- .../hu/user/lis/workflow/project/CreateEnglishProposal.java | 2 +- .../hu/user/lis/workflow/project/CreateHungarianProposal.java | 2 +- .../java/hu/user/lis/workflow/project/CreateProjectFolders.java | 2 +- .../src/main/java/hu/user/lis/workflow/project/CreateTIG.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) 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 9fdc08e..517fc23 100644 --- 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 18a001b..921e17a 100644 --- 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 2e6c805..39e9ae5 100644 --- 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 fcfcf74..bceb6a5 100644 --- 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 3a79638..3fa89d3 100644 --- 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 57cab99..7ef5af8 100644 --- 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 { -- 2.54.0