Commit 382d4fe2 authored by RenanMontenegro3's avatar RenanMontenegro3

feat(blacklist): adicionando time_create em beanUtils

parent c3fe4af3
...@@ -154,17 +154,12 @@ public class AcceptRestController { ...@@ -154,17 +154,12 @@ public class AcceptRestController {
@PutMapping("/{id}") @PutMapping("/{id}")
@TWJobsPermissions.IsCompany @TWJobsPermissions.IsCompany
public EntityModel<AcceptResponse> update( public EntityModel<AcceptResponse> update(
// @RequestBody @Valid AcceptRequest acceptRequest, @Valid @RequestParam(name = "acceptRequestForm", required = true) String acceptRequestForm,
// @PathVariable Long id @PathVariable Long id,
@RequestParam(name = "foto", required = false) MultipartFile foto
@Valid @RequestParam(name="acceptRequestForm", required=true) String acceptRequestForm, @PathVariable Long id, @RequestParam(name="foto", required=false) MultipartFile foto
) throws JsonProcessingException { ) throws JsonProcessingException {
/*
Apenas admin podem setar manualmente o Status. O Candidate não pode. // Verifica extensão do arquivo (se houver)
Adicionar essa funcionalidade.
O mesmo para berços.
*/
//verifica extensao
String filename = foto.getOriginalFilename(); String filename = foto.getOriginalFilename();
String extension = null; String extension = null;
int dotIndex = filename.lastIndexOf("."); int dotIndex = filename.lastIndexOf(".");
...@@ -173,20 +168,18 @@ public class AcceptRestController { ...@@ -173,20 +168,18 @@ public class AcceptRestController {
} }
String[] extensions = {"txt", "zip", "pdf"}; String[] extensions = {"txt", "zip", "pdf"};
Boolean verifica = false; Boolean verifica = false;
if(extension!=null) { if (extension != null) {
for(String i : extensions){ for (String i : extensions) {
if(i.equals(extension) ) { if (i.equals(extension)) {
verifica =true; verifica = true;
break; break;
} }
} }
if(!verifica){ if (!verifica) {
throw new NegocioException(extension); throw new NegocioException(extension);
} }
} }
AcceptRequest acceptRequest = mapper.readValue(acceptRequestForm, AcceptRequest.class); AcceptRequest acceptRequest = mapper.readValue(acceptRequestForm, AcceptRequest.class);
...@@ -194,63 +187,44 @@ public class AcceptRestController { ...@@ -194,63 +187,44 @@ public class AcceptRestController {
User user = securityService.getCurrentUser(); User user = securityService.getCurrentUser();
Long userId = user.getId(); Long userId = user.getId();
Accept accept = new Accept(); Accept accept = acceptRepository.findById(id)
// APENAS ADMIN PODEM ALTERAR OS DADOS DO ACEITE .orElseThrow(AcceptNotFoundException::new);
// if(user.getRole()==Role.COMPANY) {
accept = acceptRepository.findById(id)
.orElseThrow(AcceptNotFoundException::new);
var acceptData = acceptMapper.toAccept(acceptRequest);
// acceptData.setId(id);
// if(user.getRole()!= Role.COMPANY &&(!Objects.equals(accept.getUser().getId(), userId))) {throw new NegocioException("Você não é proprietário.");}
// if(acceptData.getStatus() != null) {
//
// }
acceptData.setData_update(String.valueOf(LocalDate.now()));
acceptData.setTime_update(String.valueOf(LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss"))));
var acceptData = acceptMapper.toAccept(acceptRequest);
var path = accept.getPath(); acceptData.setData_update(String.valueOf(LocalDate.now()));
acceptData.setTime_update(String.valueOf(LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss"))));
//se enviar arquivo, pega o nome dele if (acceptData.getTime_accept() == null || acceptData.getTime_accept().isBlank()) {
if(foto!=null) { String valorExistente = accept.getTime_accept();
acceptData.setPath(foto.getOriginalFilename()); if (valorExistente != null && !valorExistente.isBlank()) {
fileManagerController.uploadFile(foto); acceptData.setTime_accept(valorExistente);
//SE NÃO ENVIAR NENHUM ARQUIVO
} else { } else {
accept.setPath(path); acceptData.setTime_accept(LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
} }
}
//copia os campos que eu setar de uma accept para acceptData - ja preenche logo var path = accept.getPath();
BeanUtils.copyProperties(acceptData, accept, "id", "dataAccept", "data_create", "vessel", "user", "bercos");
// if(acceptData.getPath()==null) {
// accept.setPath(path);
// }
if (foto != null) {
acceptData.setPath(foto.getOriginalFilename());
fileManagerController.uploadFile(foto);
} else {
accept.setPath(path);
}
// Copia campos definidos de acceptData para accept (exceto campos protegidos)
BeanUtils.copyProperties(acceptData, accept,
"id", "dataAccept", "data_create", "time_create", "vessel", "user", "bercos");
accept = acceptRepository.save(accept);
// } else { accept = acceptRepository.save(accept);
// throw new NegocioException("Não tem permissão.");
// }
var acceptResponse = acceptMapper.toAcceptResponse(accept); var acceptResponse = acceptMapper.toAcceptResponse(accept);
return acceptAssembler.toModel(acceptResponse); return acceptAssembler.toModel(acceptResponse);
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
// @TWJobsPermissions.IsOwner // @TWJobsPermissions.IsOwner
@TWJobsPermissions.IsCompany @TWJobsPermissions.IsCompany
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment