From 67b02443af6723c7b32abf9de2097ad5da1d9ed5 Mon Sep 17 00:00:00 2001
From: Marcel Meyer <m.meyer@it-frankfurt.com>
Date: Thu, 3 Nov 2022 14:40:58 +0100
Subject: [PATCH] added second RouteDto and changed Route Controller URL

---
 .../controller/ClimbingRouteController.java     |  6 +++---
 .../dto/RouteDtoWithoutMemberList.java          | 17 +++++++++++++++++
 .../domains/member/dto/MemberDto.java           | 11 ++++-------
 .../domains/member/model/Member.java            |  2 --
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/example/kletterhalle/domains/climbingRoute/dto/RouteDtoWithoutMemberList.java

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 45c2483..15aa922 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<List<ClimbingRoute>> getAllclimbingRoutes() {
+    @GetMapping("/climbingRoutes/all")
+    public ResponseEntity<List<ClimbingRoute>> getAllClimbingRoutes() {
         return climbingRouteService.getAllClimbingRoutes();
     }
 
@@ -27,7 +27,7 @@ public class ClimbingRouteController {
         return climbingRouteService.getClimbingRouteById(id);
     }
 
-    @PostMapping("/climbingRoute")
+    @PostMapping("/climbingRoute/add")
     public ResponseEntity<ClimbingRoute> 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 0000000..5d46dc9
--- /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 d85eda9..0c7116b 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<ClimbingRouteDto> favouriteRoutes = new HashSet<>();
+    private Set<RouteDtoWithoutMemberList> 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 433b5cd..4431961 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.*;
-- 
GitLab