Merge pull request #40 from CodeURJC-DAW-2021-22/develop

Develop to main

Author: jbarcia2019

backend/src/main/java/es/codeurjc/wallypop/controller/api/ReportRestController.java

@@ -19,6 +19,7 @@
 @RequestMapping("/api/reports")
 public class ReportRestController {
 
+
     @Autowired
     private ReportService reportService;
     @Autowired
@@ -44,5 +45,4 @@ public ResponseEntity<Object> uploadImage(@PathVariable long id, @RequestParam M
         return ResponseEntity.created(location).build();
     }
 
-
 }

backend/src/main/java/es/codeurjc/wallypop/controller/api/admin/AdminReportRestController.java

@@ -53,7 +53,7 @@ public ResponseEntity<Object> downloadReporteProof(@PathVariable long id) throws
 
             Resource file = new InputStreamResource(report.getPROOF().getBinaryStream());
 
-            return ResponseEntity.ok().header(HttpHeaders.CONTENT_TYPE, "image/jpeg")
+            return ResponseEntity.ok().header(HttpHeaders.CONTENT_TYPE, "application/zip")
                     .contentLength(report.getPROOF().length()).body(file);
 
         } else {
@@ -89,16 +89,6 @@ public ResponseEntity<Object> downloadReportedArticleImage(@PathVariable long id
         }
     }
 
-    @PutMapping("/{idReport}")
-    public ResponseEntity<Report> updateReport(@PathVariable long idReport, @RequestBody Report updatedReport) throws SQLException {
-        if (reportService.exist(idReport)) {
-            reportService.updateReport(idReport, updatedReport);
-            return new ResponseEntity<>(reportService.findById(idReport).get(), HttpStatus.OK);
-        } else {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-        }
-    }
-
     @DeleteMapping("/{id}/rejectReport")
     public ResponseEntity<Report> deleteReport(@PathVariable long id) {
 
@@ -112,7 +102,7 @@ public ResponseEntity<Report> deleteReport(@PathVariable long id) {
 
     }
 
-    @DeleteMapping("/{id}/acceptReport")
+    @DeleteMapping("/{id}/aceptReport")
     public ResponseEntity<Article> deleteArticleReported(@PathVariable long id) {
 
         try {