fix: MERGE

LeticiaMilan · May 16, 2024 · 71ba64a · 71ba64a
1 parent 0c74655
commit 71ba64a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/backend/help-desk/src/main/java/help/desk/helpdesk/auth/security/SecurityConfigurations.java b/backend/help-desk/src/main/java/help/desk/helpdesk/auth/security/SecurityConfigurations.java
@@ -65,4 +65,4 @@ CorsConfigurationSource corsConfigurationSource() {
         source.registerCorsConfiguration("/**", new CorsConfiguration().applyPermitDefaultValues());
         return source;
     }
-}
+}
diff --git a/backend/help-desk/src/main/java/help/desk/helpdesk/controller/PatrimonioController.java b/backend/help-desk/src/main/java/help/desk/helpdesk/controller/PatrimonioController.java
@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import help.desk.helpdesk.dtos.PatrimonioDto;
@@ -22,13 +23,14 @@
 import jakarta.validation.Valid;
 
 @RestController
+@RequestMapping("patrimonios")
 public class PatrimonioController {
 
 	@Autowired
 	PatrimonioRepository patrimonioRepository;
 
 	// POST (Create)
-	@PostMapping("/patrimonios")
+	@PostMapping("")
 	public ResponseEntity<PatrimonioModel> saveProduct(@RequestBody @Valid PatrimonioDto patrimonioDto) {
 		// popular campos do model com dados recebidos no DTO
 		PatrimonioModel patrimonioModel = new PatrimonioModel();
@@ -37,13 +39,13 @@ public ResponseEntity<PatrimonioModel> saveProduct(@RequestBody @Valid Patrimoni
 	}
 
 	//GET ALL (read)
-	@GetMapping("/patrimonios")
+	@GetMapping("")
 	public ResponseEntity<List<PatrimonioModel>> getAllPatrimonios() {
 		return ResponseEntity.status(HttpStatus.OK).body(patrimonioRepository.findAll());
 	}
 
 	//GET ONE
-	@GetMapping("/patrimonios/{id}")
+	@GetMapping("/{id}")
 	public ResponseEntity<Object> getOneProduct(@PathVariable(value="id") UUID id){
 		Optional<PatrimonioModel> patrimonio = patrimonioRepository.findById(id);
 		if(patrimonio.isEmpty()) {
@@ -53,7 +55,7 @@ public ResponseEntity<Object> getOneProduct(@PathVariable(value="id") UUID id){
 	}
 
 	//PUT
-	@PutMapping("/patrimonios/{id}")
+	@PutMapping("/{id}")
 	public ResponseEntity<Object> updateProduct(@PathVariable(value = "id") UUID id, @RequestBody @Valid PatrimonioDto patrimonioDto) {
 		Optional<PatrimonioModel> patrimonio = patrimonioRepository.findById(id);
 		if (patrimonio.isEmpty()) {

diff --git a/backend/help-desk/src/main/java/help/desk/helpdesk/controller/PessoaController.java b/backend/help-desk/src/main/java/help/desk/helpdesk/controller/PessoaController.java
@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import help.desk.helpdesk.dtos.PessoaDto;
@@ -22,13 +23,14 @@
 import jakarta.validation.Valid;
 
 @RestController
+@RequestMapping("pessoas")
 public class PessoaController {
 
 	@Autowired
 	PessoaRepository pessoaRepository;
 
 	// POST (Create)
-	@PostMapping("/pessoas")
+	@PostMapping("")
 	public ResponseEntity<PessoaModel> saveProduct(@RequestBody @Valid PessoaDto pessoaDto) {
 		// popular campos do model com dados recebidos no DTO
 		PessoaModel pessoaModel = new PessoaModel();
@@ -37,13 +39,13 @@ public ResponseEntity<PessoaModel> saveProduct(@RequestBody @Valid PessoaDto pes
 	}
 
 	//GET ALL (read)
-	@GetMapping("/pessoas")
+	@GetMapping("")
 	public ResponseEntity<List<PessoaModel>> getAllPessoas() {
 		return ResponseEntity.status(HttpStatus.OK).body(pessoaRepository.findAll());
 	}
 
 	//GET ONE
-	@GetMapping("/pessoas/{id}")
+	@GetMapping("/{id}")
 	public ResponseEntity<Object> getOneProduct(@PathVariable(value="id") UUID id){
 		Optional<PessoaModel> pessoa = pessoaRepository.findById(id);
 		if(pessoa.isEmpty()) {
@@ -53,7 +55,7 @@ public ResponseEntity<Object> getOneProduct(@PathVariable(value="id") UUID id){
 	}
 
 	//PUT
-	@PutMapping("/pessoas/{id}")
+	@PutMapping("/{id}")
 	public ResponseEntity<Object> updateProduct(@PathVariable(value = "id") UUID id, @RequestBody @Valid PessoaDto pessoaDto) {
 		Optional<PessoaModel> pessoa = pessoaRepository.findById(id);
 		if (pessoa.isEmpty()) {

diff --git a/backend/help-desk/src/main/java/help/desk/helpdesk/dtos/PessoaDto.java b/backend/help-desk/src/main/java/help/desk/helpdesk/dtos/PessoaDto.java
@@ -1,7 +1,6 @@
 package help.desk.helpdesk.dtos;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 
 public record PessoaDto(@NotBlank String nome, @NotBlank String cpf, @NotBlank String empresa_pessoa) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,4 @@ CorsConfigurationSource corsConfigurationSource() { @@
             source.registerCorsConfiguration("/**", new CorsConfiguration().applyPermitDefaultValues());
             return source;
         }
-    }
+    }