diff --git a/src/main/java/com/example/kletterhalle/domains/climbingRoute/controller/ClimbingRouteController.java b/src/main/java/com/example/kletterhalle/domains/climbingRoute/controller/ClimbingRouteController.java index 45c2483b3276f8dddb6d65c8f0d41906118c4b01..15aa92245b7565473dc8ffbe9a12ad7b323d6e29 100644 --- a/src/main/java/com/example/kletterhalle/domains/climbingRoute/controller/ClimbingRouteController.java +++ b/src/main/java/com/example/kletterhalle/domains/climbingRoute/controller/ClimbingRouteController.java @@ -17,8 +17,8 @@ public class ClimbingRouteController { @Autowired private ClimbingRouteService climbingRouteService; - @GetMapping("/climbingRoutes") - public ResponseEntity> getAllclimbingRoutes() { + @GetMapping("/climbingRoutes/all") + public ResponseEntity> getAllClimbingRoutes() { return climbingRouteService.getAllClimbingRoutes(); } @@ -27,7 +27,7 @@ public class ClimbingRouteController { return climbingRouteService.getClimbingRouteById(id); } - @PostMapping("/climbingRoute") + @PostMapping("/climbingRoute/add") public ResponseEntity createMember(@Valid @RequestBody ClimbingRoute climbingRoute) { return climbingRouteService.createClimbingRoute(climbingRoute); } diff --git a/src/main/java/com/example/kletterhalle/domains/climbingRoute/dto/RouteDtoWithoutMemberList.java b/src/main/java/com/example/kletterhalle/domains/climbingRoute/dto/RouteDtoWithoutMemberList.java new file mode 100644 index 0000000000000000000000000000000000000000..5d46dc9bd06c047f7dfce9aaeb96d8d5d807190b --- /dev/null +++ b/src/main/java/com/example/kletterhalle/domains/climbingRoute/dto/RouteDtoWithoutMemberList.java @@ -0,0 +1,17 @@ +package com.example.kletterhalle.domains.climbingRoute.dto; + +import com.example.kletterhalle.domains.climbingRoute.model.DifficultyLevelEnum; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; + +@Getter +@Setter +public class RouteDtoWithoutMemberList { + private Long id; + private String name; + @Enumerated(EnumType.STRING) + private DifficultyLevelEnum difficultyLevelEnum; + +} diff --git a/src/main/java/com/example/kletterhalle/domains/member/dto/MemberDto.java b/src/main/java/com/example/kletterhalle/domains/member/dto/MemberDto.java index d85eda959c174a252528965c5609f512ac561d2e..0c7116b2171d24de01a6dac48951ee7ab92dd474 100644 --- a/src/main/java/com/example/kletterhalle/domains/member/dto/MemberDto.java +++ b/src/main/java/com/example/kletterhalle/domains/member/dto/MemberDto.java @@ -1,15 +1,12 @@ package com.example.kletterhalle.domains.member.dto; -import com.example.kletterhalle.domains.climbingRoute.dto.ClimbingRouteDto; -import com.example.kletterhalle.domains.climbingRoute.model.ClimbingRoute; -import com.example.kletterhalle.domains.member.model.Address; -import com.fasterxml.jackson.annotation.JsonIgnore; + +import com.example.kletterhalle.domains.climbingRoute.dto.RouteDtoWithoutMemberList; import lombok.Getter; import lombok.Setter; import javax.persistence.*; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; + import java.util.HashSet; import java.util.Set; @@ -22,6 +19,6 @@ public class MemberDto { private String firstName; private String lastName; private AddressDto addressDto; - private Set favouriteRoutes = new HashSet<>(); + private Set favouriteRoutes = new HashSet<>(); } diff --git a/src/main/java/com/example/kletterhalle/domains/member/model/Member.java b/src/main/java/com/example/kletterhalle/domains/member/model/Member.java index 433b5cd82a8e8ab07fe03039ab48dc591dc1cee8..443196119b137c91eeaa683f7221e671d6a681a2 100644 --- a/src/main/java/com/example/kletterhalle/domains/member/model/Member.java +++ b/src/main/java/com/example/kletterhalle/domains/member/model/Member.java @@ -1,8 +1,6 @@ package com.example.kletterhalle.domains.member.model; import com.example.kletterhalle.domains.climbingRoute.model.ClimbingRoute; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonManagedReference; import lombok.*; import javax.persistence.*;