Backend tests

slp-backend/pom.xml

@@ -136,6 +136,11 @@
             <version>6.2.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/AddressController.java

@@ -4,7 +4,6 @@
 import agh.edu.pl.slpbackend.dto.AddressDto;
 import agh.edu.pl.slpbackend.service.AddressService;
 import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,23 +14,14 @@
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/address") //TODO odpowiedni rooting jeszcze nie wiem XDD
+@RequestMapping("/address")
 @CrossOrigin(origins = "http://localhost:3000")
 public class AddressController extends AbstractController {
 
     private final AddressService addressService;
 
     @GetMapping("/list")
     public ResponseEntity<List<AddressDto>> list() {
-        try {
-            List<AddressDto> list = addressService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(addressService.selectAll());
     }
 }

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/DataController.java

@@ -20,6 +20,6 @@ public class DataController {
 
     @GetMapping("/filters")
     public ResponseEntity<Filters> getFilters() {
-        return new ResponseEntity<>(dataService.getFilters(), HttpStatus.OK);
+        return ResponseEntity.ok(dataService.getFilters());
     }
 }

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/dictionary/ExaminationController.java → slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/ExaminationController.java

@@ -1,4 +1,4 @@
-package agh.edu.pl.slpbackend.controller.dictionary;
+package agh.edu.pl.slpbackend.controller;
 
 import agh.edu.pl.slpbackend.controller.iface.AbstractController;
 import agh.edu.pl.slpbackend.dto.ExaminationDto;
@@ -19,7 +19,7 @@ public class ExaminationController extends AbstractController {
     private final ExaminationService examinationService;
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody ExaminationDto examinationDto) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody ExaminationDto examinationDto) {
         return add(examinationDto, examinationService);
     }
 
@@ -36,12 +36,12 @@ public ResponseEntity<List<ExaminationDto>> getExaminationForSample(@PathVariabl
     }
 
     @PutMapping("/update")
-    public ResponseEntity<Void> insertExaminationResults(@RequestBody ExaminationDto updatedExaminationDto) throws Exception {
+    public ResponseEntity<Void> insertExaminationResults(@RequestBody ExaminationDto updatedExaminationDto) {
         return edit(updatedExaminationDto, examinationService);
     }
 
     @DeleteMapping("/delete/{examinationId}")
-    public ResponseEntity<Void> deleteExamination(@PathVariable final Long examinationId) throws Exception {
+    public ResponseEntity<Void> deleteExamination(@PathVariable final Long examinationId) {
         return delete(ExaminationDto.builder().id(examinationId).build(), examinationService);
     }
 

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/ReportDataController.java

@@ -2,9 +2,6 @@
 
 import agh.edu.pl.slpbackend.controller.iface.AbstractController;
 import agh.edu.pl.slpbackend.dto.ReportDataDto;
-import agh.edu.pl.slpbackend.dto.SampleDto;
-import agh.edu.pl.slpbackend.model.ReportData;
-import agh.edu.pl.slpbackend.model.Sample;
 import agh.edu.pl.slpbackend.service.ReportDataService;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -15,42 +12,33 @@
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/report-data") //TODO odpowiedni rooting jeszcze nie wiem XDD
+@RequestMapping("/report-data")
 @CrossOrigin(origins = "http://localhost:3000")
 public class ReportDataController extends AbstractController {
 
     private final ReportDataService reportDataService;
 
     @GetMapping("/list")
     public ResponseEntity<List<ReportDataDto>> list() {
-        try {
-            List<ReportDataDto> list = reportDataService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(reportDataService.selectAll());
     }
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody final ReportDataDto reportData) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody final ReportDataDto reportData) {
         return add(reportData, reportDataService);
     }
 
     @DeleteMapping("/{reportDataId}")
-    public ResponseEntity<Void> delete(@PathVariable final Long reportDataId) throws Exception {
+    public ResponseEntity<Void> delete(@PathVariable final Long reportDataId) {
         return delete(ReportDataDto.builder().id(reportDataId).build(), reportDataService);
     }
 
     @PutMapping("/")
-    public ResponseEntity<Void> update(@RequestBody ReportDataDto reportDataDto) throws Exception {
+    public ResponseEntity<Void> update(@RequestBody ReportDataDto reportDataDto) {
         return edit(reportDataDto, reportDataService);
     }
     @GetMapping("/sample/{sampleId}")
-    public ResponseEntity<ReportDataDto> getReportBySampleId(@PathVariable final Long sampleId) throws Exception {
+    public ResponseEntity<ReportDataDto> getReportBySampleId(@PathVariable final Long sampleId) {
         return new ResponseEntity<>(reportDataService.selectBySampleId(sampleId), HttpStatus.OK);
     }
 

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/SampleController.java

@@ -8,68 +8,57 @@
 import agh.edu.pl.slpbackend.model.Sample;
 import agh.edu.pl.slpbackend.service.SampleService;
 import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/sample") //TODO odpowiedni rooting jeszcze nie wiem XDD
+@RequestMapping("/sample")
 @CrossOrigin(origins = "http://localhost:3000")
 public class SampleController extends AbstractController {
 
     private final SampleService sampleService;
 
     @GetMapping("/list")
     public ResponseEntity<List<SampleDto>> list() {
-        try {
-            List<SampleDto> list = sampleService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(sampleService.selectAll());
     }
 
     @GetMapping("/count")
     public ResponseEntity<Long> count() {
-        return new ResponseEntity<>(sampleService.count(), HttpStatus.OK);
+        return ResponseEntity.ok(sampleService.count());
     }
 
     @GetMapping("/{sampleId}")
     public ResponseEntity<SampleDto> getOne(@PathVariable final Long sampleId) {
-        SampleDto sampleDto = sampleService.selectOne(sampleId);
-        return new ResponseEntity<>(sampleDto, HttpStatus.OK);
+        return ResponseEntity.ok(sampleService.selectOne(sampleId));
     }
 
     @PutMapping("status/{sampleId}/{status}")
     public ResponseEntity<Sample> updateStatus(@PathVariable final Long sampleId, @PathVariable final String status) {
-        return new ResponseEntity<>(sampleService.updateStatus(sampleId, ProgressStatusEnum.convertEnum(status)), HttpStatus.OK);
+        return ResponseEntity.ok(sampleService.updateStatus(sampleId, ProgressStatusEnum.convertEnum(status)));
     }
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody SampleDto sampleDto) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody SampleDto sampleDto) {
         return add(sampleDto, sampleService);
     }
 
     @DeleteMapping("/{sampleId}")
-    public ResponseEntity<Void> delete(@PathVariable final Long sampleId) throws Exception {
+    public ResponseEntity<Void> delete(@PathVariable final Long sampleId) {
         return delete(SampleDto.builder().id(sampleId).build(), sampleService);
     }
 
     @PutMapping("/{sampleId}")
-    public ResponseEntity<Void> update(@PathVariable final Long sampleId, @RequestBody SampleDto sampleDto) throws Exception {
+    public ResponseEntity<Void> update(@PathVariable final Long sampleId, @RequestBody SampleDto sampleDto) {
         return edit(sampleDto, sampleService);
     }
 
 
     @PutMapping("list/filtered")
     public ResponseEntity<FilterResponse> filter(@RequestBody FilterRequest request) {
-        return new ResponseEntity<>(sampleService.filter(request), HttpStatus.OK);
+        return ResponseEntity.ok(sampleService.filter(request));
     }
 }

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/UserController.java

@@ -38,8 +38,8 @@ public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest request) {
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/change-password/{email}")
-    public ResponseEntity<Void> changePasswordForAdmin(@RequestBody ChangePasswordRequest request, @PathVariable String email) {
-        userService.changePasswordForAdmin(request, email);
+    public ResponseEntity<Void> changePasswordByAdmin(@RequestBody ChangePasswordRequest request, @PathVariable String email) {
+        userService.changePasswordByAdmin(request, email);
         return ResponseEntity.ok().build();
     }
 

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/dictionary/AssortmentController.java

@@ -4,7 +4,6 @@
 import agh.edu.pl.slpbackend.dto.AssortmentDto;
 import agh.edu.pl.slpbackend.service.dictionary.AssortmentService;
 import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,30 +19,21 @@ public class AssortmentController extends AbstractController {
 
     @GetMapping("/list")
     public ResponseEntity<List<AssortmentDto>> list() {
-        try {
-            List<AssortmentDto> list = assortmentService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(assortmentService.selectAll());
     }
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody AssortmentDto assortmentDto) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody AssortmentDto assortmentDto) {
         return add(assortmentDto, assortmentService);
     }
 
     @PutMapping("/update")
-    public ResponseEntity<Void> edit(@RequestBody AssortmentDto assortmentDto) throws Exception {
+    public ResponseEntity<Void> edit(@RequestBody AssortmentDto assortmentDto) {
         return edit(assortmentDto, assortmentService);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<Void> delete(@PathVariable Long id) throws Exception {
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
         return delete(AssortmentDto.builder().id(id).build(), assortmentService);
     }
 }

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/dictionary/ClientController.java

@@ -4,46 +4,36 @@
 import agh.edu.pl.slpbackend.dto.ClientDto;
 import agh.edu.pl.slpbackend.service.dictionary.ClientService;
 import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @AllArgsConstructor
-@RequestMapping("/client") //TODO odpowiedni rooting jeszcze nie wiem XDD
+@RequestMapping("/client")
 @CrossOrigin(origins = "http://localhost:3000")
 public class ClientController extends AbstractController {
 
     private final ClientService clientService;
 
     @GetMapping("/list")
     public ResponseEntity<List<ClientDto>> list() {
-        try {
-            List<ClientDto> list = clientService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(clientService.selectAll());
     }
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody ClientDto clientDto) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody ClientDto clientDto) {
         return add(clientDto, clientService);
     }
 
     @PutMapping("/update")
-    public ResponseEntity<Void> edit(@RequestBody ClientDto clientDto) throws Exception {
+    public ResponseEntity<Void> edit(@RequestBody ClientDto clientDto) {
         return edit(clientDto, clientService);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<Void> delete(@PathVariable Long id) throws Exception {
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
         return delete(ClientDto.builder().id(id).build(), clientService);
     }
 }

slp-backend/src/main/java/agh/edu/pl/slpbackend/controller/dictionary/CodeController.java

@@ -4,7 +4,6 @@
 import agh.edu.pl.slpbackend.dto.CodeDto;
 import agh.edu.pl.slpbackend.service.dictionary.CodeService;
 import lombok.AllArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,30 +19,21 @@ public class CodeController extends AbstractController {
 
     @GetMapping("/list")
     public ResponseEntity<List<CodeDto>> list() {
-        try {
-            List<CodeDto> list = codeService.selectAll();
-
-            if (list.isEmpty()) {
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-            return new ResponseEntity<>(list, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
+        return ResponseEntity.ok(codeService.selectAll());
     }
 
     @PostMapping("/save")
-    public ResponseEntity<Void> add(@RequestBody CodeDto codeDto) throws Exception {
+    public ResponseEntity<Void> add(@RequestBody CodeDto codeDto) {
         return add(codeDto, codeService);
     }
 
     @PutMapping("/update")
-    public ResponseEntity<Void> edit(@RequestBody CodeDto codeDto) throws Exception {
+    public ResponseEntity<Void> edit(@RequestBody CodeDto codeDto) {
         return edit(codeDto, codeService);
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<Void> delete(@PathVariable String id) throws Exception {
+    public ResponseEntity<Void> delete(@PathVariable String id) {
         return delete(CodeDto.builder().id(id).build(), codeService);
     }
 }