From 99a70b491744f8bf69fb2c8a9d5236c7a320d171 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 14 Oct 2022 15:59:33 +0200 Subject: [PATCH] Aggiornata gestione delle Aspettative --- .../epasmed/epas/client/EPASLeavesClient.java | 27 +- .../epas/dto/EPASPersonWorkingTimeDTO.java | 16 +- .../isti/epasmed/epas/model/EPASLeaves.java | 1 + .../epas/service/EPASAbsenceTypesService.java | 13 + .../epas/service/EPASLeavesService.java | 16 +- .../service/EPASPersonWorkingTimeService.java | 67 +++-- .../model/SIAspettative.java | 31 +++ .../model/SIPersOrario.java | 39 +++ .../repository/SIAspettativeRepository.java | 43 +++ .../repository/SIMasterLogRepository.java | 2 +- .../service/SIAspettativeService.java | 35 +++ .../it/cnr/isti/epasmed/sync/SyncService.java | 254 ++++++++++++++---- .../web/rest/epas/EPASLeavesResource.java | 41 +-- .../epas/EPASPersonWorkingTimeResource.java | 19 ++ .../epasmed/web/rest/sync/SyncResource.java | 27 ++ .../rest/epas/EPASAbsenceTypesResourceIT.java | 16 +- .../web/rest/epas/EPASLeavesResourceIT.java | 43 ++- .../rest/epas/EPASPersonWorkingTimeIT.java | 25 +- .../epasmed/web/rest/sync/SyncResourceIT.java | 10 + 19 files changed, 579 insertions(+), 146 deletions(-) create mode 100644 src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIAspettative.java create mode 100644 src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIPersOrario.java create mode 100644 src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIAspettativeRepository.java create mode 100644 src/main/java/it/cnr/isti/epasmed/sistemainformativo/service/SIAspettativeService.java diff --git a/src/main/java/it/cnr/isti/epasmed/epas/client/EPASLeavesClient.java b/src/main/java/it/cnr/isti/epasmed/epas/client/EPASLeavesClient.java index 1d3133c..b113451 100755 --- a/src/main/java/it/cnr/isti/epasmed/epas/client/EPASLeavesClient.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/client/EPASLeavesClient.java @@ -29,14 +29,16 @@ public class EPASLeavesClient { @Autowired ApplicationProperties appProps; - public List getByPersonId(String id, String year) { + public List getByPersonId(String id, String year, String includeDetails) { log.info("Retrieving EPASLeaves by person id: {}", id); Map uriVariables = new HashMap<>(); uriVariables.put("id", id); uriVariables.put("year", year); + uriVariables.put("includeDetails", includeDetails); ResponseEntity> responseEntity = rt.exchange( - appProps.getDatasourceEpasRest().getRestUrl() + "/v2/leaves/byPersonAndYear?id={id}&year={year}", + appProps.getDatasourceEpasRest().getRestUrl() + + "/v2/leaves/byPersonAndYear?id={id}&year={year}&includeDetails={includeDetails}", HttpMethod.GET, null, new ParameterizedTypeReference>() { }, uriVariables); List listEPASLeaves = responseEntity.getBody(); @@ -44,15 +46,16 @@ public class EPASLeavesClient { return listEPASLeaves; } - public List getByFiscalcode(String fc, String year) { + public List getByFiscalcode(String fc, String year, String includeDetails) { log.info("Retrieving EPASLeaves by person fiscalcode: {}", fc); Map uriVariables = new HashMap<>(); uriVariables.put("fc", fc); uriVariables.put("year", year); + uriVariables.put("includeDetails", includeDetails); ResponseEntity> responseEntity = rt.exchange( appProps.getDatasourceEpasRest().getRestUrl() - + "/v2/leaves/byPersonAndYear?fiscalCode={fc}&year={year}&includeDetails=true", + + "/v2/leaves/byPersonAndYear?fiscalCode={fc}&year={year}&includeDetails={includeDetails}", HttpMethod.GET, null, new ParameterizedTypeReference>() { }, uriVariables); List listEPASLeaves = responseEntity.getBody(); @@ -61,14 +64,16 @@ public class EPASLeavesClient { } - public List getByPersonEmail(String email, String year) { + public List getByPersonEmail(String email, String year, String includeDetails) { log.info("Retrieving EPASLeaves by person email: {}", email); Map uriVariables = new HashMap<>(); uriVariables.put("email", email); uriVariables.put("year", year); + uriVariables.put("includeDetails", includeDetails); ResponseEntity> responseEntity = rt.exchange( - appProps.getDatasourceEpasRest().getRestUrl() + "/v2/leaves/byPersonAndYear?email={email}&year={year}", + appProps.getDatasourceEpasRest().getRestUrl() + + "/v2/leaves/byPersonAndYear?email={email}&year={year}&includeDetails={includeDetails}", HttpMethod.GET, null, new ParameterizedTypeReference>() { }, uriVariables); List listEPASLeaves = responseEntity.getBody(); @@ -76,14 +81,16 @@ public class EPASLeavesClient { return listEPASLeaves; } - public List getByOfficeCodeId(String officeCodeId, String year) { - log.info("Retrieving EPASLeaves by office codeId: {}", officeCodeId); + public List getByOfficeId(String officeId, String year, String includeDetails) { + log.info("Retrieving EPASLeaves by office codeId: {}", officeId); Map uriVariables = new HashMap<>(); - uriVariables.put("id", officeCodeId); + uriVariables.put("id", officeId); uriVariables.put("year", year); + uriVariables.put("includeDetails", includeDetails); ResponseEntity> responseEntity = rt.exchange( - appProps.getDatasourceEpasRest().getRestUrl() + "/v2/leaves/byOfficeAndYear?sedeId={id}&year={year}", + appProps.getDatasourceEpasRest().getRestUrl() + + "/v2/leaves/byOfficeAndYear?id={id}&year={year}&includeDetails={includeDetails}", HttpMethod.GET, null, new ParameterizedTypeReference>() { }, uriVariables); List listEPASLeaves = responseEntity.getBody(); diff --git a/src/main/java/it/cnr/isti/epasmed/epas/dto/EPASPersonWorkingTimeDTO.java b/src/main/java/it/cnr/isti/epasmed/epas/dto/EPASPersonWorkingTimeDTO.java index 001a0e6..5ddf47f 100644 --- a/src/main/java/it/cnr/isti/epasmed/epas/dto/EPASPersonWorkingTimeDTO.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/dto/EPASPersonWorkingTimeDTO.java @@ -19,15 +19,15 @@ public class EPASPersonWorkingTimeDTO implements Serializable { private String dal; private String al; private String descrizione; - private int lun; - private int mar; - private int mer; - private int gio; - private int ven; - private int sab; - private int percentuale; + private Integer lun; + private Integer mar; + private Integer mer; + private Integer gio; + private Integer ven; + private Integer sab; + private Integer percentuale; private String turno; - private int ore_turno; + private Integer ore_turno; private String festivo; private String notturno; diff --git a/src/main/java/it/cnr/isti/epasmed/epas/model/EPASLeaves.java b/src/main/java/it/cnr/isti/epasmed/epas/model/EPASLeaves.java index 6c64694..131bb53 100755 --- a/src/main/java/it/cnr/isti/epasmed/epas/model/EPASLeaves.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/model/EPASLeaves.java @@ -18,4 +18,5 @@ public class EPASLeaves implements Serializable { private String code; private String start; private String end; + private EPASAbsences[] absences; } \ No newline at end of file diff --git a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASAbsenceTypesService.java b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASAbsenceTypesService.java index 9a3fa15..d46d814 100644 --- a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASAbsenceTypesService.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASAbsenceTypesService.java @@ -2,6 +2,7 @@ package it.cnr.isti.epasmed.epas.service; import java.util.LinkedHashMap; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; @@ -32,4 +33,16 @@ public class EPASAbsenceTypesService { return epasAbsenceTypeMap; } + public LinkedHashMap getAbsenceTypesMapFull() { + + List epasAbsenceTypeList=epasAbsenceTypesClient.getAbsenceTypes(); + LinkedHashMap epasAbsenceTypeMap=new LinkedHashMap<>(); + if(epasAbsenceTypeList!=null && !epasAbsenceTypeList.isEmpty()) { + epasAbsenceTypeMap=epasAbsenceTypeList.stream().collect( + Collectors.toMap(EPASAbsenceTypes::getCode, Function.identity(), + (oldValue, newValue) -> newValue, LinkedHashMap::new)); + } + return epasAbsenceTypeMap; + } + } diff --git a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASLeavesService.java b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASLeavesService.java index 8e3366d..df1295e 100755 --- a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASLeavesService.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASLeavesService.java @@ -14,20 +14,20 @@ public class EPASLeavesService { @Autowired EPASLeavesClient epasLeavesClient; - public List getLeavesByPersonId(String id, String year) { - return epasLeavesClient.getByPersonId(id, year); + public List getLeavesByPersonId(String id, String year, String includeDetails) { + return epasLeavesClient.getByPersonId(id, year, includeDetails); } - public List getLeavesByPersonFiscalcode(String fc, String year) { - return epasLeavesClient.getByFiscalcode(fc, year); + public List getLeavesByPersonFiscalcode(String fc, String year, String includeDetails) { + return epasLeavesClient.getByFiscalcode(fc, year, includeDetails); } - public List getLeavesByPersonEmail(String email, String year) { - return epasLeavesClient.getByPersonEmail(email, year); + public List getLeavesByPersonEmail(String email, String year, String includeDetails) { + return epasLeavesClient.getByPersonEmail(email, year, includeDetails); } - public List getLeavesByOfficeCodeId(String officeCodeId, String year) { - return epasLeavesClient.getByOfficeCodeId(officeCodeId, year); + public List getLeavesByOfficeId(String officeId, String year, String includeDetails) { + return epasLeavesClient.getByOfficeId(officeId, year, includeDetails); } } diff --git a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASPersonWorkingTimeService.java b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASPersonWorkingTimeService.java index 5088f35..c1af7f8 100644 --- a/src/main/java/it/cnr/isti/epasmed/epas/service/EPASPersonWorkingTimeService.java +++ b/src/main/java/it/cnr/isti/epasmed/epas/service/EPASPersonWorkingTimeService.java @@ -4,6 +4,7 @@ import java.time.DayOfWeek; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import org.slf4j.Logger; @@ -29,28 +30,47 @@ public class EPASPersonWorkingTimeService { @Autowired EPASPersonsService epasPersonService; - + @Autowired EPASContractsService epasContranctsService; public EPASPersonWorkingTimeDTO getByPersonId(String personId) { - List listContracts = epasContranctsService.getByPersonId(personId); + + List listContracts = null; + try { + listContracts = epasContranctsService.getByPersonId(personId); + } catch (Exception e) { + logger.error("Error retrieving contracts for person id: {}", personId); + logger.error(e.getLocalizedMessage(), e); + return null; + } + if (listContracts == null || listContracts.isEmpty()) { logger.error("There is no contract for this person Id: {}", personId); return null; } + EPASPersonWorkingTimeDTO pwtDTO = getPersonWorkingTimeDTO(personId, listContracts); return pwtDTO; } public EPASPersonWorkingTimeDTO getByPersonFiscalCode(String fc) { - EPASPersons epasPerson=epasPersonService.getByFiscalCode(fc); - if(epasPerson==null||epasPerson.getId()==null||epasPerson.getId().isEmpty()) { + EPASPersons epasPerson = epasPersonService.getByFiscalCode(fc); + if (epasPerson == null || epasPerson.getId() == null || epasPerson.getId().isEmpty()) { logger.error("There is no Person for fiscal code: {}", fc); return null; } - logger.debug("EPASPerson: {}",epasPerson); - List listContracts = epasContranctsService.getByPersonFiscalcode(fc); + logger.debug("EPASPerson: {}", epasPerson); + + List listContracts = null; + try { + listContracts = epasContranctsService.getByPersonFiscalcode(fc); + } catch (Exception e) { + logger.error("Error retrieving contracts for fiscal code: {}", fc); + logger.error(e.getLocalizedMessage(), e); + return null; + } + if (listContracts == null || listContracts.isEmpty()) { logger.error("There is no contract for this person Id: {}", epasPerson.getId()); return null; @@ -58,9 +78,7 @@ public class EPASPersonWorkingTimeService { EPASPersonWorkingTimeDTO pwtDTO = getPersonWorkingTimeDTO(epasPerson.getId(), listContracts); return pwtDTO; } - - - + private EPASPersonWorkingTimeDTO getPersonWorkingTimeDTO(String personId, List listContracts) { String lastContractId = null; LocalDate lastContractDate = null; @@ -74,7 +92,7 @@ public class EPASPersonWorkingTimeService { } if (lastContractId == null || lastContractId.isEmpty()) { - logger.error("There is no last contract for this person id: {}",personId); + logger.error("There is no last contract for this person id: {}", personId); return null; } logger.debug("Found Last Contract Id: {}", lastContractId); @@ -123,7 +141,7 @@ public class EPASPersonWorkingTimeService { } LinkedHashMap workingTimeByDays = new LinkedHashMap(); - + int percentuale = 0; for (EPASWorkingTimeTypeDays wtd : wtt.getWorkingTimeTypeDays()) { boolean isHoliday = Boolean.parseBoolean(wtd.getHoliday()); try { @@ -134,23 +152,40 @@ public class EPASPersonWorkingTimeService { } else { int workingTime = Integer.parseInt(wtd.getWorkingTime()); workingTimeByDays.put(dayOfWeek, workingTime); + percentuale += workingTime; } } catch (NumberFormatException e) { - logger.error("Invalid working time by days: "+e.getLocalizedMessage(),e); + logger.error("Invalid working time by days: " + e.getLocalizedMessage(), e); } } - //TODO - // Recuperare la percentuale, turno e le ore turno. + percentuale = (100 * percentuale) / 2160; + // TODO + // turno e le ore turno. EPASPersonWorkingTimeDTO pwtDTO = new EPASPersonWorkingTimeDTO(lastContractId, personId, lastContract.getPerson().getFiscalCode(), lastWTPBeginDateS, lastWTPEndDate, wtt.getDescription(), workingTimeByDays.get(DayOfWeek.MONDAY.getValue()), workingTimeByDays.get(DayOfWeek.TUESDAY.getValue()), workingTimeByDays.get(DayOfWeek.WEDNESDAY.getValue()), workingTimeByDays.get(DayOfWeek.THURSDAY.getValue()), workingTimeByDays.get(DayOfWeek.FRIDAY.getValue()), - workingTimeByDays.get(DayOfWeek.SATURDAY.getValue()), - 100, "NO", 0, "SI", "NO"); + workingTimeByDays.get(DayOfWeek.SATURDAY.getValue()), percentuale, "NO", 0, "SI", "NO"); return pwtDTO; } + + public List getList(String officeId) { + List epasPersons=epasPersonService.getList(officeId); + if(epasPersons==null||epasPersons.isEmpty()) { + logger.error("No persons found for office id: {}",officeId); + return null; + } + + List pwtDTOList=new LinkedList<>(); + for(EPASPersons epasPerson:epasPersons) { + EPASPersonWorkingTimeDTO pwtDTO=getByPersonId(epasPerson.getId()); + pwtDTOList.add(pwtDTO); + } + return pwtDTOList; + } + } diff --git a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIAspettative.java b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIAspettative.java new file mode 100644 index 0000000..4350a1c --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIAspettative.java @@ -0,0 +1,31 @@ +package it.cnr.isti.epasmed.sistemainformativo.model; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SIAspettative implements Serializable { + + private static final long serialVersionUID = 1L; + + private String cf; + private String codice_assenza_descrizione; + private Date data_inizio; + private Date data_fine; + private Timestamp data_mod; + private String flag_del; + private Long id_flusso; + private Integer id; + private Integer idpersona; + private Integer codice_assenza_codice; + private String codice_assenza_cnr; + private Integer durata; + +} diff --git a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIPersOrario.java b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIPersOrario.java new file mode 100644 index 0000000..66ec2a8 --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/model/SIPersOrario.java @@ -0,0 +1,39 @@ +package it.cnr.isti.epasmed.sistemainformativo.model; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.Date; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SIPersOrario implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private Integer idpersona; + private String cf; + private Date dal; + private Date al; + private String descrizione; + private Integer lun; + private Integer mar; + private Integer mer; + private Integer gio; + private Integer ven; + private Integer sab; + private Integer percentuale; + private String turno; + private Integer ore_turno; + private String festivo; + private String notturno; + private Timestamp data_mod; + private String flag_del; + private Long id_flusso; + +} diff --git a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIAspettativeRepository.java b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIAspettativeRepository.java new file mode 100644 index 0000000..c249104 --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIAspettativeRepository.java @@ -0,0 +1,43 @@ +package it.cnr.isti.epasmed.sistemainformativo.repository; + +import javax.sql.DataSource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +import it.cnr.isti.epasmed.sistemainformativo.model.SIAspettative; + +@Repository +public class SIAspettativeRepository { + + private static final Logger logger = LoggerFactory.getLogger(SIAspettativeRepository.class); + + private JdbcTemplate jdbcTemplate; + + // + public SIAspettativeRepository( + final @Qualifier("sistemaInformativoDataSource") DataSource dataSource) { + super(); + this.jdbcTemplate = new JdbcTemplate(dataSource); + } + + public void writeNewFlux(Long fluxId, SIAspettative siAspettative) { + jdbcTemplate.update( + "INSERT INTO epas_aspettative (cf,codice_assenza_descrizione," + + "data_inizio,data_fine,data_mod,flag_del,id_flusso," + + "id,idpersona," + + "codice_assenza_codice,codice_assenza_cnr,durata)" + + " VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", + siAspettative.getCf(), siAspettative.getCodice_assenza_descrizione(), + siAspettative.getData_inizio(), siAspettative.getData_fine(), + siAspettative.getData_mod(),siAspettative.getFlag_del(), fluxId, + siAspettative.getId(), siAspettative.getIdpersona(), + siAspettative.getCodice_assenza_codice(), siAspettative.getCodice_assenza_cnr(), + siAspettative.getDurata()); + logger.debug("Writed SIAspettative: {}", siAspettative); + } + +} diff --git a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIMasterLogRepository.java b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIMasterLogRepository.java index d9eac9e..e43d931 100755 --- a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIMasterLogRepository.java +++ b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/repository/SIMasterLogRepository.java @@ -77,7 +77,7 @@ public class SIMasterLogRepository { jdbcTemplate.update("INSERT INTO master_log (codice_flusso, tabelle, operazione, data_inizio_oper)" + " VALUES ('epas','epas_cartellini, epas_cartellini_rendicontazioni," + " epas_orario," - + " epas_lavoro_fuori_sede'," + + " epas_lavoro_fuori_sede, epas_aspettative, epas_pers_orario'," + " 'S',current_timestamp)"); logger.info("Flusso in scrittura aperto"); diff --git a/src/main/java/it/cnr/isti/epasmed/sistemainformativo/service/SIAspettativeService.java b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/service/SIAspettativeService.java new file mode 100644 index 0000000..0b75611 --- /dev/null +++ b/src/main/java/it/cnr/isti/epasmed/sistemainformativo/service/SIAspettativeService.java @@ -0,0 +1,35 @@ +package it.cnr.isti.epasmed.sistemainformativo.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import it.cnr.isti.epasmed.sistemainformativo.model.SIAspettative; +import it.cnr.isti.epasmed.sistemainformativo.repository.SIAspettativeRepository; + + + +/** + * Service class for managing Aspettative. + */ +@Service +@Transactional("sistemaInformativoTransactionManager") +public class SIAspettativeService { + + private static final Logger logger = LoggerFactory.getLogger(SIAspettativeService.class); + + private final SIAspettativeRepository siAspettativeRepository; + + public SIAspettativeService(SIAspettativeRepository siAspettativeRepository) { + super(); + this.siAspettativeRepository = siAspettativeRepository; + } + + public void writeNewFlux(Long fluxId, SIAspettative siAspettative) { + logger.debug("Write SIAspettative Flux = {}",fluxId); + siAspettativeRepository.writeNewFlux(fluxId,siAspettative); + } + + +} \ No newline at end of file diff --git a/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java b/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java index 7f1f8d8..bd3d170 100755 --- a/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java +++ b/src/main/java/it/cnr/isti/epasmed/sync/SyncService.java @@ -2,14 +2,17 @@ package it.cnr.isti.epasmed.sync; import java.sql.Timestamp; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -30,9 +33,11 @@ import it.cnr.isti.epasmed.epas.dto.EPASPersonsDTO; import it.cnr.isti.epasmed.epas.mapper.EPASAffiliationsMapper; import it.cnr.isti.epasmed.epas.mapper.EPASGroupsMapper; import it.cnr.isti.epasmed.epas.mapper.EPASPersonsMapper; +import it.cnr.isti.epasmed.epas.model.EPASAbsenceTypes; import it.cnr.isti.epasmed.epas.model.EPASAbsences; import it.cnr.isti.epasmed.epas.model.EPASAffiliations; import it.cnr.isti.epasmed.epas.model.EPASGroups; +import it.cnr.isti.epasmed.epas.model.EPASLeaves; import it.cnr.isti.epasmed.epas.model.EPASOffSiteWorks; import it.cnr.isti.epasmed.epas.model.EPASPersonDays; import it.cnr.isti.epasmed.epas.model.EPASPersons; @@ -43,6 +48,7 @@ import it.cnr.isti.epasmed.epas.model.EPASWorkingTimeTypes; import it.cnr.isti.epasmed.epas.service.EPASAbsenceTypesService; import it.cnr.isti.epasmed.epas.service.EPASAffiliationsService; import it.cnr.isti.epasmed.epas.service.EPASGroupsService; +import it.cnr.isti.epasmed.epas.service.EPASLeavesService; import it.cnr.isti.epasmed.epas.service.EPASOffSiteWorksService; import it.cnr.isti.epasmed.epas.service.EPASPersonsService; import it.cnr.isti.epasmed.epas.service.EPASTimeCardsService; @@ -51,6 +57,7 @@ import it.cnr.isti.epasmed.epas.service.EPASWorkingTimeTypesService; import it.cnr.isti.epasmed.service.TabsSIService; import it.cnr.isti.epasmed.service.TimeCardsReportingService; import it.cnr.isti.epasmed.sistemainformativo.model.SIAnagrafico; +import it.cnr.isti.epasmed.sistemainformativo.model.SIAspettative; import it.cnr.isti.epasmed.sistemainformativo.model.SICartellini; import it.cnr.isti.epasmed.sistemainformativo.model.SICartelliniRendicontazioni; import it.cnr.isti.epasmed.sistemainformativo.model.SIEmail; @@ -60,6 +67,7 @@ import it.cnr.isti.epasmed.sistemainformativo.model.SILavoroFuoriSede; import it.cnr.isti.epasmed.sistemainformativo.model.SIOrario; import it.cnr.isti.epasmed.sistemainformativo.model.SITelefoni; import it.cnr.isti.epasmed.sistemainformativo.service.SIAnagraficoService; +import it.cnr.isti.epasmed.sistemainformativo.service.SIAspettativeService; import it.cnr.isti.epasmed.sistemainformativo.service.SICartelliniRendicontazioniService; import it.cnr.isti.epasmed.sistemainformativo.service.SICartelliniService; import it.cnr.isti.epasmed.sistemainformativo.service.SIEmailService; @@ -114,6 +122,8 @@ public class SyncService { SIOrarioService siOrarioService; @Autowired SILavoroFuoriSedeService siLavoroFuoriSedeService; + @Autowired + SIAspettativeService siAspettativeService; @Autowired EPASPersonsService epasPersonsService; @@ -133,6 +143,8 @@ public class SyncService { EPASOffSiteWorksService epasOffSiteWorksService; @Autowired EPASAbsenceTypesService epasAbsenceTypeService; + @Autowired + EPASLeavesService epasLeavesService; private boolean banagrafico; private boolean bemail; @@ -218,6 +230,15 @@ public class SyncService { } + public void executeWriteLeaves(String year, String month) throws Exception { + setBWriteTables(); + List tabsSI = tabsSIService.getAllTabsSI(); + Long fluxId = siMasterLogService.startFluxWrites(); + writeLeavesData(fluxId, tabsSI, year, month); + siMasterLogService.closeFluxWrites(fluxId, writeTabs()); + + } + private void readData(List tabsSI) { // TabsSI posizioniTab = null; // TabsSI prorogheTab = null; @@ -831,20 +852,6 @@ public class SyncService { case "orario": syncOrario(fluxId, tab); break; - // case "pers_orario": - // syncPersOrario(fluxId,tab); - // break; - // case "cartellini": - // break; - // case "cartellini_rendicontazioni": - // syncCartelliniRendicontazioni(fluxId, tab); - // break; - // case "lavoro_fuori_sede": - // syncLavoroFuoriSede(fluxId,tab); - // break; - // case "aspettative": - // syncAspettative(fluxId,tab); - // break; default: break; } @@ -937,9 +944,6 @@ public class SyncService { logger.info("Report {}-{}", year, month); logger.info("FiscalCode: {}", fc); LocalDateTime now = LocalDateTime.now(); - // checkValidMonthToSend(year, month); - // TimeCardsReporting timeCardsReporting = createTimeCardReporting(fluxId, year, - // month, now); for (TabsSI tab : tabsSI) { logger.info("TabSI: {}", tab); @@ -950,25 +954,9 @@ public class SyncService { } switch (tab.getNome()) { - // case "orario": - // syncOrario(fluxId, tab); - // break; - // case "pers_orario": - // syncPersOrario(fluxId,tab); - // break; case "cartellini": syncSingleCartellino(fluxId, tab, year, month, now, fc); break; - // case "cartellini_rendicontazioni": - // syncCartelliniRendicontazioni(fluxId, tab, year, month, now, - // timeCardsReporting); - // break; - // case "lavoro_fuori_sede": - // syncLavoroFuoriSede(fluxId,tab); - // break; - // case "aspettative": - // syncAspettative(fluxId,tab); - // break; default: break; } @@ -980,7 +968,7 @@ public class SyncService { private void writeOffSiteWorksData(Long fluxId, List tabsSI, String year, String month) throws Exception { logger.info("Report {}-{}", year, month); LocalDateTime now = LocalDateTime.now(); - checkValidMonthToSend(year, month); + // checkValidMonthToSend(year, month); for (TabsSI tab : tabsSI) { logger.info("TabSI: {}", tab); @@ -991,23 +979,34 @@ public class SyncService { } switch (tab.getNome()) { - // case "orario": - // syncOrario(fluxId, tab); - // break; - // case "pers_orario": - // syncPersOrario(fluxId,tab); - // break; - // case "cartellini": - // break; - // case "cartellini_rendicontazioni": - // syncCartelliniRendicontazioni(fluxId, tab); - // break; case "lavoro_fuori_sede": syncLavoroFuoriSede(fluxId, tab, year, month, now); break; - // case "aspettative": - // syncAspettative(fluxId,tab); - // break; + default: + break; + } + + } + } + } + + private void writeLeavesData(Long fluxId, List tabsSI, String year, String month) throws Exception { + logger.info("Report {}-{}", year, month); + LocalDateTime now = LocalDateTime.now(); + // checkValidMonthToSend(year, month); + + for (TabsSI tab : tabsSI) { + logger.info("TabSI: {}", tab); + if (tab.getOperazioni() != null && !tab.getOperazioni().isEmpty() + && tab.getOperazioni().compareTo("W") == 0) { + if (tab.getNome() == null || tab.getNome().isEmpty()) { + continue; + } + + switch (tab.getNome()) { + case "aspettative": + syncAspettative(fluxId, tab, year, month, now); + break; default: break; } @@ -1164,6 +1163,163 @@ public class SyncService { } + private void syncAspettative(Long fluxId, TabsSI tab, String year, String month, LocalDateTime now) + throws Exception { + + if (tab.getIdFlusso() == null || tab.getIdFlusso().longValue() == 0) { + logger.error("Invalid Id Flusso for tab: {}", tab); + return; + } + + logger.info("Reference: {}-{}", year, month); + + Integer nextYear = 0; + try { + nextYear = Integer.parseInt(year); + } catch (Exception e) { + logger.error("Invalid year parameter: {}", year); + return; + } + nextYear = nextYear + 1; + logger.info("Next Year: {}", nextYear.toString()); + + List epasLeavesList = epasLeavesService.getLeavesByOfficeId(ISTI_OFFICE_ID, year, "true"); + logger.info("Current Year Leaves: {}", epasLeavesList); + List epasLeavesNextList = epasLeavesService.getLeavesByOfficeId(ISTI_OFFICE_ID, nextYear.toString(), + "true"); + logger.info("Next Year Leaves: {}", epasLeavesNextList); + + if (epasLeavesList == null || epasLeavesList.isEmpty()) { + logger.info("Leaves not found for: {}", year); + epasLeavesList = new LinkedList<>(); + } + + if (epasLeavesNextList == null || epasLeavesNextList.isEmpty()) { + logger.info("Leaves not found for: {}", nextYear); + epasLeavesNextList = new LinkedList<>(); + } + + epasLeavesList.addAll(epasLeavesNextList); + + if (epasLeavesList.isEmpty()) { + logger.info("Leaves not found"); + return; + } + + LinkedHashMap epasAbsenceTypeMap = epasAbsenceTypeService.getAbsenceTypesMapFull(); + + if (epasAbsenceTypeMap == null || epasAbsenceTypeMap.isEmpty()) { + logger.error("Absence Type Map not found"); + return; + } + + writeAspettativeOnSI(fluxId, now, epasLeavesList, epasAbsenceTypeMap); + + logger.info("SIAspettative Updated"); + + baspettative = true; + tab.setIdFlusso(fluxId); + tab.setLastUpdate(now); + tabsSIService.updateTabsSI(tab); + + } + + private void writeAspettativeOnSI(Long fluxId, LocalDateTime now, List epasLeavesList, + LinkedHashMap epasAbsenceTypeMap) { + // SI + for (EPASLeaves leave : epasLeavesList) { + logger.info("Writing Leave: {}", leave); + if (leave == null || leave.getPerson() == null) { + logger.error("Invalid Leave: {}", leave); + continue; + } + + if (leave.getPerson().getFiscalCode() == null || leave.getPerson().getFiscalCode().isEmpty()) { + logger.error("Invalid FiscalCode: {}", leave.getPerson().getFiscalCode()); + continue; + } else { + logger.info("FiscalCode: {}", leave.getPerson().getFiscalCode()); + } + + Integer idPersona = 0; + try { + idPersona = Integer.valueOf(leave.getPerson().getId()); + } catch (NumberFormatException e) { + logger.error("Invalid Person Id: {}", leave.getPerson().getId()); + continue; + } + + if (leave.getCode() == null || leave.getCode().isEmpty()) { + logger.error("Invalid absence code: {}", leave.getCode()); + continue; + } + + EPASAbsenceTypes epasAbsenceType = epasAbsenceTypeMap.get(leave.getCode()); + if (epasAbsenceType == null) { + logger.error("Not found absence type: {}", leave.getCode()); + continue; + } + + Integer absenceId = 0; + try { + absenceId = Integer.parseInt(epasAbsenceType.getId()); + } catch (NumberFormatException e) { + logger.error("Not found absence id for absence: {}", leave.getCode()); + continue; + } + + logger.info("Start Date: {}", leave.getStart()); + java.sql.Date startDate = null; + if (leave.getStart() == null || leave.getStart().isEmpty()) { + logger.error("Invalid start date: {}", leave.getStart()); + continue; + } + + try { + startDate = java.sql.Date.valueOf(leave.getStart()); + } catch (Exception e) { + logger.error("Invalid start date format: {}", leave.getStart()); + continue; + } + + logger.info("End Date: {}", leave.getEnd()); + java.sql.Date endDate = null; + if (leave.getEnd() != null && !leave.getEnd().isEmpty()) { + try { + endDate = java.sql.Date.valueOf(leave.getEnd()); + } catch (Exception e) { + logger.error("Invalid end date format: {}", leave.getEnd()); + } + } + + Timestamp dataMod = Timestamp.valueOf(now); + Integer durata = 0; + if (startDate != null && endDate != null) { + LocalDate startD = LocalDate.parse(leave.getStart()); + LocalDate endD = LocalDate.parse(leave.getEnd()); + durata = new Long(ChronoUnit.DAYS.between(startD, endD) + 1).intValue(); + } + + int id = 0; + if (leave.getAbsences() != null && leave.getAbsences().length > 0) { + EPASAbsences firstAbsence = leave.getAbsences()[0]; + try { + id = Integer.parseInt(firstAbsence.getId()); + } catch (NumberFormatException e) { + logger.error("Invalid id for first absence: {}",firstAbsence); + } + } + + + SIAspettative siAspettative = new SIAspettative(leave.getPerson().getFiscalCode(), + epasAbsenceType.getDescription(), startDate, endDate, dataMod, SI_FLAG_DEL_FALSE, fluxId, id, + idPersona, absenceId, epasAbsenceType.getCode(), durata); + logger.info("Write SIAspettativa: {}", siAspettative); + siAspettativeService.writeNewFlux(fluxId, siAspettative); + + } + } + private void syncCartelliniRendicontazioni(Long fluxId, TabsSI tab, String year, String month, LocalDateTime now, TimeCardsReporting timeCardsReporting) throws Exception { if (tab.getIdFlusso() == null || tab.getIdFlusso().longValue() == 0) { @@ -1279,7 +1435,7 @@ public class SyncService { if (EXPORT_ABSENCE_CODE_DESCRIPTION) { epasAbsenceTypeMap = epasAbsenceTypeService.getAbsenceTypesMap(); } - + EPASPersons epasPerson = epasTimeCards.getPerson(); Integer personId = Integer.valueOf(epasPerson.getId()); diff --git a/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResource.java b/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResource.java index 767a8fe..7075030 100755 --- a/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResource.java +++ b/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResource.java @@ -36,33 +36,34 @@ public class EPASLeavesResource { /** * {@code GET /leaves/byPersonAndYear} : get contracts by person and year * - * @param id the id of the person. - * @param fiscalCode the fiscal code of the person. - * @param email the email of the person. + * @param id the id of the person. + * @param fiscalCode the fiscal code of the person. + * @param email the email of the person. + * @param includeDetails a true or false flag that specifies whether or not to + * include absence details. * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body * the EPAS Leaves, or with status {@code 404 (Not Found)}. */ @GetMapping("/leaves/byPersonAndYear") public ResponseEntity> getEPASContractsByPerson(@RequestParam("id") Optional id, - @RequestParam("fiscalCode") Optional fiscalCode, - @RequestParam("email") Optional email, - @RequestParam("year") String year) { + @RequestParam("fiscalCode") Optional fiscalCode, @RequestParam("email") Optional email, + @RequestParam("year") String year, @RequestParam("includeDetails") String includeDetails) { List epasLeavesList = null; if (id.isPresent()) { logger.info("REST request to get ePAS Leaves by Person: {}", id.get()); - epasLeavesList = epasLeavesService.getLeavesByPersonId(id.get(),year); + epasLeavesList = epasLeavesService.getLeavesByPersonId(id.get(), year, includeDetails); } else { if (fiscalCode.isPresent()) { logger.info("REST request to get ePAS Leaves by Person fiscal code: {}", fiscalCode.get()); - epasLeavesList = epasLeavesService.getLeavesByPersonFiscalcode(fiscalCode.get(), year); + epasLeavesList = epasLeavesService.getLeavesByPersonFiscalcode(fiscalCode.get(), year, includeDetails); } else { if (email.isPresent()) { logger.info("REST request to get ePAS Leaves by Person email: {}", email.get()); - epasLeavesList = epasLeavesService.getLeavesByPersonEmail(email.get(), year); + epasLeavesList = epasLeavesService.getLeavesByPersonEmail(email.get(), year, includeDetails); } else { - return ResponseUtil.wrapOrNotFound(Optional.of(epasLeavesList), HeaderUtil.createFailureAlert(applicationName,false, - "","","Invalid parameter in call")); - + return ResponseUtil.wrapOrNotFound(Optional.of(epasLeavesList), + HeaderUtil.createFailureAlert(applicationName, false, "", "", "Invalid parameter in call")); + } } } @@ -70,23 +71,23 @@ public class EPASLeavesResource { return ResponseUtil.wrapOrNotFound(Optional.of(epasLeavesList)); } - /** * {@code GET /leaves/byOfficeAndYear} : get leaves by office and year. * - * @param officeCodeId the office codeId. - * @param year the year. + * @param officeId the office Id. + * @param year the year. + * @param includeDetails a true or false flag that specifies whether or not to + * include absence details. * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body * the list of EPAS Leaves, or with status {@code 404 (Not Found)}. */ @GetMapping("/leaves/byOfficeAndYear") - public ResponseEntity> getEPASLeavesByOfficeCodeId(@RequestParam("officeCodeId") String officeCodeId, - @RequestParam("year") String year) { - logger.info("REST request to get ePAS Leaves by office: codeId={}, year={}", officeCodeId, year); - List epasLeavesList = epasLeavesService.getLeavesByOfficeCodeId(officeCodeId, year); + public ResponseEntity> getEPASLeavesByOfficeCodeId(@RequestParam("officeId") String officeId, + @RequestParam("year") String year, @RequestParam("includeDetails") String includeDetails) { + logger.info("REST request to get ePAS Leaves by office: codeId={}, year={}", officeId, year); + List epasLeavesList = epasLeavesService.getLeavesByOfficeId(officeId, year, includeDetails); return ResponseUtil.wrapOrNotFound(Optional.of(epasLeavesList)); } - } diff --git a/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeResource.java b/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeResource.java index b52fca2..0d50e56 100644 --- a/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeResource.java +++ b/src/main/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeResource.java @@ -1,5 +1,6 @@ package it.cnr.isti.epasmed.web.rest.epas; +import java.util.List; import java.util.Optional; import org.slf4j.Logger; @@ -61,4 +62,22 @@ public class EPASPersonWorkingTimeResource { return ResponseUtil.wrapOrNotFound(Optional.of(epasPersonWorkingTime)); } + + /** + * {@code GET /personworkingtime/list} : get personwokingtime by office id. + * + * @param officeId the office Id. + * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body + * the list of EPAS Person Working Time, or with status + * {@code 404 (Not Found)}. + */ + @GetMapping("/personworkingtime/list") + public ResponseEntity> getEPASPersonWorkingTimeOfficeId( + @RequestParam("officeId") String officeId) { + logger.info("REST request to get ePAS Person Working Time by office Id={}", officeId); + List epasPersonWorkingTimeList = epasPersonWorkingTimeService.getList(officeId); + return ResponseUtil.wrapOrNotFound(Optional.of(epasPersonWorkingTimeList)); + + } + } diff --git a/src/main/java/it/cnr/isti/epasmed/web/rest/sync/SyncResource.java b/src/main/java/it/cnr/isti/epasmed/web/rest/sync/SyncResource.java index 44123c3..a0f148e 100755 --- a/src/main/java/it/cnr/isti/epasmed/web/rest/sync/SyncResource.java +++ b/src/main/java/it/cnr/isti/epasmed/web/rest/sync/SyncResource.java @@ -220,5 +220,32 @@ public class SyncResource { return res; } + + + /** + * {@code GET /sync/writesLeaves} : Reports Leaves from ePAS in + * SistemaInformativo. + * + * @param year the year. + * @param month the month. + * @return the {@link ResponseEntity} with status {@code 201 (Executed)} or with + * status {@code 400 (Bad Request)} if there is a error. + * @throws Exception + * + * + */ + @GetMapping("/sync/writesLeaves") + @PreAuthorize("hasAuthority(\"" + AuthoritiesConstants.ADMIN + "\")") + public ResponseEntity syncWritesLeaves(@RequestParam("year") String year, + @RequestParam("month") String month) throws Exception { + logger.info("REST request syncWritesLeaves)"); + ResponseEntity res; + syncService.executeWriteLeaves(year, month); + String msg = "Rendicontazione delle Aspettative eseguita correttamente."; + logger.info(msg); + res = ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, msg, "")).build(); + + return res; + } } diff --git a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASAbsenceTypesResourceIT.java b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASAbsenceTypesResourceIT.java index 8b5740d..eda2ee9 100644 --- a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASAbsenceTypesResourceIT.java +++ b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASAbsenceTypesResourceIT.java @@ -36,7 +36,7 @@ import it.cnr.isti.epasmed.security.AuthoritiesConstants; @EnabledIf("false") public class EPASAbsenceTypesResourceIT { - private final Logger log = LoggerFactory.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); // private static final String OFFICE_DEFAULT_ID = "1"; // private static final String OFFICE_DEFAULT_NAME = "ISTI - Pisa"; @@ -52,7 +52,7 @@ public class EPASAbsenceTypesResourceIT { @BeforeEach public void initTest() { for (String profileName : environment.getActiveProfiles()) { - log.info("Currently active profile - " + profileName); + logger.info("Currently active profile - " + profileName); } } @@ -70,14 +70,14 @@ public class EPASAbsenceTypesResourceIT { }); } catch (Exception e) { - log.error(e.getLocalizedMessage(), e); + logger.error(e.getLocalizedMessage(), e); return; } if (epasAbsenceTypes != null) { - log.info("EPAS Absence Types size: {}", epasAbsenceTypes.size()); + logger.info("EPAS Absence Types size: {}", epasAbsenceTypes.size()); for (EPASAbsenceTypes type : epasAbsenceTypes) { - log.info("{}", type); + logger.info("{}", type); } } @@ -97,14 +97,14 @@ public class EPASAbsenceTypesResourceIT { }); } catch (Exception e) { - log.error(e.getLocalizedMessage(), e); + logger.error(e.getLocalizedMessage(), e); return; } if (epasAbsenceTypesMap != null) { - log.info("EPAS Absence Types Map size: {}", epasAbsenceTypesMap.size()); + logger.info("EPAS Absence Types Map size: {}", epasAbsenceTypesMap.size()); for (Map.Entry m : epasAbsenceTypesMap.entrySet()) { - log.info(m.getKey() + "-" + m.getValue()); + logger.info(m.getKey() + "-" + m.getValue()); } } diff --git a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResourceIT.java b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResourceIT.java index c206faf..a33ef13 100755 --- a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResourceIT.java +++ b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASLeavesResourceIT.java @@ -29,27 +29,26 @@ public class EPASLeavesResourceIT { private final Logger log = LoggerFactory.getLogger(getClass()); - // private static final String OFFICE_DEFAULT_ID = "1"; + private static final String OFFICE_DEFAULT_ID = "1"; // private static final String OFFICE_DEFAULT_NAME = "ISTI - Pisa"; // private static final String OFFICE_DEFAULT_CODE = "074000"; - private static final String OFFICE_DEFAULT_CODEID = "225200"; - private static final String YEAR_DEFAULT="2022"; - - private static final String PERSON_DEFAULT_ID = "xxx"; - //private static final String PERSON_DEFAULT_NAME = "Giulio"; - //private static final String PERSON_DEFAULT_SURNAME = "Mori"; + // private static final String OFFICE_DEFAULT_CODEID = "225200"; + private static final String YEAR_DEFAULT = "2022"; + private static final String INCLUDEDETAILS_DEFAULT = "false"; + + private static final String PERSON_DEFAULT_ID = "1"; + // private static final String PERSON_DEFAULT_NAME = "Giulio"; + // private static final String PERSON_DEFAULT_SURNAME = "Mori"; private static final String PERSON_DEFAULT_FISCAL_CODE = "MROGLI68H29E625F"; private static final String PERSON_DEFAULT_EMAIL = "giulio.mori@cnr.it"; - - - + @Autowired private MockMvc restEPASLeavesMockMvc; @Autowired private Environment environment; - //private EPASLeaves epasLeaves; + // private EPASLeaves epasLeaves; @BeforeEach public void initTest() { @@ -60,30 +59,26 @@ public class EPASLeavesResourceIT { @Test public void getEPASLeavesByPersonId() throws Exception { - restEPASLeavesMockMvc.perform(get("/api/epas/leaves/byPersonAndYear?id=" + PERSON_DEFAULT_ID + "&year="+YEAR_DEFAULT)) - .andExpect(status().isOk()); + restEPASLeavesMockMvc.perform(get("/api/epas/leaves/byPersonAndYear?id=" + PERSON_DEFAULT_ID + "&year=" + + YEAR_DEFAULT + "&includeDetails=" + INCLUDEDETAILS_DEFAULT)).andExpect(status().isOk()); } @Test public void getEPASLeaveByPersonFiscalcode() throws Exception { - restEPASLeavesMockMvc - .perform( - get("/api/epas/leaves/byPersonAndYear?fiscalCode=" + PERSON_DEFAULT_FISCAL_CODE + "&year="+YEAR_DEFAULT)) - .andExpect(status().isOk()); + restEPASLeavesMockMvc.perform(get("/api/epas/leaves/byPersonAndYear?fiscalCode=" + PERSON_DEFAULT_FISCAL_CODE + + "&year=" + YEAR_DEFAULT + "&includeDetails=" + INCLUDEDETAILS_DEFAULT)).andExpect(status().isOk()); } @Test public void getEPASLeavesByPersonEmail() throws Exception { - restEPASLeavesMockMvc - .perform(get("/api/epas/leaves/byPersonAndYear?email=" + PERSON_DEFAULT_EMAIL + "&year="+YEAR_DEFAULT)) - .andExpect(status().isOk()); + restEPASLeavesMockMvc.perform(get("/api/epas/leaves/byPersonAndYear?email=" + PERSON_DEFAULT_EMAIL + "&year=" + + YEAR_DEFAULT + "&includeDetails=" + INCLUDEDETAILS_DEFAULT)).andExpect(status().isOk()); } @Test - public void getEPASLeavesByOfficeCodeId() throws Exception { - restEPASLeavesMockMvc - .perform(get("/api/epas/leaves/byOfficeAndYear?officeCodeId=" + OFFICE_DEFAULT_CODEID + "&year="+YEAR_DEFAULT)) - .andExpect(status().isOk()); + public void getEPASLeavesByOfficeId() throws Exception { + restEPASLeavesMockMvc.perform(get("/api/epas/leaves/byOfficeAndYear?officeId=" + OFFICE_DEFAULT_ID + "&year=" + + YEAR_DEFAULT + "&includeDetails=" + INCLUDEDETAILS_DEFAULT)).andExpect(status().isOk()); } } diff --git a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeIT.java b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeIT.java index 794416e..1eb7924 100644 --- a/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeIT.java +++ b/src/test/java/it/cnr/isti/epasmed/web/rest/epas/EPASPersonWorkingTimeIT.java @@ -3,6 +3,8 @@ package it.cnr.isti.epasmed.web.rest.epas; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import java.util.List; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -35,7 +37,7 @@ public class EPASPersonWorkingTimeIT { private static final Logger logger = LoggerFactory.getLogger(EPASPersonWorkingTimeIT.class); - // private static final String OFFICE_DEFAULT_ID = "1"; + private static final String OFFICE_DEFAULT_ID = "1"; // private static final String OFFICE_DEFAULT_NAME = "ISTI - Pisa"; // private static final String OFFICE_DEFAULT_CODE = "074000"; // private static final String OFFICE_DEFAULT_CODEID = "225200"; @@ -43,7 +45,10 @@ public class EPASPersonWorkingTimeIT { private static final String PERSON_DEFAULT_ID = "78"; //private static final String PERSON_DEFAULT_FISCAL_CODE = "MROGLI68H29E625F"; private static final String PERSON_DEFAULT_FISCAL_CODE = "PNCGCR75S04L103G"; - + //private static final String PERSON_DEFAULT_FISCAL_CODE = "MLSDNL59T56E281S"; + //private static final String PERSON_DEFAULT_FISCAL_CODE = "PCCMRA63M50G702W"; + //private static final String PERSON_DEFAULT_FISCAL_CODE = "LMBGNN59T09G702K"; + //private static final String PERSON_DEFAULT_FISCAL_CODE = "MNGPLA70T22D612X"; @Autowired @@ -84,5 +89,21 @@ public class EPASPersonWorkingTimeIT { logger.info("EPASPersonWorkingTime: {}", epasWTT); } + + + @Test + public void getPersonWorkingTimeList() throws Exception { + MvcResult result = restEPASPersonWorkingTimeMockMvc + .perform(get("/api/epas/personworkingtime/list?officeId=" + OFFICE_DEFAULT_ID)).andExpect(status().isOk()) + .andReturn(); + ObjectMapper mapper = new ObjectMapper(); + List epasWTTList = mapper.readValue(result.getResponse().getContentAsString(), + new TypeReference>() { + }); + logger.info("EPASPersonWorkingTime List: {}", epasWTTList); + + } + + } diff --git a/src/test/java/it/cnr/isti/epasmed/web/rest/sync/SyncResourceIT.java b/src/test/java/it/cnr/isti/epasmed/web/rest/sync/SyncResourceIT.java index eec31ea..935dfcb 100755 --- a/src/test/java/it/cnr/isti/epasmed/web/rest/sync/SyncResourceIT.java +++ b/src/test/java/it/cnr/isti/epasmed/web/rest/sync/SyncResourceIT.java @@ -80,4 +80,14 @@ public class SyncResourceIT { + PERSON_DEFAULT_FISCAL_CODE)); } + @Test + public void syncWritesOffSiteWorks() throws Exception { + restSyncMockMvc.perform(get("/api/sync/writesOffSiteWorks?year=" + YEAR + "&month=" + MONTH)); + } + + @Test + public void syncWritesLeaves() throws Exception { + restSyncMockMvc.perform(get("/api/sync/writesLeaves?year=" + YEAR + "&month=" + MONTH)); + } + }