FSJ0720A115

.classpath

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

build/classes/.gitignore

@@ -1,3 +1,4 @@
+/testing/
+/model/
 /businesslogic/
 /controller/
-/model/

src/businesslogic/RegistrationValidation.java

@@ -1,2 +1,35 @@
 package businesslogic;
+import java.util.regex.*;
+
+public class RegistrationValidation {
+
+	public boolean checkUserDetails(String email, String password, String confirmPassword) {
+
+		boolean pass = validPassword(password, confirmPassword);
+		boolean eml = validEmail(email);
+
+		return (pass && eml);
+	}
+
+	private boolean validPassword(String password, String confirmPassword) {
+
+		if(!password.equals(confirmPassword) || password.equals(""))
+			return false;
+		else if(!(password.length() >= 8 && password.length() <= 20))
+			return false;
+		else if(!Pattern.matches("^(?=.*\\d)(?=.*[@])(?=.*[a-z])(?=.*[A-Z]).{8,20}$", password))
+			return false;
+		else
+			return true;
+
+	}
+
+	private boolean validEmail(String email) {
+
+		if(Pattern.matches("^(.+)@(.+)$", email))
+			return true;
+		else
+			return false;
+	}
+}
 

src/businesslogic/ValidateUser.java

@@ -1,6 +1,5 @@
 package businesslogic;
 
-/*
 
 public class ValidateUser {
 
@@ -16,4 +15,3 @@ public boolean validate(String email, String password) {
 
 }
 
-*/

src/controller/SignUpController.java

@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import businesslogic.RegistrationValidation;
+import model.User;
+
 
 
 
@@ -31,12 +34,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-	/*	String email = request.getParameter("email"); 
+		String email = request.getParameter("email"); 
 		String password = request.getParameter("password"); 
 		String confirmPassword = request.getParameter("confirmPassword"); 
 		LocalDateTime date= LocalDateTime.now(); 
 
-
+		RegistrationValidation checkUser = new RegistrationValidation();
+		checkUser.checkUserDetails(email, password, confirmPassword);
 
 		if(checkUser.checkUserDetails(email, password, confirmPassword))
 		{
@@ -58,7 +62,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			rd.forward(request, response);
 		}
 
-		*/
+
 	}
 
 }

src/model/User.java

@@ -1 +1,36 @@
 package model;
+import java.time.LocalDateTime;
+
+public class User{
+
+	String email;
+	String password;
+	LocalDateTime date;
+
+	public User(String email, String password, LocalDateTime date) {
+		this.email = email;
+		this.password = password;
+		this.date = date;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public LocalDateTime getDate() {
+		return date;
+	}
+	public void setDate(LocalDateTime date) {
+		this.date = date;
+	}
+
+
+}