Merge branch 'test' into 'master'

Test

See merge request documentale/sprint-flows!490

src/main/java/it/cnr/si/config/EventScheduler.java

@@ -12,7 +12,7 @@
 
 import javax.inject.Inject;
 
-@Profile("!test")
+@Profile("!unittests")
 @EnableScheduling
 @Configuration
 public class EventScheduler {

src/main/java/it/cnr/si/flows/ng/listeners/cnr/shortTermMobilityBandi/ManageProcessShortTermMobilityBandi_v1.java

@@ -1,14 +1,16 @@
 package it.cnr.si.flows.ng.listeners.cnr.shortTermMobilityBandi;
 
 
-
-
+import com.google.common.net.MediaType;
+import it.cnr.si.flows.ng.dto.FlowsAttachment;
+import it.cnr.si.flows.ng.listeners.cnr.shortTermMobilityBandoDipartimento.StartShortTermMobilityBandoDipartimentoSetGroupsAndVisibility;
+import it.cnr.si.flows.ng.service.*;
+import it.cnr.si.flows.ng.utils.Enum;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
-import org.activiti.engine.impl.TaskServiceImpl;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.rest.common.api.DataResponse;
@@ -19,35 +21,16 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import com.google.common.net.MediaType;
-
-import it.cnr.si.flows.ng.service.FirmaDocumentoService;
-import it.cnr.si.flows.ng.service.FlowsAttachmentService;
-import it.cnr.si.flows.ng.service.FlowsCsvService;
-import it.cnr.si.flows.ng.service.FlowsProcessInstanceService;
-import it.cnr.si.flows.ng.service.FlowsTaskService;
-import it.cnr.si.flows.ng.service.ProtocolloDocumentoService;
-import it.cnr.si.flows.ng.utils.Enum;
-import it.cnr.si.flows.ng.dto.FlowsAttachment;
-import it.cnr.si.flows.ng.exception.TaskFailedException;
-import it.cnr.si.flows.ng.listeners.cnr.acquisti.service.AcquistiService;
-
-import static it.cnr.si.flows.ng.utils.Utils.PROCESS_VISUALIZER;
-import static it.cnr.si.flows.ng.utils.Enum.Azione.GenerazioneDaSistema;
-import static it.cnr.si.flows.ng.utils.Enum.VariableEnum.statoFinaleDomanda;
-
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.FileAttributeView;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletResponse;
+import static it.cnr.si.flows.ng.utils.Enum.Azione.GenerazioneDaSistema;
+import static it.cnr.si.flows.ng.utils.Enum.VariableEnum.statoFinaleDomanda;
 
 @Component
 @Profile("cnr")
@@ -63,7 +46,7 @@ public class ManageProcessShortTermMobilityBandi_v1 implements ExecutionListener
 	@Inject
 	private FlowsProcessInstanceService flowsProcessInstanceService;
 	@Inject
-	private StartShortTermMobilityBandiSetGroupsAndVisibility startShortTermMobilityBandiSetGroupsAndVisibility;
+	private StartShortTermMobilityBandoDipartimentoSetGroupsAndVisibility startShortTermMobilityBandiSetGroupsAndVisibility;
 	@Inject
 	private RuntimeService runtimeService;
 	@Inject

src/main/java/it/cnr/si/flows/ng/resource/FlowsTaskResource.java

@@ -75,7 +75,7 @@ public class FlowsTaskResource {
     private RelationshipService relationshipService;
     @Inject
     private FlowsAttachmentService attachmentService;
-    @Inject
+    @Autowired(required = false)
     private FlowsFirmaService flowsFirmaService;
     @Inject
     private FlowsAttachmentService flowsAttachmentService;

src/main/java/it/cnr/si/flows/ng/service/FirmaDocumentoService.java

@@ -7,6 +7,7 @@
 import org.activiti.engine.delegate.DelegateExecution;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -20,7 +21,7 @@
 public class FirmaDocumentoService {
     private static final Logger LOGGER = LoggerFactory.getLogger(FirmaDocumentoService.class);
 
-    @Inject
+    @Autowired(required = false)
     private FlowsFirmaService flowsFirmaService;
     @Inject
     private FlowsAttachmentService flowsAttachmentService;

src/main/java/it/cnr/si/flows/ng/service/FlowsFirmaService.java

@@ -16,6 +16,7 @@
 import it.cnr.si.firmadigitale.firma.arss.stub.*;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 
@@ -30,6 +31,7 @@
  * @author mtrycz
  *
  */
+@Profile("cnr")
 @Service
 public class FlowsFirmaService {
 

src/main/java/it/cnr/si/flows/ng/service/FlowsTaskService.java

@@ -71,8 +71,6 @@ public class FlowsTaskService {
 	private HistoryService historyService;
 	@Inject
 	private TaskService taskService;
-	@Autowired(required = false)
-	private AceBridgeService aceBridgeService;
 	@Inject
 	private FlowsAttachmentResource attachmentResource;
 	@Inject

src/main/java/it/cnr/si/security/PermissionEvaluatorImpl.java

@@ -1,8 +1,8 @@
 package it.cnr.si.security;
 
 import it.cnr.si.flows.ng.resource.FlowsProcessDefinitionResource;
-import it.cnr.si.flows.ng.service.AceBridgeService;
 import it.cnr.si.flows.ng.utils.Utils;
+import it.cnr.si.service.MembershipService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -58,9 +59,8 @@ public class PermissionEvaluatorImpl implements PermissionEvaluator {
     HistoryService historyService;
     @Inject
     RestResponseFactory restResponseFactory;
-    @Autowired(required = false)
-    private AceBridgeService aceBridgeService;
-
+    @Autowired
+    private MembershipService membershipService;
 
     /**
      * Determina se un utente ha i permessi per visualizzare un Task.
@@ -266,7 +266,7 @@ public boolean canClaimTask(String taskId, org.springframework.security.core.use
 
     public boolean isResponsabile(String taskId, String processInstanceId, org.springframework.security.core.userdetails.UserDetailsService flowsUserDetailsService) {
         String user = SecurityUtils.getCurrentUserLogin();
-        List<String> groups = aceBridgeService.getAceGroupsForUser(user);
+        Set<String> groups = membershipService.getAllGroupsForUser(user);
         Task task;
         if(!processInstanceId.isEmpty()){
             task = taskService.createTaskQuery()

src/main/java/it/cnr/si/service/DynamicListService.java

@@ -10,6 +10,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,8 +24,10 @@
 
 @Service
 @Transactional
+@Profile("cnr")
 public class DynamicListService {
 
+    //TODO
     private static final String URL_STRING = "http://sigla-main-rest-missioni.test.si.cnr.it/SIGLA/";
     private static final String QUERY_STRING = "{\"activePage\" : 0, \"maxItemsPerPage\" : 1000000,\"context\" : {\"esercizio\" : 2017,\"cd_unita_organizzativa\" : \"999.000\",\"cd_cds\" : \"999\",\"cd_cdr\" : \"999.000.000\"},\"clauses\"}";
     private final Logger log = LoggerFactory.getLogger(DynamicListService.class);

src/main/java/it/cnr/si/service/MembershipService.java

@@ -33,7 +33,6 @@ public class MembershipService {
 
     @Inject
     private MembershipRepository membershipRepository;
-
     @Autowired(required = false)
     private AceBridgeService aceBridgeService;
     @Inject

src/main/java/it/cnr/si/web/rest/DynamiclistResource.java

@@ -9,6 +9,7 @@
 import it.cnr.si.web.rest.util.PaginationUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
@@ -36,7 +37,7 @@ public class DynamiclistResource {
 
     @Inject
     private DynamiclistRepository dynamiclistRepository;
-    @Inject
+    @Autowired(required = false)
     DynamicListService dynamicListService;
 
 

src/main/webapp/app/app.constants.js

@@ -3,7 +3,7 @@
     // DO NOT EDIT THIS FILE, EDIT THE GULP TASK NGCONSTANT SETTINGS INSTEAD WHICH GENERATES THIS FILE
     angular
         .module('sprintApp')
-        .constant('VERSION', "1.0.26-SNAPSHOT")
+        .constant('VERSION', "1.0.30-SNAPSHOT")
         .constant('DEBUG_INFO_ENABLED', false)
 ;
 })();

src/test/java/it/cnr/si/flows/ng/TestServices.java

@@ -108,6 +108,11 @@ public void loginAbilitatiIscrizioneElencoOiv() {
         login(TestServices.APP, "");
     }
 
+    public void loginUtente1() {
+        logout();
+        login(TestServices.APP, "utente1");
+    }
+
     public void loginSfd() {
         logout();
         login(SFD, SFD);
@@ -237,6 +242,15 @@ public ProcessInstanceResponse mySetUp(Enum.ProcessDefinitionEnum processDefinit
                 req.addFile(new MockMultipartFile("cv", "cv.pdf", MediaType.APPLICATION_PDF.getType() + "/" + MediaType.APPLICATION_PDF.getSubtype(),
                                                   this.getClass().getResourceAsStream("/pdf-test/cv.pdf")));
 
+                break;
+            case permessiFerie:
+                loginUtente1();
+                loginAbilitatiIscrizioneElencoOiv();
+                req.setParameter("titolo", "titolo");
+                req.setParameter("descrizione", "descrizione");
+                req.addFile(new MockMultipartFile("richiestaFerie", "domanda.pdf", MediaType.APPLICATION_PDF.getType() + "/" + MediaType.APPLICATION_PDF.getSubtype(),
+                        this.getClass().getResourceAsStream("/pdf-test/domanda.pdf")));
+
                 break;
         }
         //Recupero la ProcessInstance

src/test/java/it/cnr/si/flows/ng/batch/GenerazioneJsonperPDF.java

@@ -38,6 +38,7 @@
 import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration.JpaConfiguration;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.json.JSONObject;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -78,6 +79,7 @@
 //@ActiveProfiles(profiles = "dev,cnr")
 @ActiveProfiles(profiles = "dev,cnr")
 @RunWith(SpringJUnit4ClassRunner.class)
+@Ignore
 public class GenerazioneJsonperPDF {
 
 	private static final Logger log = LoggerFactory.getLogger(GenerazioneJsonperPDF.class);

src/test/java/it/cnr/si/flows/ng/batch/PopolazioneProfiliAcquistiBatch.java

@@ -25,6 +25,7 @@
 import org.activiti.spring.boot.RestApiAutoConfiguration;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration.JpaConfiguration;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -60,6 +61,7 @@
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles(profiles = "dev,cnr")
 @RunWith(SpringJUnit4ClassRunner.class)
+@Ignore
 public class PopolazioneProfiliAcquistiBatch {
 
 	private static final Logger log = LoggerFactory.getLogger(PopolazioneProfiliAcquistiBatch.class);

src/test/java/it/cnr/si/flows/ng/batch/PopolazioneProfiliPerCDSUOAcquistiBatch.java

@@ -26,6 +26,7 @@
 import org.activiti.spring.boot.RestApiAutoConfiguration;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration.JpaConfiguration;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -68,6 +69,7 @@
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles(profiles = "dev,cnr")
 @RunWith(SpringJUnit4ClassRunner.class)
+@Ignore
 public class PopolazioneProfiliPerCDSUOAcquistiBatch {
 
 	private static final Logger log = LoggerFactory.getLogger(PopolazioneProfiliPerCDSUOAcquistiBatch.class);

src/test/java/it/cnr/si/flows/ng/batch/VerificaDomandeAccordiBilaterali.java

@@ -26,6 +26,7 @@
 import org.activiti.spring.boot.RestApiAutoConfiguration;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration.JpaConfiguration;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -69,6 +70,7 @@
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles(profiles = "dev,cnr")
 @RunWith(SpringJUnit4ClassRunner.class)
+@Ignore
 public class VerificaDomandeAccordiBilaterali {
 
 	private static final Logger log = LoggerFactory.getLogger(VerificaDomandeAccordiBilaterali.class);

src/test/java/it/cnr/si/flows/ng/batch/VerificaProceduraAcquisti.java

@@ -25,6 +25,7 @@
 import org.activiti.spring.boot.RestApiAutoConfiguration;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.activiti.spring.boot.JpaProcessEngineAutoConfiguration.JpaConfiguration;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -65,6 +66,7 @@
 //@ActiveProfiles(profiles = "dev,cnr")
 @ActiveProfiles(profiles = "dev,cnr")
 @RunWith(SpringJUnit4ClassRunner.class)
+@Ignore
 public class VerificaProceduraAcquisti {
 
 	private static final Logger log = LoggerFactory.getLogger(VerificaProceduraAcquisti.class);

src/test/java/it/cnr/si/flows/ng/integration/FormAndViewVersionTest.java

@@ -31,10 +31,11 @@
 import java.util.Map;
 
 import static it.cnr.si.flows.ng.utils.Enum.ProcessDefinitionEnum.acquisti;
+import static it.cnr.si.flows.ng.utils.Enum.ProcessDefinitionEnum.permessiFerie;
 import static org.junit.Assert.assertEquals;
 
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(profiles = "native,unittests,cnr")
+@ActiveProfiles(profiles = "native,showcase,unittests")
 @EnableTransactionManagement
 @RunWith(SpringRunner.class)
 public class FormAndViewVersionTest {
@@ -190,23 +191,18 @@ private void deployNewVersionForms(String processDefinitionId, String version, S
 
     private void setup() throws Exception {
 
-        processInstance1 = util.mySetUp(acquisti);
+        processInstance1 = util.mySetUp(permessiFerie);
 
-        String formStart = formResource.getFormByTrittico("acquisti", "1", "start").getBody();
+        String formStart = formResource.getFormByTrittico(permessiFerie.getValue(), "1", "start").getBody();
         forms.put("acquisti-1-start", formStart);
         forms.put("acquisti-2-start", formStart.replace("Responsabile Unico del Procedimento (RUP)", "RUP"));
         forms.put("acquisti-3-start", formStart.replace("Responsabile Unico del Procedimento (RUP)", "Responsabile procedimento Unico"));
 
-        String formVerifica = formResource.getFormByTrittico("acquisti", "1", "verifica-decisione").getBody();
+        String formVerifica = formResource.getFormByTrittico(permessiFerie.getValue(), "1", "validazione").getBody();
         forms.put("acquisti-1-verifica-decisione", formVerifica);
         forms.put("acquisti-2-verifica-decisione", formVerifica.replace("Il Supporto alle Funzioni Direzionali", "L'SFD"));
         forms.put("acquisti-3-verifica-decisione", formVerifica.replace("Il Supporto alle Funzioni Direzionali", "Il Supporto alle Funzioni Direzionali (SFD)"));
 
-//        String formModifica = formResource.getFormByTrittico("acquisti", "1", "modifica-decisione").getBody();
-//        forms.put("acquisti-1-modifica-decisione", formModifica);
-//        forms.put("acquisti-2-modifica-decisione", formModifica.replace("Titolo Acquisizione", "Titolo Acquisizione2"));
-//        forms.put("acquisti-3-modifica-decisione", formModifica.replace("Titolo Acquisizione", "Titolo Acquisizione3"));
-
     }
 
 

src/test/java/it/cnr/si/flows/ng/resource/CnrSummaryPdfResouceTest.java

@@ -35,7 +35,7 @@
 import static org.springframework.http.HttpStatus.OK;
 
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(profiles = "native,unittests,cnr")
+@ActiveProfiles(profiles = "native,showcase,unittests")
 @EnableTransactionManagement
 @RunWith(SpringRunner.class)
 public class CnrSummaryPdfResouceTest {

src/test/java/it/cnr/si/flows/ng/resource/DraftResourceTest.java

@@ -31,7 +31,7 @@
 
 
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(profiles = "unittests,cnr")
+@ActiveProfiles(profiles = "native,showcase,unittests")
 @EnableTransactionManagement
 @RunWith(SpringRunner.class)
 public class DraftResourceTest {

src/test/java/it/cnr/si/flows/ng/resource/FlowsPdfResourceTest.java

@@ -32,7 +32,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = FlowsApp.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(profiles = "test,oiv")
+@ActiveProfiles(profiles = "native,showcase,unittests")
 @Ignore //TODO: i pdf generati e le tipologie dei pdf stanno cambiando quindi conviene scrivere i test quando saranno stabili
 public class FlowsPdfResourceTest {