From 49b17a047eb450e602d56c6300cc939cd4133b32 Mon Sep 17 00:00:00 2001 From: Crypto-V Date: Sun, 4 Jun 2023 10:56:24 +0100 Subject: [PATCH] feature-refactor-new-namings implemented and tested --- .../controller/LitterController.java | 10 +++++----- .../controller/ReportController.java | 16 ++++++++-------- .../model/litter/service/LitterService.java | 8 ++++---- .../model/report/service/ReportService.java | 6 +++--- .../littersnap/view/LitterViewController.java | 18 +++++++++--------- .../littersnap/view/ReportViewController.java | 6 +++--- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/csaba79coder/littersnap/controller/LitterController.java b/src/main/java/com/csaba79coder/littersnap/controller/LitterController.java index b166395..e8bd40b 100644 --- a/src/main/java/com/csaba79coder/littersnap/controller/LitterController.java +++ b/src/main/java/com/csaba79coder/littersnap/controller/LitterController.java @@ -22,7 +22,7 @@ public class LitterController { @GetMapping public List getAllLitters() { - return litterService.getAllLitters(); + return litterService.findAllLitters(); } @PostMapping @@ -34,7 +34,7 @@ public ResponseEntity addNewLitter(@RequestBody LitterCreateOrModif @GetMapping("/{id}") public ResponseEntity getLitterById(@PathVariable("id") UUID id) { - LitterModel litter = litterService.getLitterById(id); + LitterModel litter = litterService.findLitterById(id); if (litter != null) { return new ResponseEntity<>(litter, HttpStatus.OK); } @@ -44,13 +44,13 @@ public ResponseEntity getLitterById(@PathVariable("id") UUID id) { @PutMapping("/{id}") public ResponseEntity updateExistingLitter(@PathVariable("id") UUID id, @RequestBody LitterCreateOrModifyModel model) { - return ResponseEntity.status(200).body(litterService.updateExistingLitter(id, model)); + return ResponseEntity.status(200).body(litterService.modifyAnExistingLitter(id, model)); } @DeleteMapping("/{id}") public ResponseEntity deleteExistingLitter(@PathVariable("id") UUID id) { - LitterModel litter = litterService.getLitterById(id); - litterService.deleteLitter(id); + LitterModel litter = litterService.findLitterById(id); + litterService.deleteAnExistingLitter(id); return ResponseEntity.status(204).build(); } diff --git a/src/main/java/com/csaba79coder/littersnap/controller/ReportController.java b/src/main/java/com/csaba79coder/littersnap/controller/ReportController.java index b01112e..6b82c01 100644 --- a/src/main/java/com/csaba79coder/littersnap/controller/ReportController.java +++ b/src/main/java/com/csaba79coder/littersnap/controller/ReportController.java @@ -19,8 +19,8 @@ public ReportController(ReportService reportService) { } @GetMapping - public List getAllReports() { - return reportService.getAllReports(); + public List renderAllReports() { + return reportService.findAllReports(); } @PostMapping @@ -29,8 +29,8 @@ public ResponseEntity addNewReport(@RequestBody ReportModel model) } @GetMapping("/{id}") - public ResponseEntity getReportById(@PathVariable("id") UUID id) { - ReportModel report = reportService.getReportById(id); + public ResponseEntity renderReportById(@PathVariable("id") UUID id) { + ReportModel report = reportService.findReportById(id); if (report != null) { return ResponseEntity.ok(report); // Include the report in the response body with status code 200 (OK) } @@ -38,13 +38,13 @@ public ResponseEntity getReportById(@PathVariable("id") UUID id) { } @PutMapping("/{id}") - public ResponseEntity updateExistingReport(@PathVariable("id") UUID id, @RequestBody ReportModel model) { - return ResponseEntity.status(200).body(reportService.updateExistingReport(id, model)); + public ResponseEntity updateAnExistingReport(@PathVariable("id") UUID id, @RequestBody ReportModel model) { + return ResponseEntity.status(200).body(reportService.modifyAnExistingReport(id, model)); } @DeleteMapping("/{id}") - public ResponseEntity deleteExistingReport(@PathVariable("id") UUID id) { - ReportModel litter = reportService.getReportById(id); + public ResponseEntity deleteAnExistingReport(@PathVariable("id") UUID id) { + ReportModel litter = reportService.findReportById(id); reportService.deleteExistingReport(id); return ResponseEntity.status(204).build(); diff --git a/src/main/java/com/csaba79coder/littersnap/model/litter/service/LitterService.java b/src/main/java/com/csaba79coder/littersnap/model/litter/service/LitterService.java index 8e4b3ab..d140105 100644 --- a/src/main/java/com/csaba79coder/littersnap/model/litter/service/LitterService.java +++ b/src/main/java/com/csaba79coder/littersnap/model/litter/service/LitterService.java @@ -29,7 +29,7 @@ public class LitterService { private final AddressRepository addressRepository; - public List getAllLitters() { + public List findAllLitters() { List litters = litterRepository.findAll(); @@ -71,7 +71,7 @@ public LitterModel addNewLitter(LitterCreateOrModifyModel litterModel, Address a return Mapper.mapLitterEntityToModel(savedLitterEntity); } - public LitterModel getLitterById(UUID id) { + public LitterModel findLitterById(UUID id) { Optional litterOptional = litterRepository.findById(id); if (litterOptional.isPresent()) { Litter litter = litterOptional.get(); @@ -86,7 +86,7 @@ public LitterModel getLitterById(UUID id) { } } - public LitterModel updateExistingLitter(UUID id, LitterCreateOrModifyModel model) { + public LitterModel modifyAnExistingLitter(UUID id, LitterCreateOrModifyModel model) { Optional optionalExistingLitter = litterRepository.findById(id); if (optionalExistingLitter.isPresent()) { @@ -110,7 +110,7 @@ public LitterModel updateExistingLitter(UUID id, LitterCreateOrModifyModel model } - public void deleteLitter(UUID id) { + public void deleteAnExistingLitter(UUID id) { Optional optionalExistingLitter = litterRepository.findById(id); if (optionalExistingLitter.isPresent()) { litterRepository.deleteById(id); diff --git a/src/main/java/com/csaba79coder/littersnap/model/report/service/ReportService.java b/src/main/java/com/csaba79coder/littersnap/model/report/service/ReportService.java index e149872..b503efc 100644 --- a/src/main/java/com/csaba79coder/littersnap/model/report/service/ReportService.java +++ b/src/main/java/com/csaba79coder/littersnap/model/report/service/ReportService.java @@ -22,7 +22,7 @@ public class ReportService { - public List getAllReports() { + public List findAllReports() { return reportRepository.findAll() .stream() .map(Mapper::mapReportEntityToModel) @@ -36,7 +36,7 @@ public ReportModel addNewReport(ReportModel reportModel) { } - public ReportModel getReportById(UUID id) { + public ReportModel findReportById(UUID id) { Optional optionalReport = reportRepository.findReportById(id); if (optionalReport.isPresent()) { Report report = optionalReport.get(); @@ -47,7 +47,7 @@ public ReportModel getReportById(UUID id) { return null; } - public ReportModel updateExistingReport(UUID id, ReportModel model) { + public ReportModel modifyAnExistingReport(UUID id, ReportModel model) { Optional optionalExistingReport = reportRepository.findById(id); if (optionalExistingReport.isPresent()) { Report existingReport = optionalExistingReport.get(); diff --git a/src/main/java/com/csaba79coder/littersnap/view/LitterViewController.java b/src/main/java/com/csaba79coder/littersnap/view/LitterViewController.java index 414c33f..f2c86d1 100644 --- a/src/main/java/com/csaba79coder/littersnap/view/LitterViewController.java +++ b/src/main/java/com/csaba79coder/littersnap/view/LitterViewController.java @@ -32,9 +32,9 @@ public LitterViewController(LitterService litterService) { @GetMapping - public String getAllLitters(Model model) { + public String renderAllLitters(Model model) { try { - List litters = litterService.getAllLitters(); + List litters = litterService.findAllLitters(); model.addAttribute("litters", litters); model.addAttribute("view", "litter_list"); return "welcome"; // Replace with the actual view name for displaying the list of litters @@ -45,9 +45,9 @@ public String getAllLitters(Model model) { } @GetMapping("/{id}") - public String getLitterById(@PathVariable("id") UUID id, Model model) { + public String renderLitterById(@PathVariable("id") UUID id, Model model) { try { - LitterModel litter = litterService.getLitterById(id); + LitterModel litter = litterService.findLitterById(id); model.addAttribute("id", litter.getId()); model.addAttribute("createdAt", litter.getCreatedAt()); model.addAttribute("updatedAt", litter.getUpdatedAt()); @@ -102,7 +102,7 @@ public String addNewLitter(@ModelAttribute("litter") LitterCreateOrModifyModel l @GetMapping("/edit/{id}") public String showEditForm(@PathVariable UUID id, Model model) { try { - LitterCreateOrModifyModel litter = Mapper.mapModelToLitterCreateOrModifyModel(litterService.getLitterById(id)); + LitterCreateOrModifyModel litter = Mapper.mapModelToLitterCreateOrModifyModel(litterService.findLitterById(id)); model.addAttribute("id", litter.getId()); model.addAttribute("firstline", litter.getAddress().getFirstLine()); model.addAttribute("city", litter.getAddress().getCity()); @@ -119,9 +119,9 @@ public String showEditForm(@PathVariable UUID id, Model model) { } @PostMapping("/edit/{id}") - public String updateLitter(@PathVariable UUID id, @ModelAttribute("report") LitterCreateOrModifyModel litterModel, Model model) { + public String modifyExistingLitter(@PathVariable UUID id, @ModelAttribute("report") LitterCreateOrModifyModel litterModel, Model model) { try { - litterService.updateExistingLitter(id, litterModel); + litterService.modifyAnExistingLitter(id, litterModel); return "redirect:/reports"; // Redirect to the URL for displaying all reports after successful update } catch (NoSuchElementException e) { model.addAttribute("errorMessage", e.getMessage()); @@ -131,10 +131,10 @@ public String updateLitter(@PathVariable UUID id, @ModelAttribute("report") Litt @GetMapping("/delete/{id}") - public String deleteLitter(@PathVariable UUID id,Model model) { + public String deleteAnExistingLitter(@PathVariable UUID id, Model model) { try { - litterService.deleteLitter(id); + litterService.deleteAnExistingLitter(id); return "redirect:/thy/litter"; // Redirect to the URL for displaying all reports after successful deletion } catch (NoSuchElementException e) { model.addAttribute("errorMessage", e.getMessage()); diff --git a/src/main/java/com/csaba79coder/littersnap/view/ReportViewController.java b/src/main/java/com/csaba79coder/littersnap/view/ReportViewController.java index 554a510..bcb967c 100644 --- a/src/main/java/com/csaba79coder/littersnap/view/ReportViewController.java +++ b/src/main/java/com/csaba79coder/littersnap/view/ReportViewController.java @@ -23,7 +23,7 @@ public ReportViewController(ReportService reportService) { @GetMapping public String getAllReports(Model model) { - List reports = reportService.getAllReports(); + List reports = reportService.findAllReports(); if (reports.isEmpty()) { return "error_page"; @@ -35,7 +35,7 @@ public String getAllReports(Model model) { @GetMapping("/{id}") public String getReportById(@PathVariable UUID id, Model model) { - ReportModel currentReport = reportService.getReportById(id); + ReportModel currentReport = reportService.findReportById(id); if (currentReport == null) { return "error_page"; @@ -47,7 +47,7 @@ public String getReportById(@PathVariable UUID id, Model model) { @GetMapping("/edit/{id}") public String showEditForm(@PathVariable UUID id, Model model) { - ReportModel currentReport = reportService.getReportById(id); + ReportModel currentReport = reportService.findReportById(id); if (currentReport == null) { return "error_page"; } else {