Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-54 Working version includes no beans and no connection to the database.

Browse Source
This commit is contained in:
BrittanyBi
2019-04-24 16:38:29 -06:00
parent 3ee3d1bb06
commit e72760c528
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/msudenver/tsp/website/Application.java
+8 -1
View File
@@ -3,11 +3,18 @@ package edu.msudenver.tsp.website;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication(scanBasePackages = "edu.msudenver.tsp") @SpringBootApplication
public class Application { public class Application {
public static void main(final String[] args) { public static void main(final String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
/*
@Bean
@Autowired
public UserService userService(@Autowired final RestService restService) {
return new UserService(restService);
}
*/
} }
src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java
+11 -11
View File
@@ -1,11 +1,8 @@
package edu.msudenver.tsp.website.controller; package edu.msudenver.tsp.website.controller;
import edu.msudenver.tsp.services.UserService;
import edu.msudenver.tsp.services.dto.Account;
import edu.msudenver.tsp.website.forms.UserCreationForm; import edu.msudenver.tsp.website.forms.UserCreationForm;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@@ -19,7 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
@AllArgsConstructor @AllArgsConstructor
@RequestMapping("/createuser") @RequestMapping("/createuser")
public class UserCreationController { public class UserCreationController {
@Autowired private final UserService userService; //@Autowired private final UserService userService;
@GetMapping({"/",""}) @GetMapping({"/",""})
public ModelAndView createUserPage() { public ModelAndView createUserPage() {
@@ -29,21 +26,24 @@ public class UserCreationController {
@PostMapping({"/",""}) @PostMapping({"/",""})
public String registerUser(@Validated final UserCreationForm userCreationForm, final Model model) { public String registerUser(@Validated final UserCreationForm userCreationForm, final Model model) {
model.addAttribute("userID", userCreationForm.getUserID()); //model.addAttribute("userID", userCreationForm.getUserID());
model.addAttribute("username", userCreationForm.getUsername()); model.addAttribute("username", userCreationForm.getUsername());
model.addAttribute("password", userCreationForm.getPassword()); model.addAttribute("password", userCreationForm.getPassword());
model.addAttribute("confirmPassword", userCreationForm.getConfirmPassword()); //model.addAttribute("confirmPassword", userCreationForm.getConfirmPassword());
model.addAttribute("emailAddress", userCreationForm.getEmailAddress()); model.addAttribute("emailAddress", userCreationForm.getEmailAddress());
model.addAttribute("firstName", userCreationForm.getFirstName()); //model.addAttribute("firstName", userCreationForm.getFirstName());
model.addAttribute("lastName", userCreationForm.getLastName()); //model.addAttribute("lastName", userCreationForm.getLastName());
model.addAttribute("referrer", userCreationForm.getReferrer()); //model.addAttribute("referrer", userCreationForm.getReferrer());
model.addAttribute("TnCAgreement", userCreationForm.isAgreedToTerms()); //model.addAttribute("TnCAgreement", userCreationForm.isAgreedToTerms());
LOG.info("Saving user {}...", userCreationForm);
/*
final Account newUser = new Account(); final Account newUser = new Account();
newUser.setUsername(userCreationForm.getUsername()); newUser.setUsername(userCreationForm.getUsername());
newUser.setPassword(userCreationForm.getPassword()); newUser.setPassword(userCreationForm.getPassword());
userService.createAccount(newUser); userService.createAccount(newUser);
*/
return "successfulRegistration"; return "successfulRegistration";
} }
src/main/java/edu/msudenver/tsp/website/controller/ValidationExceptionHandler.java
+5
View File
@@ -0,0 +1,5 @@
package edu.msudenver.tsp.website.controller;
public class ValidationExceptionHandler {
}
src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp
-3
View File
@@ -4,10 +4,7 @@
<title>You're Registered!</title> <title>You're Registered!</title>
</head> </head>
<body> <body>
<br><b>User ID: </b><%= request.getParameter("userID")%>
<br><b>Username: </b><%= request.getParameter("username")%> <br><b>Username: </b><%= request.getParameter("username")%>
<br><b>Theorem: </b><%= request.getParameter("emailAddress")%> <br><b>Theorem: </b><%= request.getParameter("emailAddress")%>
<br><b>First Name: </b><%= request.getParameter("firstName")%>
<br><b>Last Name: </b><%= request.getParameter("lastName")%>
</body> </body>
</html> </html>
src/test/java/edu/msudenver/tsp/website/controller/UserCreationControllerTest.java
+2 -1
View File
@@ -14,7 +14,8 @@ import static org.mockito.Mockito.mock;
public class UserCreationControllerTest { public class UserCreationControllerTest {
private final UserService userService = mock(UserService.class); private final UserService userService = mock(UserService.class);
private final UserCreationController userCreationController = new UserCreationController(userService); //@Autowired
private final UserCreationController userCreationController = new UserCreationController();//userService);
@Test @Test
public void testCreateUserPage() { public void testCreateUserPage() {