Sprint2 starter

.gitignore

@@ -5,4 +5,5 @@ HELP.md
 mvnw
 mvnw.cmd
 target/
-
+# Ingore intelliJ generated module settings files
+*.iml

.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1613507358663</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

README.md

@@ -5,5 +5,5 @@ The application defaults to port 8080.
 
 To start from the IDE press F5 to run. This will open the debug and run view. You will need to create a launch configuration which Visual Studio Code will help you with.  
 
- # Landing page (list available products)
-`https://uarkregappjava.herokuapp.com/`
+ # Landing page
+`https://team-sms-store.herokuapp.com/`

src/main/java/edu/uark/registerapp/commands/activeUsers/ActiveUserDeleteCommand.java

@@ -0,0 +1,70 @@
+package edu.uark.registerapp.commands.activeUsers;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import edu.uark.registerapp.commands.VoidCommandInterface;
+import edu.uark.registerapp.models.entities.ActiveUserEntity;
+import edu.uark.registerapp.models.entities.EmployeeEntity;
+import edu.uark.registerapp.models.repositories.ActiveUserRepository;
+import edu.uark.registerapp.models.repositories.EmployeeRepository;
+
+@Service
+public class ActiveUserDeleteCommand implements VoidCommandInterface {
+
+	private String sessionKey;
+	private ActiveUserRepository activeUserRepository;
+	private EmployeeRepository employeeRepository;
+
+	public ActiveUserDeleteCommand(
+		String sessionKey,
+		ActiveUserRepository activeUserRepository,
+		EmployeeRepository employeeRepository)
+	{
+		this.sessionKey = sessionKey;
+		this.activeUserRepository = activeUserRepository;
+		this.employeeRepository = employeeRepository;
+	}
+
+	public ActiveUserDeleteCommand()
+	{
+		this.sessionKey = "";
+	}
+
+	@Override
+	@Transactional
+	public void execute()
+	{
+		if (activeUserRepository == null)
+		{
+			return;
+		}
+
+		final Optional<ActiveUserEntity> activeUserEntity =
+			this.activeUserRepository.findBySessionKey(this.sessionKey);
+
+		if (activeUserEntity.isPresent())	// Found active user
+		{
+			if (employeeRepository != null)
+			{
+				Optional<EmployeeEntity> employee =
+					employeeRepository.findById(activeUserEntity.get().getEmployeeId());
+
+				if (employee.isPresent())	// Found corresponding entry in 'employee' table
+				{
+					employee.get().setIsActive(false);
+					employeeRepository.save(employee.get());
+				}
+			}
+
+			this.activeUserRepository.delete(activeUserEntity.get());
+		}
+	}
+
+	public String getSessionKey()
+	{
+		return this.sessionKey;
+	}
+}

src/main/java/edu/uark/registerapp/commands/employees/ActiveEmployeeExistsQuery.java

@@ -0,0 +1,24 @@
+package edu.uark.registerapp.commands.employees;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import edu.uark.registerapp.models.repositories.EmployeeRepository;
+import edu.uark.registerapp.commands.exceptions.NotFoundException;
+
+@Service
+public class ActiveEmployeeExistsQuery {
+	public void execute()
+	{
+		final Boolean activeEmployeeExists =
+			this.employeeRepository.existsByIsActive(true);
+
+		if (!activeEmployeeExists)
+		{
+			throw new NotFoundException("Employee");
+		}
+	}
+
+	@Autowired
+	private EmployeeRepository employeeRepository;
+}

src/main/java/edu/uark/registerapp/commands/employees/EmployeeSignInCommand.java

@@ -0,0 +1,134 @@
+package edu.uark.registerapp.commands.employees;
+
+import java.util.Optional;
+import java.util.Arrays;
+
+import org.apache.commons.lang3.StringUtils;
+
+import javax.transaction.Transactional;
+
+import edu.uark.registerapp.models.api.EmployeeSignIn;
+import edu.uark.registerapp.models.entities.ActiveUserEntity;
+import edu.uark.registerapp.models.entities.EmployeeEntity;
+import edu.uark.registerapp.models.repositories.ActiveUserRepository;
+import edu.uark.registerapp.models.repositories.EmployeeRepository;
+
+
+public class EmployeeSignInCommand {
+
+	private EmployeeSignIn employeeSignIn;
+	private String sessionKey;
+
+	public EmployeeSignInCommand(EmployeeSignIn employeeSignIn, String sessionKey)
+	{
+		this.employeeSignIn = employeeSignIn;
+		this.sessionKey = sessionKey;
+	}
+
+	EmployeeSignInCommand()
+	{
+		this.employeeSignIn = new EmployeeSignIn();
+		this.sessionKey = "";
+	}
+
+	@Transactional
+	public boolean execute()
+	{
+		if (!validateSignIn())	// Credentials are invalid
+			return false;
+
+		Optional<EmployeeEntity> employee =		// Finds employee by employee ID
+			employeeRepository.findByEmployeeId(
+				Integer.parseInt(employeeSignIn.getId()));
+
+		if (!employee.isPresent())		// Employee does not exist
+			return false;
+
+		if (!Arrays.equals(			// Passwords do NOT match
+				employeeSignIn.getPassword().getBytes(),
+				employee.get().getPassword()))
+		{
+			return false;
+		}
+
+		// NOTE: At this point, we have a valid sign in
+
+		Optional<ActiveUserEntity> activeUser =		// Finds active user by UUID
+			activeUserRepository.findByEmployeeId(employee.get().getId());
+
+		if (activeUser.isPresent())		// Updates existing active user's session key
+		{
+			ActiveUserEntity user = activeUser.get().setSessionKey(sessionKey);
+			activeUserRepository.save(user);
+		}
+		else	// Creates new active user
+		{
+			ActiveUserEntity user = new ActiveUserEntity();
+
+			user.setClassification(employee.get().getClassification());
+
+			// Create full name then set active user name
+			String employeeName = employee.get().getFirstName();
+			employeeName.concat(" ").concat(employee.get().getLastName());
+
+			user.setName(employeeName);
+
+			user.setEmployeeId(employee.get().getId());
+			user.setSessionKey(sessionKey);
+
+			// New active user entry - complete
+			activeUserRepository.save(user);
+
+			// Update 'active' column on employee table to true
+			employee.get().setIsActive(true);
+			employeeRepository.save(employee.get());
+		}
+
+		return true;
+	}
+
+	private boolean validateSignIn()
+	{
+		String employeeId = employeeSignIn.getId();
+
+		if (StringUtils.isBlank(employeeId) || employeeId.length() > 5)
+		{
+			return false;
+		}
+
+		for (int i = 0; i < employeeId.length(); i++)
+		{
+			if(!(employeeId.charAt(i) >= '0' && employeeId.charAt(i) <= '9'))
+			{
+				return false;
+			}
+		}
+
+		if(StringUtils.isBlank(employeeSignIn.getPassword()))
+		{
+			return false;
+		}
+
+		return true; 
+	}
+
+	/*
+	ONLY CALLED BY SignInRouteController
+	PROBABLY A BAD WAY TO DO THIS
+	I think @Autowired doesn't work because this class is not a controller...
+	...hence SignInRouteController setting this property
+	*/
+	public void setEmployeeRepository(EmployeeRepository employeeRepository)
+	{
+		this.employeeRepository = employeeRepository;
+	}
+
+	// THIS IS ALSO PROBABLY BAD FOR THE SAME REASON AS ABOVE
+	public void setActiveUserRepository(ActiveUserRepository activeUserRepository)
+	{
+		this.activeUserRepository = activeUserRepository;
+	}
+
+	private EmployeeRepository employeeRepository;
+	private ActiveUserRepository activeUserRepository;
+}

src/main/java/edu/uark/registerapp/controllers/EmployeeDetailRouteController.java

@@ -0,0 +1,58 @@
+package edu.uark.registerapp.controllers;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+import edu.uark.registerapp.controllers.enums.ViewNames;
+import edu.uark.registerapp.models.entities.EmployeeEntity;
+import edu.uark.registerapp.models.repositories.EmployeeRepository;
+
+@Controller
+@RequestMapping(value = "/employeeDetail")
+public class EmployeeDetailRouteController extends BaseRouteController {
+	@RequestMapping(method = RequestMethod.GET)
+	public ModelAndView showEmployeeDetail()
+	{
+		return new ModelAndView(ViewNames.EMPLOYEE_DETAIL.getViewName());
+	}
+
+	@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	public ModelAndView makeNewEmployee(
+		EmployeeEntity employee,
+		HttpServletRequest request
+	)
+	{
+		employee = new EmployeeEntity();
+
+		employee.setFirstName(request.getParameter("firstname"));
+		employee.setLastName(request.getParameter("lastname"));
+		employee.setPassword(request.getParameter("password").getBytes());
+		employee.setClassification(Integer.parseInt(
+			request.getParameter("classification")));
+
+		employeeRepository.save(employee);
+
+		if (this.employeeRepository.count() == 1)
+		{
+			ModelAndView modelAndView = new ModelAndView(
+				REDIRECT_PREPEND.concat(ViewNames.SIGN_IN.getRoute()));
+
+			modelAndView.addObject("Method", "GET");
+
+			return modelAndView;
+		}
+		else
+			return new ModelAndView(ViewNames.EMPLOYEE_DETAIL.getViewName());
+
+		//return new ModelAndView(ViewNames.EMPLOYEE_DETAIL.getViewName());
+	}
+
+	@Autowired
+	EmployeeRepository employeeRepository;
+}

src/main/java/edu/uark/registerapp/controllers/MainMenuRouteController.java

@@ -0,0 +1,55 @@
+package edu.uark.registerapp.controllers;
+
+import java.util.Map;
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import edu.uark.registerapp.controllers.enums.ViewModelNames;
+import edu.uark.registerapp.controllers.enums.ViewNames;
+import edu.uark.registerapp.models.entities.ActiveUserEntity;
+import edu.uark.registerapp.models.enums.EmployeeClassification;
+
+@Controller
+@RequestMapping(value = "/mainMenu")
+public class MainMenuRouteController extends BaseRouteController {
+
+	@RequestMapping(method = RequestMethod.GET)
+	public ModelAndView start(
+		@RequestParam final Map<String, String> queryParameters,
+		final HttpServletRequest request
+	) {
+
+		final Optional<ActiveUserEntity> activeUserEntity =
+			this.getCurrentUser(request);
+		if (!activeUserEntity.isPresent()) {
+			return this.buildInvalidSessionResponse();
+		}
+
+		ModelAndView modelAndView =
+			this.setErrorMessageFromQueryString(
+				new ModelAndView(ViewNames.MAIN_MENU.getViewName()),
+				queryParameters);
+
+		// Check if user is any kind of manager
+		if (EmployeeClassification.isElevatedUser(
+			activeUserEntity.get().getClassification()))
+		{
+			modelAndView.addObject(
+				ViewModelNames.IS_ELEVATED_USER.getValue(), true);
+		}
+		else
+		{
+			modelAndView.addObject(
+				ViewModelNames.IS_ELEVATED_USER.getValue(), false);
+		}
+
+		return modelAndView;
+	}
+}

src/main/java/edu/uark/registerapp/controllers/ProductListingRouteController.java

@@ -12,7 +12,7 @@
 import edu.uark.registerapp.models.api.Product;
 
 @Controller
-@RequestMapping(value = "/")
+@RequestMapping(value = "/productListing")
 public class ProductListingRouteController {
 	@RequestMapping(method = RequestMethod.GET)
 	public ModelAndView showProductListing() {