delete mentor and poulain models (f0cd04ee) · Commits · luca.verardo / MentorArcMirror

src/main/java/com/example/demo/HelpProposition.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -8,7 +8,8 @@ import javax.persistence.GenerationType;
		import javax.persistence.Id;
		import javax.persistence.ManyToOne;
		import javax.persistence.Table;
		import com.example.demo.Mentor;

		import com.example.demo.model.User;

		import org.springframework.format.annotation.DateTimeFormat;

		@@ -37,10 +38,10 @@ public class HelpProposition {
		private String comment;

		@ManyToOne
		private Mentor mentor;
		private User mentor;

		@ManyToOne
		private Poulain poulain;
		private User poulain;

		public HelpProposition() {

		@@ -66,11 +67,11 @@ public class HelpProposition {
		return comment;
		}

		public Mentor getMentor(){
		public User getMentor(){
		return mentor;
		}

		public Poulain getPoulain(){
		public User getPoulain(){
		return poulain;
		}

		@@ -94,11 +95,11 @@ public class HelpProposition {
		this.comment = comment;
		}

		public void setMentor(Mentor mentor) {
		public void setMentor(User mentor) {
		this.mentor = mentor;
		}

		public void setPoulain(Poulain poulain) {
		public void setPoulain(User poulain) {
		this.poulain = poulain;
		}
		}

src/main/java/com/example/demo/HelpPropositionController.java

+24 −13

Original line number	Diff line number	Diff line
		package com.example.demo;

		import java.security.Principal;
		import java.util.Map;

		import javax.servlet.http.HttpSession;

		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.security.core.context.SecurityContextHolder;
		import org.springframework.stereotype.Controller;
		import org.springframework.ui.Model;
		import org.springframework.web.bind.annotation.GetMapping;
		@@ -11,12 +15,16 @@ import org.springframework.web.bind.annotation.PathVariable;
		import org.springframework.web.bind.annotation.PostMapping;

		import com.example.demo.HelpPropositionRepository;
		import com.example.demo.model.User;
		import com.example.demo.service.UserServiceInterface;


		@Controller
		public class HelpPropositionController {
		@Autowired
		HelpPropositionRepository helpPropositionRepository;
		@Autowired
		private UserServiceInterface userService;

		@GetMapping("/allHelpProposition")
		public String getAll(Map<String, Object> model) {
		@@ -31,11 +39,14 @@ public class HelpPropositionController {
		}

		@PostMapping("/insertHelpProposition")
		public String insertHelpProposition(@ModelAttribute HelpProposition helpProposition, Model model) {
		//TODO
		Mentor mentor = new Mentor();
		mentor.setId(30);
		helpProposition.setMentor(mentor);
		public String insertHelpProposition(@ModelAttribute HelpProposition helpProposition, Model model, HttpSession session, Principal principal) {

		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		System.out.println(email);
		User user = userService.findByEmail(email);
		System.out.println(email);

		helpProposition.setMentor(user);

		helpPropositionRepository.save(helpProposition);
		return "formHelpProposition";
		@@ -44,10 +55,10 @@ public class HelpPropositionController {
		@GetMapping("/allPropositionByMentor")
		public String getallPropositionByMentor(Map<String, Object> model) {

		//TODO
		Mentor mentor = new Mentor();
		mentor.setId(30);
		model.put("helpPropositions", helpPropositionRepository.findByMentor(mentor));
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);

		model.put("helpPropositions", helpPropositionRepository.findByMentor(user));
		return "ProfileHelpProposition";
		}

		@@ -55,10 +66,10 @@ public class HelpPropositionController {
		public String editProposition(@PathVariable("id") Integer helpId, Model model) {
		HelpProposition helpProposition = helpPropositionRepository.findById(helpId);

		//TODO
		Poulain poulain = new Poulain();
		poulain.setId(32);
		helpProposition.setPoulain(poulain);
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);

		helpProposition.setPoulain(user);

		helpPropositionRepository.save(helpProposition);
		return "allHelpProposition";

src/main/java/com/example/demo/HelpPropositionRepository.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,8 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository;
		import java.util.List;

		import com.example.demo.HelpProposition;
		import com.example.demo.model.User;

		public interface HelpPropositionRepository extends JpaRepository <HelpProposition, Long> {
		List<HelpProposition> findByMentor(Mentor mentor);
		List<HelpProposition> findByMentor(User mentor);
		HelpProposition findById(Integer id);
		}

src/main/java/com/example/demo/HelpRequest.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ import javax.persistence.GenerationType;
		import javax.persistence.Id;
		import javax.persistence.ManyToOne;
		import javax.persistence.Table;
		import com.example.demo.Poulain;
		import com.example.demo.model.User;

		import org.springframework.format.annotation.DateTimeFormat;

		@@ -37,10 +37,10 @@ public class HelpRequest {
		private String comment;

		@ManyToOne
		private Poulain poulain;
		private User poulain;

		@ManyToOne
		private Mentor mentor;
		private User mentor;


		public HelpRequest() {
		@@ -66,11 +66,11 @@ public class HelpRequest {
		return comment;
		}

		public Poulain getPoulain(){
		public User getPoulain(){
		return poulain;
		}

		public Mentor getMentor(){
		public User getMentor(){
		return mentor;
		}

		@@ -94,11 +94,11 @@ public class HelpRequest {
		this.comment = comment;
		}

		public void setPoulain(Poulain poulain) {
		public void setPoulain(User poulain) {
		this.poulain = poulain;
		}

		public void setMentor(Mentor mentor) {
		public void setMentor(User mentor) {
		this.mentor = mentor;
		}
		}

src/main/java/com/example/demo/HelpRequestController.java

+21 −19

Original line number	Diff line number	Diff line
		package com.example.demo;

		import java.util.Map;

		import org.springframework.beans.factory.annotation.Autowired;

		import org.springframework.security.core.context.SecurityContextHolder;
		import org.springframework.stereotype.Controller;
		import org.springframework.ui.Model;
		import org.springframework.web.bind.annotation.GetMapping;
		@@ -10,12 +11,18 @@ import org.springframework.web.bind.annotation.ModelAttribute;
		import org.springframework.web.bind.annotation.PathVariable;
		import org.springframework.web.bind.annotation.PostMapping;
		import com.example.demo.HelpRequestRepository;
		import com.example.demo.model.User;

		import com.example.demo.service.UserServiceInterface;



		@Controller
		public class HelpRequestController {
		@Autowired
		HelpRequestRepository helpRequestRepository;
		private UserServiceInterface userService;


		@GetMapping("/allHelpRequest")
		public String getAll(Map<String, Object> model) {
		@@ -31,30 +38,26 @@ public class HelpRequestController {

		@PostMapping("/insertHelpRequest")
		public String insertHelpRequest(@ModelAttribute HelpRequest helpRequest, Model model) {
		//TODO : recup le poulain loggé
		Poulain poulain= new Poulain();
		poulain.setId(32);
		helpRequest.setPoulain(poulain);
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);
		helpRequest.setPoulain(user);

		helpRequestRepository.save(helpRequest);
		return "formHelpRequest";
		}
		@GetMapping("/allRequestByPoulain")
		public String getallPropositionByPoulain(Map<String, Object> model) {

		//TODO : recup le mentor loggé
		Poulain poulain= new Poulain();
		poulain.setId(32);
		model.put("helpRequests", helpRequestRepository.findByPoulain(poulain));
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);
		model.put("helpRequests", helpRequestRepository.findByPoulain(user));
		return "ProfileHelpRequest";
		}

		@PostMapping("/acceptRequest")
		public String acceptRequest(@ModelAttribute HelpRequest helpRequest, Model model) {
		//TODO
		Mentor mentor = new Mentor();
		mentor.setId(30);
		helpRequest.setMentor(mentor);
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);
		helpRequest.setMentor(user);
		helpRequestRepository.save(helpRequest);
		return "allHelpProposition";
		}
		@@ -63,10 +66,9 @@ public class HelpRequestController {
		public String editRequest(@PathVariable("id") Integer helpId, Model model) {
		HelpRequest helpRequest = helpRequestRepository.findById(helpId);

		//TODO
		Mentor mentor = new Mentor();
		mentor.setId(30);
		helpRequest.setMentor(mentor);
		String email = SecurityContextHolder.getContext().getAuthentication().getName();
		User user = userService.findByEmail(email);
		helpRequest.setMentor(user);

		helpRequestRepository.save(helpRequest);
		return "allHelpRequest";