JoeKung/Progetto-m152-Java
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made method @GetMapping("/{user}/{id}") use username

Browse Source
This commit is contained in:
grata
2023-05-06 11:19:41 +02:00
parent ad6ec2e2c4
commit 547d13d793
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ch/progetto152/controller/WaypointVisitedController.java
View File

@@ -1,6 +1,8 @@
package ch.progetto152.controller; package ch.progetto152.controller;
import ch.progetto152.entity.UserEntity;
import ch.progetto152.entity.WaypointsVisitedEntity; import ch.progetto152.entity.WaypointsVisitedEntity;
import ch.progetto152.services.UserService;
import ch.progetto152.services.WaypointVisitedService; import ch.progetto152.services.WaypointVisitedService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -14,9 +16,12 @@ import java.util.List;
public class WaypointVisitedController { public class WaypointVisitedController {
private final WaypointVisitedService waypointVisitedService; private final WaypointVisitedService waypointVisitedService;
private final UserService userService;
@Autowired @Autowired
public WaypointVisitedController(WaypointVisitedService waypointVisitedService) { public WaypointVisitedController(WaypointVisitedService waypointVisitedService, UserService userService) {
this.waypointVisitedService = waypointVisitedService; this.waypointVisitedService = waypointVisitedService;
this.userService = userService;
} }
@GetMapping("") @GetMapping("")
@@ -38,8 +43,9 @@ public class WaypointVisitedController {
} }
@GetMapping("/{user}/{id}") @GetMapping("/{user}/{id}")
public ResponseEntity<Boolean> getWaypointVisitedByWaypointIdAndUserId(@PathVariable("user") Long userId, @PathVariable("id") Long waypointId) { public ResponseEntity<Boolean> getWaypointVisitedByWaypointIdAndUserId(@PathVariable("user") String username, @PathVariable("id") Long waypointId) {
Boolean waypointVisited = waypointVisitedService.getWaypointsVisitedByWaypointIdAndUserId(waypointId, userId); UserEntity user = userService.getUserByUsername(username);
Boolean waypointVisited = waypointVisitedService.getWaypointsVisitedByWaypointIdAndUserId(waypointId, (long) user.getId());
if (waypointVisited == null) { if (waypointVisited == null) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND); return new ResponseEntity<>(HttpStatus.NOT_FOUND);
} else if (!waypointVisited) { } else if (!waypointVisited) {

1
src/main/java/ch/progetto152/services/WaypointVisitedService.java
View File

@@ -1,5 +1,6 @@
package ch.progetto152.services; package ch.progetto152.services;
import ch.progetto152.entity.UserEntity;
import ch.progetto152.entity.WaypointsVisitedEntity; import ch.progetto152.entity.WaypointsVisitedEntity;
import ch.progetto152.repository.WaypointVisitedRepository; import ch.progetto152.repository.WaypointVisitedRepository;
import ch.progetto152.utility.ErrorChecking; import ch.progetto152.utility.ErrorChecking;