Resolve "Split job offers page into two separate pages"

Closes #155 (closed), #162 (closed)

src/main/java/nl/tudelft/tam/controller/ApplicationController.java

@@ -19,14 +19,13 @@ package nl.tudelft.tam.controller;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import nl.tudelft.labracore.api.dto.ProgramDetailsDTO;
 import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
+import nl.tudelft.tam.dto.view.details.ApplicationDetailsJobOfferDTO;
 import nl.tudelft.tam.enums.Status;
 import nl.tudelft.tam.model.Application;
 import nl.tudelft.tam.service.*;
@@ -102,17 +101,23 @@ public class ApplicationController {
 	}
 
 	/**
-	 * Redirects the user from application/my to job-offer/open?tab=applications where the user can see their
-	 * own applications.
+	 * Gets all applications for a user.
 	 *
-	 * @param  q A query/search string if present.
-	 * @return   The redirect to the job-offer page.
+	 * @param  person The currently logged in person
+	 * @param  q      The search query
+	 * @param  model  The model to add the data to
+	 * @return        The applications page
 	 */
 	@GetMapping("my")
-	@PreAuthorize("!@authorisationService.isStaff()")
-	public String getApplications(@RequestParam(required = false) String q) {
-		return "redirect:/job-offer/open?tab=applications" + (q == null ? "" : "&q=" + q);
+	public String getApplications(@AuthenticatedPerson Person person,
+			@RequestParam(required = false) String q, Model model) {
+		List<ApplicationDetailsJobOfferDTO> applications = applicationService
+				.getFilteredApplicationsForPerson(person.getId(), q);
+
+		model.addAttribute("applications", applications);
+		return "application/view_many";
 	}
+
 	// endregion
 
 	// region manipulate data
@@ -129,8 +134,9 @@ public class ApplicationController {
 	public String submitApplication(@AuthenticatedPerson Person person, @PathVariable Long id,
 			@RequestParam(required = false) String page, @RequestParam(required = false) Long program) {
 		applicationService.submit(person.getId(), id);
+		String url = "applications".equals(page) ? "application/my" : "job-offer/open";
 		return "redirect:/"
-				+ (page != null ? page : "job-offer/open" + (program == null ? "" : "?program=" + program));
+				+ (url + (program == null ? "" : "?program=" + program));
 	}
 
 	/**
@@ -149,7 +155,7 @@ public class ApplicationController {
 			@RequestParam(required = false) String program) {
 		applicationService.retract(person.getId(), id);
 
-		String url = page == null ? "job-offer/open" : page;
+		String url = "applications".equals(page) ? "application/my" : "job-offer/open";
 
 		Map<String, String> params = new HashMap<>();
 		if (q != null)
@@ -231,11 +237,14 @@ public class ApplicationController {
 	@PostMapping("accept/{id}")
 	@PreAuthorize("@authorisationService.offerExistsFor(#id)")
 	public String acceptApplication(@AuthenticatedPerson Person person, @PathVariable Long id,
+			@RequestParam(required = false) String page,
 			@RequestParam(required = false) String q,
 			@RequestParam(required = false) String tab,
 			@RequestParam(required = false) String program) {
 		applicationService.accept(person.getId(), id);
 
+		String url = "applications".equals(page) ? "application/my" : "job-offer/open";
+
 		Map<String, String> params = new HashMap<>();
 		if (q != null)
 			params.put("q", q);
@@ -244,7 +253,7 @@ public class ApplicationController {
 		if (program != null)
 			params.put("program", program);
 
-		return "redirect:/job-offer/open" + getURLParamsString(params);
+		return "redirect:/" + url + getURLParamsString(params);
 	}
 
 	private static String getURLParamsString(Map<String, String> params) {