Skip to content

Commit

Permalink
fix(be): refactor termina programma progetto
Browse files Browse the repository at this point in the history
  • Loading branch information
robertoamato11 committed Jul 13, 2022
1 parent d3acf92 commit cd33243
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package it.pa.repdgt.programmaprogetto.request;

import javax.validation.constraints.NotBlank;

import lombok.Getter;
import lombok.Setter;

@Setter
@Getter
public class TerminaRequest {
@NotBlank
private String dataTerminazione;
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import it.pa.repdgt.programmaprogetto.bean.SchedaProgettoBean;
import it.pa.repdgt.programmaprogetto.mapper.ProgettoMapper;
import it.pa.repdgt.programmaprogetto.request.ProgettoRequest;
import it.pa.repdgt.programmaprogetto.request.TerminaRequest;
import it.pa.repdgt.programmaprogetto.request.ProgettiParam;
import it.pa.repdgt.programmaprogetto.request.ProgettoFiltroRequest;
import it.pa.repdgt.programmaprogetto.resource.ProgettiLightResourcePaginati;
Expand Down Expand Up @@ -129,10 +130,10 @@ public void cancellazioneProgetto(@PathVariable(value = "idProgetto") Long id){
@PutMapping(path = "/termina/{idProgetto}")
@ResponseStatus(value = HttpStatus.OK)
public void terminaProgetto(
@RequestParam(name="dataTerminazione") String dataTerminazione,
@PathVariable(value = "idProgetto") Long idProgetto) throws ParseException {
@PathVariable(value = "idProgetto") Long idProgetto,
@RequestBody TerminaRequest terminaRequest) throws ParseException {
SimpleDateFormat sdf= new SimpleDateFormat("dd-MM-yyyy");
this.progettoService.terminaProgetto(idProgetto, sdf.parse(dataTerminazione));
this.progettoService.terminaProgetto(idProgetto, sdf.parse(terminaRequest.getDataTerminazione()));
}

@PutMapping(path = "/attiva/{idProgetto}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import it.pa.repdgt.programmaprogetto.request.FiltroRequest;
import it.pa.repdgt.programmaprogetto.request.ProgrammaRequest;
import it.pa.repdgt.programmaprogetto.request.ProgrammiParam;
import it.pa.repdgt.programmaprogetto.request.TerminaRequest;
import it.pa.repdgt.programmaprogetto.resource.ProgrammiLightResourcePaginata;
import it.pa.repdgt.programmaprogetto.service.ProgrammaService;
import it.pa.repdgt.programmaprogetto.util.CSVProgrammaUtil;
Expand Down Expand Up @@ -126,11 +127,10 @@ public void associaQuestionarioTemplateAProgramma(
@PutMapping(path = "termina/{idProgramma}")
@ResponseStatus(value = HttpStatus.OK)
public void terminaProgramma(
@RequestParam(name="dataTerminazione") String dataTerminazione,
@PathVariable(value = "idProgramma") Long idProgramma
) throws ParseException {
@PathVariable(value = "idProgramma") Long idProgramma,
@RequestBody TerminaRequest terminaRequest) throws ParseException {
SimpleDateFormat sdf= new SimpleDateFormat("dd-MM-yyyy");
this.programmaService.terminaProgramma(idProgramma, sdf.parse(dataTerminazione));
this.programmaService.terminaProgramma(idProgramma, sdf.parse(terminaRequest.getDataTerminazione()));
}

// TOUCH POINT - 1.1.4 - Cancellazione Programma
Expand Down

0 comments on commit cd33243

Please sign in to comment.