From 2f170a3dcb008f5762fb0182999b9ee81a5d7322 Mon Sep 17 00:00:00 2001 From: Marcel Meyer Date: Wed, 2 Nov 2022 18:33:07 +0100 Subject: [PATCH 1/2] added config package (cors Policy) and changed member prop to firstName and Lastname --- .../kletterhalle/domains/config/AppConf.java | 15 +++++++++++++++ .../domains/member/dto/MemberDto.java | 4 ++-- .../kletterhalle/domains/member/model/Member.java | 14 +++++++------- .../domains/member/service/MemberService.java | 2 ++ 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/example/kletterhalle/domains/config/AppConf.java diff --git a/src/main/java/com/example/kletterhalle/domains/config/AppConf.java b/src/main/java/com/example/kletterhalle/domains/config/AppConf.java new file mode 100644 index 0000000..78241d4 --- /dev/null +++ b/src/main/java/com/example/kletterhalle/domains/config/AppConf.java @@ -0,0 +1,15 @@ +package com.example.kletterhalle.domains.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class AppConf implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost:4200") + .allowedMethods("GET"); + } +} 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 6e34ab8..d85eda9 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 @@ -19,8 +19,8 @@ public class MemberDto { @Id private Long id; - private String forName; - private String surName; + private String firstName; + private String lastName; private AddressDto addressDto; 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 4664952..433b5cd 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 @@ -22,11 +22,11 @@ public class Member { @GeneratedValue(strategy = GenerationType.AUTO) private Long id; - @NotBlank(message = "Forname is mandatory") - private String forName; + @NotBlank(message = "First name is mandatory") + private String firstName; - @NotBlank(message = "Surname is mandatory") - private String surName; + @NotBlank(message = "Last name is mandatory") + private String lastName; @Valid @Embedded @@ -43,9 +43,9 @@ public class Member { private Set favouriteRoutes = new HashSet<>(); - public Member(String forName, String surName, Address address) { - this.forName = forName; - this.surName = surName; + public Member(String firstName, String lastName, Address address) { + this.firstName = firstName; + this.lastName = lastName; this.address = address; } diff --git a/src/main/java/com/example/kletterhalle/domains/member/service/MemberService.java b/src/main/java/com/example/kletterhalle/domains/member/service/MemberService.java index ee89db0..00f2937 100644 --- a/src/main/java/com/example/kletterhalle/domains/member/service/MemberService.java +++ b/src/main/java/com/example/kletterhalle/domains/member/service/MemberService.java @@ -5,6 +5,7 @@ import com.example.kletterhalle.domains.member.mapper.MemberMapper; import com.example.kletterhalle.domains.member.model.Member; import com.example.kletterhalle.domains.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -18,6 +19,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class MemberService { + @Autowired MemberRepository memberRepository; private final MemberMapper mapper; -- GitLab From 0f64e70bf64faab272cd9f787c0eff1b33bacda2 Mon Sep 17 00:00:00 2001 From: Marcel Meyer Date: Thu, 3 Nov 2022 10:16:10 +0100 Subject: [PATCH 2/2] added Pst and Delete to addCorsMappings and changed member controller url at getmapping and postMapping --- .../java/com/example/kletterhalle/domains/config/AppConf.java | 2 +- .../domains/member/controller/MemberController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/kletterhalle/domains/config/AppConf.java b/src/main/java/com/example/kletterhalle/domains/config/AppConf.java index 78241d4..e85618f 100644 --- a/src/main/java/com/example/kletterhalle/domains/config/AppConf.java +++ b/src/main/java/com/example/kletterhalle/domains/config/AppConf.java @@ -10,6 +10,6 @@ public class AppConf implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedOrigins("http://localhost:4200") - .allowedMethods("GET"); + .allowedMethods("GET", "POST", "DELETE"); } } diff --git a/src/main/java/com/example/kletterhalle/domains/member/controller/MemberController.java b/src/main/java/com/example/kletterhalle/domains/member/controller/MemberController.java index 68665bf..f332d13 100644 --- a/src/main/java/com/example/kletterhalle/domains/member/controller/MemberController.java +++ b/src/main/java/com/example/kletterhalle/domains/member/controller/MemberController.java @@ -20,7 +20,7 @@ public class MemberController { @Autowired private MemberService memberService; - @GetMapping("/members") + @GetMapping("/members/all") public ResponseEntity> getAllMembers() { return memberService.getAllMembers(); } @@ -30,7 +30,7 @@ public class MemberController { return memberService.getMemberById(id); } - @PostMapping("/member") + @PostMapping("/member/add") public ResponseEntity createMember(@Valid @RequestBody MemberDto memberDto) { return memberService.createMember(memberDto); } -- GitLab