Merge pull request #439 from regseb/patch-1

fix FileName in NamingTemplate

.github/workflows/maven.yml

@@ -0,0 +1,25 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Install ghostscript
+      run: sudo apt-get update && sudo apt-get install -y ghostscript --fix-missing
+    - name: Maven Surefire tests
+      run: mvn -B clean package -Dspring.config.location=src/test/resources/application-test.yml -Djava.io.tmpdir=/tmp -DskipDockerCompose=false
+    - name: Maven Selenium tests
+      run: mvn verify -Dspring.config.location=src/test/resources/application-test.yml -DskipDockerCompose=false -DskipSurefire=true

pom.xml

@@ -12,7 +12,7 @@
 	</parent>
 	<groupId>org.esupportail</groupId>
 	<artifactId>esup-signature</artifactId>
-	<version>1.29.10-SNAPSHOT</version>
+	<version>1.29.10</version>
 	<name>esup-signature</name>
 	<properties>
 		<startClass>org.esupportail.esupsignature.EsupSignatureApplication</startClass>

src/main/java/org/esupportail/esupsignature/service/SignBookService.java

@@ -1260,13 +1260,14 @@ public List<Long> startWorkflow(Long id, MultipartFile[] multipartFiles, String
         logger.info("starting workflow " + id + " by " + createByEppn);
         Workflow workflow = workflowService.getById(id);
         User user = userService.createUserWithEppn(createByEppn);
-        SignBook signBook = createSignBook(title, workflow, "", user.getEppn(), true, null);
+        SignBook signBook = createSignBook(title, workflow, "", user.getEppn(), false, null);
         signBook.getLiveWorkflow().setWorkflow(workflow);
         for(MultipartFile multipartFile : multipartFiles) {
             SignRequest signRequest = signRequestService.createSignRequest(multipartFile.getOriginalFilename(), signBook, createByEppn, createByEppn);
             signRequest.getSignRequestParams().addAll(signRequestParamses);
             signRequestService.addDocsToSignRequest(signRequest, scanSignatureFields, 0, new ArrayList<>(), multipartFile);
         }
+        signBook.setSubject(generateName(signBook.getId(), workflow, user, false));
         if (targetUrls != null) {
             for (String targetUrl : targetUrls) {
                 if (signBook.getLiveWorkflow().getTargets().stream().noneMatch(t -> t != null && t.getTargetUri().equals(targetUrl))) {
@@ -2034,4 +2035,4 @@ public void addToTeam(SignBook signBook, String userEppn) {
             signBook.getTeam().add(user);
         }
     }
-}
+}