diff --git a/.gitignore b/.gitignore index 3466d7bf..00a4d03a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ HELP.md mvnw mvnw.cmd target/ - diff --git a/EmployeeCreateCommand.java b/EmployeeCreateCommand.java new file mode 100644 index 00000000..31281f46 --- /dev/null +++ b/EmployeeCreateCommand.java @@ -0,0 +1,68 @@ +@Service +public class EmployeeCreateCommand implements ResultCommandInterface { + private Employee employee; + private boolean initialEmployee; + private EmployeeRepository employeeRepository; + final EmployeeEntity employeeEntity; + + public Employee validate() { + + if (initialEmployee == true) { + employee.setClassification( + EmployeeClassification.GENERAL_MANAGER.getClassification()); + } + + + employeeEntity = + this.employeeRepository.save(employeeEntity(this.employee)); + this.employee.setId(employeeEntity.getId()); + + this.employee.setPassword(StringUtils.EMPTY); + this.employee.setCreatedOn(employeeEntity.getCreatedOn()); + this.employee.setEmployeeId( + employeeEntity.getEmployeeId()); + + return this.employee; + } + + private void checkIfEmpty() { + if (StringUtils.isBlank(this.eployee.getFirstName())) { + throw new Exception("firstNameIsEmpty"); + } + if (StringUtils.isBlank(this.employee.getLastName())) { + throw new Exception("lastNameIsEmpty"); + } + if (StringUtils.isBlank(this.employee.getPassword())) { + throw new Exception("passwordIsEmpty"); + } + + if (isInitialEmployee == false + && (EmployeeClassification.map(this.employee.getClassification()) == EmployeeClassification.NOT_DEFINED)) { + + throw new Exception("classification"); + } + } + + public Employee getEmployee() { + return employee; + } + + public EmployeeCreateCommand setEmployee(final Employee employee) { + this.employee = employee; + return this.employee; + } + + public boolean getInitialEmployee() { + return this.initialEmployee; + } + + public EmployeeCreateCommand setInitialEmployee(final boolean setInitial) { + + initialEmployee = setInitial; + return initialEmployee; + } + + public EmployeeCreate() { + initialEmployee = false; + } +} \ No newline at end of file diff --git a/EmployeeQuery.java b/EmployeeQuery.java new file mode 100644 index 00000000..ecd2142a --- /dev/null +++ b/EmployeeQuery.java @@ -0,0 +1,28 @@ +import java.util.UUID; + +public class EmployeeQuery { + private UUID employeeID; + + public Employee returnEmployee() { + @Autowired + EmployeeRepository idFinder; + EmployeeEntity findID = idFinder.findById(this.employeeID); + Employee employee = new Employee(findID.get()); ; + + if (findID){ + return employee; + } + else { + throw new Exception("NotFoundException"); + } + } + + public UUID getEmployeeID() { + return this.employeeID; + } + + public setEmployeeID(final UUID idSet) { + employeeID = idSet; + return employeeID; + } +} \ No newline at end of file diff --git a/EmployeeSignIn.java b/EmployeeSignIn.java new file mode 100644 index 00000000..14f881c0 --- /dev/null +++ b/EmployeeSignIn.java @@ -0,0 +1,31 @@ +package edu.uark.registerapp.models.api; +//This is from ApiResponse.java, aka under models/api +import org.apache.commons.lang3.StringUtils; + +public class EmployeeSignIn { + private String employeeId; + + public String getId() { + return this.employeeId; + } + + public SignIn setId(final String employeeId) { + this.employeeId = employeeId; + return this; + } + + private String password; + public String getPword() { + return this.password; + } + public EmployeeSignIn setPword( final String password) { + this.password = password; + return this; + } + + public EmployeeSignIn(final String password, final String employeeId) { + this.password = StringUtils.EMPTY; + this.employeeId = StringUtils.EMPTY; + } + +} \ No newline at end of file diff --git a/EmployeeUpdateCommand.java b/EmployeeUpdateCommand.java new file mode 100644 index 00000000..8468d142 --- /dev/null +++ b/EmployeeUpdateCommand.java @@ -0,0 +1,59 @@ +@Service +public class EmployeeUpdateCommand implements ResultCommandInterface { + + private Employee employee; + private EmployeeRepository employeeRepository; + private UUID employeeId; + + public Employee validate() { + this.validateProperties(); + + this.updateEntity(); + + return this.employee; + } + + // Helper methods + private void validateProperties() { + if (StringUtils.isBlank(this.employee.getFirstName())) { + throw new Exception("firstNameIsEmpty"); + } + if (StringUtils.isBlank(this.employee.getLastName())) { + throw new Exception("lastNameIsEmpty"); + } + if (EmployeeClassification.map(this.employee.getClassification()) == EmployeeClassification.NOT_DEFINED) { + throw new Exception("classification"); + } + } + + private void updateEntity() { + final EmployeeEntity employeeEntity = + this.employeeRepository.findById(this.employeeId); + + if (employeeEntity) { + throw new Exception("employeeDoesNotExist"); + } + + this.employee = employeeEntity.get() + .synchronize(this.employee); + + this.employeeRepository.save(employeeEntity.get()); + } + + public UUID getEmployeeId() { + return this.employeeId; + } + public EmployeeUpdateCommand setEmployeeId(final UUID idSet) { + this.employeeId = idSet; + return this.employeeId; + } + + public Employee getEmployee() { + return this.employee; + } + + public EmployeeUpdate setEmployee(final Employee employee) { + this.employee = employee; + return this; + } +} \ No newline at end of file diff --git a/Main_Menu_View.html b/Main_Menu_View.html new file mode 100644 index 00000000..b5a887fb --- /dev/null +++ b/Main_Menu_View.html @@ -0,0 +1,59 @@ + + + + Main Menu + + + + + +
+
+ +

+ +

+ +
+ + + +
+ +
+ +

+ +

+ +
+
+ +
+ + + + +
+
+ Sign Out + +
+
+ + + + + + + + diff --git a/README.md b/README.md index 86e4a71d..373c2e3f 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 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/` \ No newline at end of file +`https://uarkregappjava.herokuapp.com/` diff --git a/SignIn.html b/SignIn.html new file mode 100644 index 00000000..1383f5cb --- /dev/null +++ b/SignIn.html @@ -0,0 +1,34 @@ + + + + Sign In + + + + + + + + +
+

Sign In

+
+ +
+
+

+
+ + + +
+
+
+ +
+ + + + + + \ No newline at end of file diff --git a/SignIn.js b/SignIn.js new file mode 100644 index 00000000..babedaf5 --- /dev/null +++ b/SignIn.js @@ -0,0 +1,51 @@ +document.addEventListener("DOMContentLoaded",function(event){ + const changeID = getchangeID(); + changeID.focus(); + changeID.select(); +}); + +function getchangePword(){ +//getter for password +return document.getElementById("password"); +} + +function getchangeID(){ +//getter for ID +return document.getElementById("number"); +} + +function ValidationEvent(){ +// This part deals with invalid inputs for the Employee ID + const changeID = getchangeID(); + if(isNaN(Number(changeID.value))){ + displayError("Enter a real ID"); + changeID.focus(); + changeID.select(); + return false; +} + else if (Number(changeID.value) <= 0){ + displayError("Enter a real ID"); + changeID.focus(); + changeID.select(); + return false; +} +//This part deals with invalid inputs for the Password +const changePword = getchangePword(); + if (changePword.value == null){ + displayError("Enter real password"); + changePword.focus(); + changePword.select(); + return false; + } + else if (changePword.value.trim() === ""){ + displayError("Enter a real password); + changePword.focus(); + changePword.select(); + return false; + + } + // Since this is a validation function, it should return true if valid input + + return true; + +} \ No newline at end of file diff --git a/SignInRestController.java b/SignInRestController.java new file mode 100644 index 00000000..79616a40 --- /dev/null +++ b/SignInRestController.java @@ -0,0 +1,158 @@ +package edu.uark.registerapp.controllers; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.Optional; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; +import edu.uark.registerapp.commands.activeUsers.ActiveUserDeleteCommand; +import edu.uark.registerapp.controllers.enums.ViewNames; +import edu.uark.registerapp.models.api.ApiResponse; +import edu.uark.registerapp.commands.products.ProductCreateCommand; +import edu.uark.registerapp.commands.products.ProductDeleteCommand; +import edu.uark.registerapp.commands.products.ProductUpdateCommand; +import edu.uark.registerapp.models.api.Product; +import edu.uark.registerapp.commands.activeUsers.ValidateActiveUserCommand; +import edu.uark.registerapp.commands.exceptions.UnauthorizedException; +import edu.uark.registerapp.controllers.enums.ViewModelNames; +import edu.uark.registerapp.controllers.enums.QueryParameterMessages; +import edu.uark.registerapp.controllers.enums.QueryParameterNames; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.models.enums.EmployeeClassification; + +@RestController +@RequestMapping(value = "/api") +public class SignInRestController extends BaseController { +protected ModelAndView setErrorMessageFromQueryString( +ModelAndView modelAndView,final Map queryParameters) { + if (!queryParameters.containsKey(QueryParameterNames.ERROR_CODE.getValue())) { + return modelAndView; + } + + try { + modelAndView = this.setErrorMessageFromQueryString(modelAndView, + Integer.parseInt( + queryParameters.get( + QueryParameterNames.ERROR_CODE.getValue()))); + } catch (final NumberFormatException e) { } + + return modelAndView; + } + protected ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final Optional errorCode + ) { + + if (!errorCode.isPresent()) { + return modelAndView; + } + return this.setErrorMessageFromQueryString(modelAndView, errorCode.get()); + } + + protected Optional getCurrentUser( + final HttpServletRequest request + ) { + + try { + return Optional.of( + this.validateActiveUserCommand + .setSessionKey(request.getSession().getId()) + .execute()); + } catch (final UnauthorizedException e) { + return Optional.ofNullable(null); + } + } + + protected ModelAndView buildInvalidSessionResponse() { + return new ModelAndView( + REDIRECT_PREPEND.concat( + ViewNames.SIGN_IN.getRoute().concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.SESSION_NOT_ACTIVE.getKeyAsString())))); + } + + protected boolean isElevatedUser(final ActiveUserEntity activeUserEntity) { + return EmployeeClassification.isElevatedUser( + activeUserEntity.getClassification()); + } + + protected ModelAndView buildNoPermissionsResponse() { + return this.buildNoPermissionsResponse(ViewNames.MAIN_MENU.getRoute()); + } + + protected ModelAndView buildNoPermissionsResponse(final String redirectRoute) { + return new ModelAndView( + REDIRECT_PREPEND.concat( + redirectRoute.concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.NO_PERMISSIONS_TO_VIEW.getKeyAsString())))); + } + + protected static final String REDIRECT_PREPEND = "Redirect:"; + + + private ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final int errorCode + ) { + + final String errorMessage = QueryParameterMessages.mapMessage(errorCode); + + if (!StringUtils.isBlank(errorMessage)) { + modelAndView.addObject( + ViewModelNames.ERROR_MESSAGE.getValue(), + errorMessage); + } + + return modelAndView; + } + + +@DeleteMapping(value = "/signOut") +public @ResponseBody ApiResponse remove( +final HttpServletRequest req) { + +this.activeUserDeleteCommand +.setSessionKey(req.getSession().getId()) +.execute(); + +return (new ApiResponse()) +.setRedirectUrl(ViewNames.SIGN_IN.getRoute()); +} + +@DeleteMapping(value = "/{productId}") + public @ResponseBody ApiResponse deleteProduct( + @PathVariable final UUID productId + ) { + + this.productdeletecommand + .setProductId(productId) + .execute(); + + return new ApiResponse(); + } + +@Autowired +private ValidateActiveUserCommand validateActiveUserCommand; + +@Autowired +private ProductCreateCommand productcreatecommand; + +@Autowired +private ProductDeleteCommand productdeletecommand; + +@Autowired +private ProductUpdateCommand productupdatecommand; + +@Autowired +private ActiveUserDeleteCommand activeuserdeletecommand; +} + diff --git a/SignInRouteController.java b/SignInRouteController.java new file mode 100644 index 00000000..88942e97 --- /dev/null +++ b/SignInRouteController.java @@ -0,0 +1,186 @@ +package edu.uark.registerapp.controllers; + +import java.util.Map; + +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.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; +import edu.uark.registerapp.commands.products.ProductQuery; +import edu.uark.registerapp.commands.employees.ActiveEmployeeExistsQuery; +import edu.uark.registerapp.commands.employees.EmployeeSignInCommand; +import edu.uark.registerapp.commands.exceptions.NotFoundException; +import edu.uark.registerapp.controllers.enums.QueryParameterNames; +import edu.uark.registerapp.controllers.enums.ViewModelNames; +import edu.uark.registerapp.controllers.enums.ViewNames; +import edu.uark.registerapp.models.api.EmployeeSignIn; +import java.util.UUID; +import org.apache.commons.lang3.StringUtils; +import edu.uark.registerapp.models.api.Product; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.servlet.ModelAndView; +import edu.uark.registerapp.commands.activeUsers.ValidateActiveUserCommand; +import edu.uark.registerapp.commands.exceptions.UnauthorizedException; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.models.enums.EmployeeClassification; + + +@Controller +@RequestMapping(value = "/") +public class SignInRouteController extends BaseController { + + protected ModelAndView setErrorMessageFromQueryString( + ModelAndView modelAndView, + final Map queryParameters + ) { + + if (!queryParameters.containsKey(QueryParameterNames.ERROR_CODE.getValue())) { + return modelAndView; + } + + try { + modelAndView = + this.setErrorMessageFromQueryString( + modelAndView, + Integer.parseInt( + queryParameters.get( + QueryParameterNames.ERROR_CODE.getValue()))); + } catch (final NumberFormatException e) { } + + return modelAndView; + } + protected ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final Optional errorCode + ) { + + if (!errorCode.isPresent()) { + return modelAndView; + } + + return this.setErrorMessageFromQueryString(modelAndView, errorCode.get()); + } + + protected Optional getCurrentUser( + final HttpServletRequest request + ) { + + try { + return Optional.of( + this.validateActiveUserCommand + .setSessionKey(request.getSession().getId()) + .execute()); + } catch (final UnauthorizedException e) { + return Optional.ofNullable(null); + } + } + + protected ModelAndView buildInvalidSessionResponse() { + return new ModelAndView( + REDIRECT_PREPEND.concat( + ViewNames.SIGN_IN.getRoute().concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.SESSION_NOT_ACTIVE.getKeyAsString())))); + } + + protected boolean isElevatedUser(final ActiveUserEntity activeUserEntity) { + return EmployeeClassification.isElevatedUser( + activeUserEntity.getClassification()); + } + + protected ModelAndView buildNoPermissionsResponse() { + return this.buildNoPermissionsResponse(ViewNames.MAIN_MENU.getRoute()); + } + + protected ModelAndView buildNoPermissionsResponse(final String redirectRoute) { + return new ModelAndView( + REDIRECT_PREPEND.concat( + redirectRoute.concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.NO_PERMISSIONS_TO_VIEW.getKeyAsString())))); + } + + protected static final String REDIRECT_PREPEND = "Redirect:"; + + + private ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final int errorCode + ) { + + final String errorMessage = QueryParameterMessages.mapMessage(errorCode); + + if (!StringUtils.isBlank(errorMessage)) { + modelAndView.addObject( + ViewModelNames.ERROR_MESSAGE.getValue(), + errorMessage); + } + + return modelAndView; + } + +///-------------------------------------------------------------------------------------------------------------------------- +@GetMapping //This is the sign method/ it deals with the first part of task 4. +public ModelAndView sign(@RequestParam final Map queryParameters) { +try {this.activeemployeeexistsquery.execute();} +catch (NotFoundException e) { +return new ModelAndView(REDIRECT_PREPEND.concat(ViewNames.EMPLOYEE_DETAIL.getRoute())); +} + +ModelAndView modelAndView = this.setErrorMessageFromQueryString(new ModelAndView(ViewNames.SIGN_IN.getViewName()), +queryParameters); + +if (queryParameters.containsKey(QueryParameterNames.EMPLOYEE_ID.getValue())) { +modelAndView.addObject( +ViewModelNames.EMPLOYEE_ID.getValue(), +queryParameters.get(QueryParameterNames.EMPLOYEE_ID.getValue())); +} + +return modelAndView; +} + + + +//------------------------------------------------------------------------------------------------------------------------------------- +// This is the perform method, it is what actually performs the sign in + +@PostMapping(consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) +public ModelAndView perform(EmployeeSignIn employee,HttpServletRequest req) { + +try {this.employeesignincommand.setSessionId(req.getSession().getId()).setEmployeeSignIn(employee) +.execute(); +} + +catch (Exception e) { +ModelAndView modelAndView = new ModelAndView(ViewNames.SIGN_IN.getViewName()); + +modelAndView.addObject(ViewModelNames.ERROR_MESSAGE.getValue(),e.getMessage()); +modelAndView.addObject(ViewModelNames.EMPLOYEE_ID.getValue(),employee.getEmployeeId()); + +return modelAndView; +} + +return new ModelAndView(REDIRECT_PREPEND.concat(ViewNames.MAIN_MENU.getRoute())); +} + + +// These are the various properties that are inside of the code +@Autowired +private ValidateActiveUserCommand validateActiveUserCommand; + +@Autowired +private ProductQuery productquery; + +@Autowired +private EmployeeSignInCommand employeesignincommand; + +@Autowired +private ActiveEmployeeExistsQuery activeemployeeexistsquery; +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 330a0022..486269f6 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,6 @@ javax.servlet jstl - org.apache.tomcat.embed tomcat-embed-jasper diff --git a/power_settings_new-24px.svg b/power_settings_new-24px.svg new file mode 100644 index 00000000..76c2685c --- /dev/null +++ b/power_settings_new-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/scripts/Main_Menu_View.html b/scripts/Main_Menu_View.html new file mode 100644 index 00000000..95c54f6d --- /dev/null +++ b/scripts/Main_Menu_View.html @@ -0,0 +1,54 @@ + + + + Main Menu + + + + + +
+
+ + + +

+ +

+ +
+ +
+
+ +

+ +

+ +
+
+ + + +
+
+ + Sign Out + +
+
+ + + + + + + + diff --git a/scripts/mainMenu.js b/scripts/mainMenu.js new file mode 100644 index 00000000..b16d3a96 --- /dev/null +++ b/scripts/mainMenu.js @@ -0,0 +1,17 @@ + +window.addEventListener('DOMContentLoaded', (event) => { + document.getElementById("start_TransactionButton").addEventListener("click", function() { + displayError("Functionality has not yet been implemented"); + }); + document.getElementById("view_ProductsButton").addEventListener("click", function() { + location.assign("/productListing")}); + document.getElementById("Create_EmployeeButton").addEventListener("click", function() { + location.assign("/employeeDetail")}); + document.getElementById("Sales_ReportButton").addEventListener("click", function() { + displayError("Functionality has not yet been implemented")}); + document.getElementById("Cashier_ReportButton").addEventListener("click", function() { + displayError("Functionality has not yet been implemented")}); + document.getElementById("signOutImg").addEventListener("click", function() { + location.assign("/")}); + }); + diff --git a/scripts/master.js b/scripts/master.js new file mode 100644 index 00000000..bbdf9464 --- /dev/null +++ b/scripts/master.js @@ -0,0 +1,181 @@ +document.addEventListener("DOMContentLoaded", ()=>{ + if (document.getElementById("signOutImg") !=null){ + document.getElementById("signOutImg").addEventListener("click", function() { + ajaxDelete("/signOut" , (callbackResponse) => { + if ((callbackResponse.data ==null)){ + window.location.replace("/"); + } + else { + window.location.replace(callbackResponse.data.redirectUrl); + } + }); + + +// AJAX +function ajaxGet(resourceRelativeUri, callback) { + return ajax(resourceRelativeUri, "GET", null, callback); +} + +function ajaxPut(resourceRelativeUri, data, callback) { + return ajax(resourceRelativeUri, "PUT", data, callback); +} + +function ajaxPatch(resourceRelativeUri, data, callback) { + return ajax(resourceRelativeUri, "PATCH", data, callback); +} + +function ajaxPost(resourceRelativeUri, data, callback) { + return ajax(resourceRelativeUri, "POST", data, callback); +} + +function ajaxDelete(resourceRelativeUri, callback) { + return ajax(resourceRelativeUri, "DELETE", null, callback); +} + +function ajax(resourceRelativeUri, verb, data, callback) { + const httpRequest = new XMLHttpRequest(); + + if (httpRequest == null) { + return httpRequest; + } + + httpRequest.onreadystatechange = () => { + if (httpRequest.readyState === XMLHttpRequest.DONE) { + if ((httpRequest.status >= 200) && (httpRequest.status < 300)) { + handleSuccessResponse(httpRequest, callback); + } else { + handleFailureResponse(httpRequest, callback); + } + } + }; + + httpRequest.open(verb, resourceRelativeUri, true); + if (data != null) { + httpRequest.setRequestHeader('Content-Type', 'application/json'); + httpRequest.send(JSON.stringify(data)); + } else { + httpRequest.send(); + } + + return httpRequest; +} + +function handleSuccessResponse(httpRequest, callback) { + clearError(); + + if (callback != null) { + let callbackResponse = { status: httpRequest.status }; + + if ((httpRequest.responseText != null) + && (httpRequest.responseText !== "")) { + + let responseObject = JSON.parse(httpRequest.responseText); + if (responseObject != null) { + callbackResponse.data = responseObject; + } + } + + callback(callbackResponse); + } +} + +function handleFailureResponse(httpRequest, callback) { + if ((httpRequest == null) || (httpRequest.status === 0)) { + return; + } + + let errorMessage = "Unable to complete the requested action."; + + if ((httpRequest.responseText != null) + && (httpRequest.responseText !== "")) { + + let responseObject = JSON.parse(httpRequest.responseText); + + if ((responseObject != null) + && (responseObject.redirectUrl != null) + && (responseObject.redirectUrl !== "")) { + + if (callback) { + callback({ status: httpRequest.status }); + } + window.location.assign(responseObject.redirectUrl); + + return; + } + + if ((responseObject != null) + && (responseObject.errorMessage != null) + && (responseObject.errorMessage !== "")) { + + errorMessage = responseObject.errorMessage; + } + } + + displayError(errorMessage); + + if (callback != null) { + callback({ status: httpRequest.status }); + } +} +// End AJAX + +function isSuccessResponse(callbackResponse) { + return ((callbackResponse != null) + && (callbackResponse.status != null) + && (callbackResponse.status >= 200) + && (callbackResponse.status < 300)); +} + +function isErrorResponse(callbackResponse) { + return !isSuccessResponse(callbackResponse); +} + +// Display error message +function clearError() { + const errorMessageContainerElement = getErrorMessageContainerElement(); + + if ((errorMessageContainerElement == null) + || errorMessageContainerElement.classList.contains("hidden")) { + + return; + } + + errorMessageContainerElement.classList.add("hidden"); + + const errorMessageDisplayElement = getErrorMessageDisplayElement(); + + if (errorMessageDisplayElement != null) { + errorMessageDisplayElement.innerHTML = ""; + } +} + +function displayError(errorMessage) { + if ((errorMessage == null) || (errorMessage === "")) { + return; + } + + const errorMessageDisplayElement = getErrorMessageDisplayElement(); + const errorMessageContainerElement = getErrorMessageContainerElement(); + + if ((errorMessageContainerElement == null) + || (errorMessageDisplayElement == null)) { + + return; + } + + errorMessageDisplayElement.innerHTML = errorMessage; + if (errorMessageContainerElement.classList.contains("hidden")) { + errorMessageContainerElement.classList.remove("hidden"); + } +} +// End display error message + +//Getters and setters +function getErrorMessageContainerElement() { + return document.getElementById("error"); +} + +function getErrorMessageDisplayElement() { + return document.getElementById("errorMessage"); +} +// End getters and setters \ No newline at end of file diff --git a/src/main/java/edu/uark/registerapp/commands/activeUsers/ActiveUserDeleteCommand.java b/src/main/java/edu/uark/registerapp/commands/activeUsers/ActiveUserDeleteCommand.java new file mode 100644 index 00000000..73e771fc --- /dev/null +++ b/src/main/java/edu/uark/registerapp/commands/activeUsers/ActiveUserDeleteCommand.java @@ -0,0 +1,39 @@ +package edu.uark.registerapp.commands.activeUsers; + +import edu.uark.registerapp.models.entities.EmployeeEntity; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.commands.exceptions.NotFoundException; +import edu.uark.registerapp.models.repositories.ActiveUserRepository; + +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; + + + +public class ActiveUserDeleteCommand{ + + private String sessionKey; + public String getSessionKey() { + return this.sessionKey; + } + + public boolean validateEmployee(EmployeeEntity emp) { + if (emp.getFirstName().isEmpty()) { + throw new NotFoundException("First name"); + } + if (emp.getLastName().isEmpty()) { + throw new NotFoundException("Last name"); + } + } + + @Transactional + public void execute() { + ActiveUserEntity user = this.activeUserRepository.findBySessionKey(this.sessionKey); + if (user.isPresent()) { + this.activeUserRepository.delete(user.get()); + } + } + + @Autowired + private ActiveUserRepository activeUserRepository; +} diff --git a/src/main/java/edu/uark/registerapp/commands/activeUsers/ValidateActiveUserCommand.java b/src/main/java/edu/uark/registerapp/commands/activeUsers/ValidateActiveUserCommand.java new file mode 100644 index 00000000..d04784cb --- /dev/null +++ b/src/main/java/edu/uark/registerapp/commands/activeUsers/ValidateActiveUserCommand.java @@ -0,0 +1,41 @@ +package edu.uark.registerapp.commands.activeUsers; + +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import edu.uark.registerapp.commands.ResultCommandInterface; +import edu.uark.registerapp.commands.exceptions.UnauthorizedException; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.models.repositories.ActiveUserRepository; + +@Service +public class ValidateActiveUserCommand implements ResultCommandInterface { + @Override + public ActiveUserEntity execute() { + final Optional activeUserEntity = + this.activeUserRepository.findBySessionKey(this.sessionKey); + + if (!activeUserEntity.isPresent()) { + throw new UnauthorizedException(); + } + + return activeUserEntity.get(); + } + + // Properties + private String sessionKey; + + public String getSessionKey() { + return this.sessionKey; + } + + public ValidateActiveUserCommand setSessionKey(final String sessionKey) { + this.sessionKey = sessionKey; + return this; + } + + @Autowired + private ActiveUserRepository activeUserRepository; +} diff --git a/src/main/java/edu/uark/registerapp/commands/employees/ActiveEmployeeExistsQuery.java b/src/main/java/edu/uark/registerapp/commands/employees/ActiveEmployeeExistsQuery.java new file mode 100644 index 00000000..f606a64d --- /dev/null +++ b/src/main/java/edu/uark/registerapp/commands/employees/ActiveEmployeeExistsQuery.java @@ -0,0 +1,10 @@ +import edu.uark.registerapp.commands.exceptions.NotFoundException; +import edu.uark.registerapp.models.repositories.EmployeeRepository; + +public class ActiveEmployeeExistsQuery { + public void execute() { + if (!this.employeeRepository.existsByIsActive(true)) { + throw NotFoundException("Employee"); + } + } +} \ No newline at end of file diff --git a/src/main/java/edu/uark/registerapp/commands/employees/EmployeeSignInCommand.java b/src/main/java/edu/uark/registerapp/commands/employees/EmployeeSignInCommand.java new file mode 100644 index 00000000..da43c649 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/commands/employees/EmployeeSignInCommand.java @@ -0,0 +1,75 @@ +package edu.uark.registerapp.commands.employees; + +import org.springframework.beans.factory.annotation.Autowired; + +import edu.uark.registerapp.models.api.EmployeeSignIn; +import edu.uark.registerapp.commands.exceptions.NotFoundException; +import edu.uark.registerapp.commands.exceptions.UnprocessableEntityException; +import edu.uark.registerapp.models.repositories.EmployeeRepository; +import edu.uark.registerapp.models.entities.EmployeeEntity; + +import javax.transaction.Transactional; + + +public class EmployeeSignInCommand { + //properties + private EmployeeSignIn signInObject; + private String sessionKey; + + public EmployeeSignIn getEmployeeSignIn() { + return this.signInObject; + } + public String getSessionKey() { + return this.sessionKey; + } + public EmployeeSignInCommand setEmployeeSignIn(EmployeeSignIn emp) { + this.signInObject = emp; + return this; + } + public EmployeeSignInCommand setSessionKey(String key) { + this.sessionKey = key; + return this; + } + + + //functions + + private void validateEmployee() { + if (this.signInObject.getId().isEmpty()) { + throw new NotFoundException("Employee ID"); + } + if (this.signInObject.getId() != (int)this.signInObject.getId()) { + throw new NotFoundException("Employee ID"); + } + if (this.signInObject.getPword().isEmpty()) { + throw new UnprocessableEntityException("password"); + } + } + + @Transactional + private EmployeeEntity signIn() { + int empId = Integer.parseInt(this.employeeSignIn.getEmployeeId()); + EmployeeEntity empEntity = this.employeeRepository.findByEmployeeId(empId); + if (!this.employeeRepository.existsByEmployeeId(empId)) { //couldn't figure out array check for passwords + throw new NotFoundException("Employee ID"); + } + + ActiveUserEntity activeUserEntity = this.activeUserRepository.findByEmployeeId(empId); + //if activeUserEntity exists + if (activeUserRepository.existsById(empEntity.getId())) { + this.activeUserRepository.save(activeUserEntity.get().setSessionKey(this.sessionKey)); + } else { + this.activeUserRepository.save((new ActiveUserEntity()).setSessionKey(this.sessionKey).setEmployeeId(empEntity.get().getId()).setClassification(empEntity.get().getClassification()).setName(empEntity.get().getFirstName().concat(" ").concat(empEntity.get().getLastName()))); + } + return empEntity.get(); + } + + + @Autowired + private EmployeeRepository employeeRepository; + + @Autowired + private ActiveUserRepository activeUserRepository; + + +} \ No newline at end of file diff --git a/src/main/java/edu/uark/registerapp/commands/employees/helpers/EmployeeHelper.java b/src/main/java/edu/uark/registerapp/commands/employees/helpers/EmployeeHelper.java new file mode 100644 index 00000000..5b9ddc71 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/commands/employees/helpers/EmployeeHelper.java @@ -0,0 +1,23 @@ +package edu.uark.registerapp.commands.employees.helpers; + +import org.apache.commons.lang3.StringUtils; + +public class EmployeeHelper { + public static String padEmployeeId(final int employeeId) { + final String employeeIdAsString = Integer.toString(employeeId); + + return ((employeeIdAsString.length() < EMPLOYEE_ID_MAXIMUM_LENGTH) + ? StringUtils.leftPad( + employeeIdAsString, + EMPLOYEE_ID_MAXIMUM_LENGTH, + "0") + : employeeIdAsString); + } + + public static byte[] hashPassword(final String password) { + // TODO: Hash the password using a MessageDigest. An example can be found at http://tutorials.jenkov.com/java-cryptography/messagedigest.html + return new byte[0]; + } + + private static final int EMPLOYEE_ID_MAXIMUM_LENGTH = 5; +} diff --git a/src/main/java/edu/uark/registerapp/controllers/BaseRestController.java b/src/main/java/edu/uark/registerapp/controllers/BaseRestController.java new file mode 100644 index 00000000..0f39f55f --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/BaseRestController.java @@ -0,0 +1,89 @@ +package edu.uark.registerapp.controllers; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +import edu.uark.registerapp.commands.activeUsers.ValidateActiveUserCommand; +import edu.uark.registerapp.commands.exceptions.ConflictException; +import edu.uark.registerapp.commands.exceptions.NotFoundException; +import edu.uark.registerapp.commands.exceptions.UnauthorizedException; +import edu.uark.registerapp.commands.exceptions.UnprocessableEntityException; +import edu.uark.registerapp.controllers.enums.QueryParameterMessages; +import edu.uark.registerapp.controllers.enums.QueryParameterNames; +import edu.uark.registerapp.controllers.enums.ViewNames; +import edu.uark.registerapp.models.api.ApiResponse; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.models.enums.EmployeeClassification; + +public class BaseRestController extends BaseController { + protected ApiResponse redirectSessionNotActive( + final HttpServletResponse response + ) { + + response.setStatus(HttpStatus.FOUND.value()); + return (new ApiResponse()) + .setRedirectUrl( + ViewNames.SIGN_IN.getRoute().concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.SESSION_NOT_ACTIVE.getKeyAsString()))); + } + + protected ApiResponse redirectUserNotElevated( + final HttpServletRequest request, + final HttpServletResponse response + ) { + + return this.redirectUserNotElevated(request, response, ViewNames.MAIN_MENU.getRoute()); + } + + protected ApiResponse redirectUserNotElevated( + final HttpServletRequest request, + final HttpServletResponse response, + final String redirectRoute + ) { + + try { + final ActiveUserEntity activeUserEntity = + this.validateActiveUserCommand + .setSessionKey(request.getSession().getId()) + .execute(); + + if (activeUserEntity == null) { + return this.redirectSessionNotActive(response); + } else if (!EmployeeClassification.isElevatedUser(activeUserEntity.getClassification())) { + response.setStatus(HttpStatus.FOUND.value()); + + return (new ApiResponse()) + .setRedirectUrl( + redirectRoute.concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.NO_PERMISSIONS_FOR_ACTION.getKeyAsString()))); + } + } catch (final UnauthorizedException e) { + return this.redirectSessionNotActive(response); + } + + return new ApiResponse(); + } + + @ExceptionHandler({ + ConflictException.class, + NotFoundException.class, + UnauthorizedException.class, + UnprocessableEntityException.class + }) + public @ResponseBody ApiResponse handleError(final Exception e) { + return (new ApiResponse()).setErrorMessage(e.getMessage()); + } + + // Properties + @Autowired + private ValidateActiveUserCommand validateActiveUserCommand; +} diff --git a/src/main/java/edu/uark/registerapp/controllers/BaseRouteController.java b/src/main/java/edu/uark/registerapp/controllers/BaseRouteController.java new file mode 100644 index 00000000..58774f84 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/BaseRouteController.java @@ -0,0 +1,117 @@ +package edu.uark.registerapp.controllers; + +import java.util.Map; +import java.util.Optional; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.servlet.ModelAndView; + +import edu.uark.registerapp.commands.activeUsers.ValidateActiveUserCommand; +import edu.uark.registerapp.commands.exceptions.UnauthorizedException; +import edu.uark.registerapp.controllers.enums.ViewModelNames; +import edu.uark.registerapp.controllers.enums.QueryParameterMessages; +import edu.uark.registerapp.controllers.enums.QueryParameterNames; +import edu.uark.registerapp.controllers.enums.ViewNames; +import edu.uark.registerapp.models.entities.ActiveUserEntity; +import edu.uark.registerapp.models.enums.EmployeeClassification; + +public abstract class BaseRouteController extends BaseController { + protected ModelAndView setErrorMessageFromQueryString( + ModelAndView modelAndView, + final Map queryParameters + ) { + + if (!queryParameters.containsKey(QueryParameterNames.ERROR_CODE.getValue())) { + return modelAndView; + } + + try { + modelAndView = + this.setErrorMessageFromQueryString( + modelAndView, + Integer.parseInt( + queryParameters.get( + QueryParameterNames.ERROR_CODE.getValue()))); + } catch (final NumberFormatException e) { } + + return modelAndView; + } + protected ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final Optional errorCode + ) { + + if (!errorCode.isPresent()) { + return modelAndView; + } + + return this.setErrorMessageFromQueryString(modelAndView, errorCode.get()); + } + + protected Optional getCurrentUser( + final HttpServletRequest request + ) { + + try { + return Optional.of( + this.validateActiveUserCommand + .setSessionKey(request.getSession().getId()) + .execute()); + } catch (final UnauthorizedException e) { + return Optional.ofNullable(null); + } + } + + protected ModelAndView buildInvalidSessionResponse() { + return new ModelAndView( + REDIRECT_PREPEND.concat( + ViewNames.SIGN_IN.getRoute().concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.SESSION_NOT_ACTIVE.getKeyAsString())))); + } + + protected boolean isElevatedUser(final ActiveUserEntity activeUserEntity) { + return EmployeeClassification.isElevatedUser( + activeUserEntity.getClassification()); + } + + protected ModelAndView buildNoPermissionsResponse() { + return this.buildNoPermissionsResponse(ViewNames.MAIN_MENU.getRoute()); + } + + protected ModelAndView buildNoPermissionsResponse(final String redirectRoute) { + return new ModelAndView( + REDIRECT_PREPEND.concat( + redirectRoute.concat( + this.buildInitialQueryParameter( + QueryParameterNames.ERROR_CODE.getValue(), + QueryParameterMessages.NO_PERMISSIONS_TO_VIEW.getKeyAsString())))); + } + + protected static final String REDIRECT_PREPEND = "redirect:"; + + // Helper methods + private ModelAndView setErrorMessageFromQueryString( + final ModelAndView modelAndView, + final int errorCode + ) { + + final String errorMessage = QueryParameterMessages.mapMessage(errorCode); + + if (!StringUtils.isBlank(errorMessage)) { + modelAndView.addObject( + ViewModelNames.ERROR_MESSAGE.getValue(), + errorMessage); + } + + return modelAndView; + } + + // Properties + @Autowired + private ValidateActiveUserCommand validateActiveUserCommand; +} diff --git a/src/main/java/edu/uark/registerapp/controllers/MainMenuRouteController.java b/src/main/java/edu/uark/registerapp/controllers/MainMenuRouteController.java new file mode 100644 index 00000000..9a3cda2d --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/MainMenuRouteController.java @@ -0,0 +1,45 @@ +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; + +@Controller +@RequestMapping(value = "/mainMenu") +public class MainMenuRouteController extends BaseRouteController { + @RequestMapping(method = RequestMethod.GET) + public ModelAndView start( + @RequestParam final Map queryParameters, + final HttpServletRequest request + ) { + + final Optional activeUserEntity = + this.getCurrentUser(request); + if (!activeUserEntity.isPresent()) { + return this.buildInvalidSessionResponse(); + } + + ModelAndView modelAndView = + this.setErrorMessageFromQueryString( + new ModelAndView(ViewNames.MAIN_MENU.getViewName()), + queryParameters); + + // TODO: Examine the ActiveUser classification if you want this information + modelAndView.addObject( + ViewModelNames.IS_ELEVATED_USER.getValue(), + true); + + return modelAndView; + } +} diff --git a/src/main/java/edu/uark/registerapp/controllers/SignInRestController.java b/src/main/java/edu/uark/registerapp/controllers/SignInRestController.java new file mode 100644 index 00000000..68133574 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/SignInRestController.java @@ -0,0 +1,26 @@ +package edu.uark.registerapp.controllers; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import edu.uark.registerapp.controllers.enums.ViewNames; +import edu.uark.registerapp.models.api.ApiResponse; + +@RestController +@RequestMapping(value = "/api") +public class SignInRestController extends BaseRestController { + @RequestMapping(value="/signOut", method = RequestMethod.DELETE) + public @ResponseBody ApiResponse removeActiveUser( + final HttpServletRequest request + ) { + + // TODO: Sign out the user associated with request.getSession().getId() + + return (new ApiResponse()) + .setRedirectUrl(ViewNames.SIGN_IN.getRoute()); + } +} diff --git a/src/main/java/edu/uark/registerapp/controllers/SignInRouteController.java b/src/main/java/edu/uark/registerapp/controllers/SignInRouteController.java new file mode 100644 index 00000000..306f98fb --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/SignInRouteController.java @@ -0,0 +1,32 @@ +package edu.uark.registerapp.controllers; + +import javax.servlet.http.HttpServletRequest; + +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; + +@Controller +@RequestMapping(value = "/") +public class SignInRouteController extends BaseRouteController { + // TODO: Route for initial page load + + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) + public ModelAndView performSignIn( + // TODO: Define an object that will represent the sign in request and add it as a parameter here + HttpServletRequest request + ) { + + // TODO: Use the credentials provided in the request body + // and the "id" property of the (HttpServletRequest)request.getSession() variable + // to sign in the user + + return new ModelAndView( + REDIRECT_PREPEND.concat( + ViewNames.MAIN_MENU.getRoute())); + } +} diff --git a/src/main/java/edu/uark/registerapp/controllers/enums/QueryParameterMessages.java b/src/main/java/edu/uark/registerapp/controllers/enums/QueryParameterMessages.java new file mode 100644 index 00000000..3f1bed87 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/controllers/enums/QueryParameterMessages.java @@ -0,0 +1,45 @@ +package edu.uark.registerapp.controllers.enums; + +import java.util.HashMap; +import java.util.Map; + +public enum QueryParameterMessages { + NOT_DEFINED(-1, ""), + SESSION_NOT_ACTIVE(1001, "The current user's session is no longer active."), + NO_PERMISSIONS_TO_VIEW(1101, "You do not have permission to view this resource."), + NO_PERMISSIONS_FOR_ACTION(1102, "You do not have permission to perform this action."); + + public int getKey() { + return this.key; + } + public String getKeyAsString() { + return Integer.toString(this.key); + } + public String getMessage() { + return this.message; + } + + public static String mapMessage(final int key) { + if (valueMap == null) { + valueMap = new HashMap(); + + for (final QueryParameterMessages status : QueryParameterMessages.values()) { + valueMap.put(status.getKey(), status.getMessage()); + } + } + + return (valueMap.containsKey(key) + ? valueMap.get(key) + : QueryParameterMessages.NOT_DEFINED.getMessage()); + } + + private int key; + private String message; + + private static Map valueMap = null; + + private QueryParameterMessages(final int key, final String message) { + this.key = key; + this.message = message; + } +} diff --git a/src/main/java/edu/uark/registerapp/controllers/enums/ViewModelNames.java b/src/main/java/edu/uark/registerapp/controllers/enums/ViewModelNames.java index 7c39b102..6ee26935 100644 --- a/src/main/java/edu/uark/registerapp/controllers/enums/ViewModelNames.java +++ b/src/main/java/edu/uark/registerapp/controllers/enums/ViewModelNames.java @@ -3,6 +3,7 @@ public enum ViewModelNames { NOT_DEFINED(""), ERROR_MESSAGE("errorMessage"), + IS_ELEVATED_USER("isElevatedUser"), PRODUCTS("products"), // Product listing PRODUCT("product"); // Product detail diff --git a/src/main/java/edu/uark/registerapp/controllers/enums/ViewNames.java b/src/main/java/edu/uark/registerapp/controllers/enums/ViewNames.java index cd1a1246..3e3e2ca2 100644 --- a/src/main/java/edu/uark/registerapp/controllers/enums/ViewNames.java +++ b/src/main/java/edu/uark/registerapp/controllers/enums/ViewNames.java @@ -1,8 +1,11 @@ package edu.uark.registerapp.controllers.enums; public enum ViewNames { + SIGN_IN("signIn", "/"), + MAIN_MENU("mainMenu"), PRODUCT_DETAIL("productDetail"), - PRODUCT_LISTING("productListing", "/"); + EMPLOYEE_DETAIL("employeeDetail"), + PRODUCT_LISTING("productListing"); public String getRoute() { return this.route; diff --git a/src/main/java/edu/uark/registerapp/models/api/Employee.java b/src/main/java/edu/uark/registerapp/models/api/Employee.java new file mode 100644 index 00000000..6e313bfc --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/api/Employee.java @@ -0,0 +1,145 @@ +package edu.uark.registerapp.models.api; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.UUID; + +import org.apache.commons.lang3.StringUtils; + +import edu.uark.registerapp.commands.employees.helpers.EmployeeHelper; +import edu.uark.registerapp.models.entities.EmployeeEntity; + +public class Employee extends ApiResponse { + private UUID id; + public UUID getId() { + return this.id; + } + public Employee setId(final UUID id) { + this.id = id; + return this; + } + + private String employeeId; + public String getEmployeeId() { + return this.employeeId; + } + public Employee setEmployeeId(final int employeeId) { + this.employeeId = EmployeeHelper.padEmployeeId(employeeId); + return this; + } + public Employee setEmployeeId(final String employeeId) { + this.employeeId = employeeId; + return this; + } + + private String firstName; + public String getFirstName() { + return this.firstName; + } + public Employee setFirstName(final String firstName) { + this.firstName = firstName; + return this; + } + + private String lastName; + public String getLastName() { + return this.lastName; + } + public Employee setLastName(final String lastName) { + this.lastName = lastName; + return this; + } + + private String password; + public String getPassword() { + return this.password; + } + public Employee setPassword(final String password) { + this.password = password; + return this; + } + + private boolean isActive; + public boolean getIsActive() { + return this.isActive; + } + public Employee setIsActive(final boolean isActive) { + this.isActive = isActive; + return this; + } + + private int classification; + public int getClassification() { + return this.classification; + } + public Employee setClassification(final int classification) { + this.classification = classification; + return this; + } + + private UUID managerId; + public UUID getManagerId() { + return this.managerId; + } + public Employee setManagerId(final UUID managerId) { + this.managerId = managerId; + return this; + } + + private String createdOn; + public String getCreatedOn() { + return this.createdOn; + } + public Employee setCreatedOn(final String createdOn) { + this.createdOn = createdOn; + return this; + } + public Employee setCreatedOn(final LocalDateTime createdOn) { + this.createdOn = + createdOn.format(DateTimeFormatter.ofPattern("MM/dd/yyyy")); + + return this; + } + + private boolean isInitialEmployee; + public boolean getIsInitialEmployee() { + return this.isInitialEmployee; + } + public Employee setIsInitialEmployee(final boolean isInitialEmployee) { + this.isInitialEmployee = isInitialEmployee; + return this; + } + + public Employee() { + super(); + + this.isActive = true; + this.id = new UUID(0, 0); + this.classification = -1; + this.isInitialEmployee = false; + this.managerId = new UUID(0, 0); + this.lastName = StringUtils.EMPTY; + this.password = StringUtils.EMPTY; + this.firstName = StringUtils.EMPTY; + this.employeeId = StringUtils.EMPTY; + + this.setCreatedOn(LocalDateTime.now()); + } + + public Employee(final EmployeeEntity employeeEntity) { + super(false); + + this.isInitialEmployee = false; + this.id = employeeEntity.getId(); + this.password = StringUtils.EMPTY; + this.isActive = employeeEntity.getIsActive(); + this.lastName = employeeEntity.getLastName(); + this.firstName = employeeEntity.getFirstName(); + this.managerId = employeeEntity.getManagerId(); + this.classification = employeeEntity.getClassification(); + this.employeeId = + EmployeeHelper.padEmployeeId(employeeEntity.getEmployeeId()); + + this.setCreatedOn(employeeEntity.getCreatedOn()); + } +} diff --git a/src/main/java/edu/uark/registerapp/models/entities/ActiveUserEntity.java b/src/main/java/edu/uark/registerapp/models/entities/ActiveUserEntity.java new file mode 100644 index 00000000..6eba3528 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/entities/ActiveUserEntity.java @@ -0,0 +1,91 @@ +package edu.uark.registerapp.models.entities; + +import java.time.LocalDateTime; +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.commons.lang3.StringUtils; +import org.hibernate.annotations.Generated; +import org.hibernate.annotations.GenerationTime; + +@Entity +@Table(name="activeuser") +public class ActiveUserEntity { + @Id + @Column(name="id", updatable = false) + @GeneratedValue(strategy=GenerationType.AUTO) + private final UUID id; + + public UUID getId() { + return this.id; + } + + @Column(name = "employeeid") + private UUID employeeId; + + public UUID getEmployeeId() { + return this.employeeId; + } + + public ActiveUserEntity setEmployeeId(final UUID employeeId) { + this.employeeId = employeeId; + return this; + } + + @Column(name = "name") + private String name; + + public String getName() { + return this.name; + } + + public ActiveUserEntity setName(final String name) { + this.name = name; + return this; + } + + @Column(name = "classification") + private int classification; + + public int getClassification() { + return this.classification; + } + + public ActiveUserEntity setClassification(final int classification) { + this.classification = classification; + return this; + } + + @Column(name = "sessionkey") + private String sessionKey; + + public String getSessionKey() { + return this.sessionKey; + } + + public ActiveUserEntity setSessionKey(final String sessionKey) { + this.sessionKey = sessionKey; + return this; + } + + @Column(name="createdon", insertable=false, updatable = false) + @Generated(GenerationTime.INSERT) + private LocalDateTime createdOn; + public LocalDateTime getCreatedOn() { + return this.createdOn; + } + + public ActiveUserEntity() { + this.id = new UUID(0, 0); + this.classification = -1; + this.name = StringUtils.EMPTY; + this.employeeId = new UUID(0, 0); + this.sessionKey = StringUtils.EMPTY; + } +} diff --git a/src/main/java/edu/uark/registerapp/models/entities/EmployeeEntity.java b/src/main/java/edu/uark/registerapp/models/entities/EmployeeEntity.java new file mode 100644 index 00000000..324e5b31 --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/entities/EmployeeEntity.java @@ -0,0 +1,164 @@ +package edu.uark.registerapp.models.entities; + +import java.time.LocalDateTime; +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.commons.lang3.StringUtils; +import org.hibernate.annotations.Generated; +import org.hibernate.annotations.GenerationTime; + +import edu.uark.registerapp.commands.employees.helpers.EmployeeHelper; +import edu.uark.registerapp.models.api.Employee; + +@Entity +@Table(name="employee") +public class EmployeeEntity { + @Id + @Column(name="id", updatable = false) + @GeneratedValue(strategy=GenerationType.AUTO) + private final UUID id; + + public UUID getId() { + return this.id; + } + + @Column(name = "employeeid", insertable = false, updatable = false) + @Generated(GenerationTime.INSERT) + private int employeeId; + + public int getEmployeeId() { + return this.employeeId; + } + + @Column(name = "firstname") + private String firstName; + + public String getFirstName() { + return this.firstName; + } + + public EmployeeEntity setFirstName(final String firstName) { + this.firstName = firstName; + return this; + } + + @Column(name = "lastname") + private String lastName; + + public String getLastName() { + return this.lastName; + } + + public EmployeeEntity setLastName(final String lastName) { + this.lastName = lastName; + return this; + } + + @Column(name = "password") + private byte[] password; + + public byte[] getPassword() { + return this.password; + } + + public EmployeeEntity setPassword(final byte[] password) { + this.password = password; + return this; + } + + @Column(name = "active") + private boolean isActive; + + public boolean getIsActive() { + return this.isActive; + } + + public EmployeeEntity setIsActive(final boolean isActive) { + this.isActive = isActive; + return this; + } + + @Column(name = "classification") + private int classification; + + public int getClassification() { + return this.classification; + } + + public EmployeeEntity setClassification(final int classification) { + this.classification = classification; + return this; + } + + @Column(name = "managerid") + private UUID managerId; + + public UUID getManagerId() { + return this.managerId; + } + + public EmployeeEntity setManagerId(final UUID managerId) { + this.managerId = managerId; + return this; + } + + @Column(name = "createdon", insertable = false, updatable = false) + @Generated(GenerationTime.INSERT) + private LocalDateTime createdOn; + + public LocalDateTime getCreatedOn() { + return this.createdOn; + } + + public Employee synchronize(final Employee apiEmployee) { + this.setIsActive(apiEmployee.getIsActive()); + this.setLastName(apiEmployee.getLastName()); + this.setFirstName(apiEmployee.getFirstName()); + this.setClassification(apiEmployee.getClassification()); + if (apiEmployee.getManagerId() != null) { + this.setManagerId(apiEmployee.getManagerId()); + } + if (!StringUtils.isBlank(apiEmployee.getPassword())) { + this.setPassword( + EmployeeHelper.hashPassword( + apiEmployee.getPassword())); + } + + apiEmployee.setId(this.getId()); + apiEmployee.setCreatedOn(this.getCreatedOn()); + apiEmployee.setEmployeeId(this.getEmployeeId()); + + return apiEmployee; + } + + public EmployeeEntity() { + this.employeeId = -1; + this.isActive = false; + this.id = new UUID(0, 0); + this.classification = -1; + this.password = new byte[0]; + this.managerId = new UUID(0, 0); + this.lastName = StringUtils.EMPTY; + this.firstName = StringUtils.EMPTY; + } + + public EmployeeEntity(final Employee apiEmployee) { + this.id = new UUID(0, 0); + this.isActive = apiEmployee.getIsActive(); + this.lastName = apiEmployee.getLastName(); + this.firstName = apiEmployee.getFirstName(); + this.classification = apiEmployee.getClassification(); + this.password = EmployeeHelper.hashPassword(apiEmployee.getPassword()); + this.managerId = ( + (apiEmployee.getManagerId() != null) + ? apiEmployee.getManagerId() + : new UUID(0, 0)); + } +} diff --git a/src/main/java/edu/uark/registerapp/models/enums/EmployeeClassification.java b/src/main/java/edu/uark/registerapp/models/enums/EmployeeClassification.java new file mode 100644 index 00000000..751c80ef --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/enums/EmployeeClassification.java @@ -0,0 +1,58 @@ +package edu.uark.registerapp.models.enums; + +import java.util.HashMap; +import java.util.Map; + +public enum EmployeeClassification { + NOT_DEFINED(-1, "Not Selected"), + CASHIER(101, "Cashier"), + SHIFT_MANAGER(501, "Shift Manager"), + GENERAL_MANAGER(701, "General Manager"); + + public int getClassification() { + return this.classification; + } + + public String getDisplayLabel() { + return this.displayLabel; + } + + public static EmployeeClassification map(final int key) { + if (valueMap == null) { + valueMap = new HashMap(); + + for (final EmployeeClassification employeeClassification : EmployeeClassification.values()) { + valueMap.put( + employeeClassification.getClassification(), + employeeClassification); + } + } + + return ((valueMap.containsKey(key) + ? valueMap.get(key) + : EmployeeClassification.NOT_DEFINED)); + } + + public static boolean isElevatedUser(final int classification) { + final EmployeeClassification employeeClassification = + EmployeeClassification.map(classification); + + return ( + (employeeClassification == EmployeeClassification.GENERAL_MANAGER) + || (employeeClassification == EmployeeClassification.SHIFT_MANAGER)); + } + + private int classification; + private String displayLabel; + + private static Map valueMap = null; + + private EmployeeClassification( + final int classification, + final String displayLabel + ) { + + this.displayLabel = displayLabel; + this.classification = classification; + } +} diff --git a/src/main/java/edu/uark/registerapp/models/repositories/ActiveUserRepository.java b/src/main/java/edu/uark/registerapp/models/repositories/ActiveUserRepository.java new file mode 100644 index 00000000..53746cee --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/repositories/ActiveUserRepository.java @@ -0,0 +1,13 @@ +package edu.uark.registerapp.models.repositories; + +import java.util.Optional; +import java.util.UUID; + +import org.springframework.data.repository.CrudRepository; + +import edu.uark.registerapp.models.entities.ActiveUserEntity; + +public interface ActiveUserRepository extends CrudRepository { + Optional findByEmployeeId(UUID employeeId); + Optional findBySessionKey(String sessionKey); +} diff --git a/src/main/java/edu/uark/registerapp/models/repositories/EmployeeRepository.java b/src/main/java/edu/uark/registerapp/models/repositories/EmployeeRepository.java new file mode 100644 index 00000000..8ba4b81f --- /dev/null +++ b/src/main/java/edu/uark/registerapp/models/repositories/EmployeeRepository.java @@ -0,0 +1,15 @@ +package edu.uark.registerapp.models.repositories; + +import java.util.Optional; +import java.util.UUID; + +import org.springframework.data.repository.CrudRepository; + +import edu.uark.registerapp.models.entities.EmployeeEntity; + +public interface EmployeeRepository extends CrudRepository { + boolean existsByIsActive(boolean isActive); + boolean existsByEmployeeId(int employeeId); + Optional findById(UUID id); + Optional findByEmployeeId(int employeeId); +} diff --git a/src/main/resources/static/images/input.png b/src/main/resources/static/images/input.png new file mode 100644 index 00000000..43cdfdd9 Binary files /dev/null and b/src/main/resources/static/images/input.png differ diff --git a/src/main/resources/static/scripts/master.js b/src/main/resources/static/scripts/master.js index 88b039d0..c61d3563 100644 --- a/src/main/resources/static/scripts/master.js +++ b/src/main/resources/static/scripts/master.js @@ -1,3 +1,10 @@ +document.addEventListener("DOMContentLoaded", () => { + const signOutActionElement = getSignOutActionElement(); + if (signOutActionElement != null) { + signOutActionElement.addEventListener("click", signOutActionClickHandler); + } +}); + // AJAX function ajaxGet(resourceRelativeUri, callback) { return ajax(resourceRelativeUri, "GET", null, callback); @@ -158,6 +165,10 @@ function displayError(errorMessage) { // End display error message //Getters and setters +function getSignOutActionElement() { + return document.getElementById("signOutImage"); +} + function getErrorMessageContainerElement() { return document.getElementById("error"); } @@ -166,3 +177,18 @@ function getErrorMessageDisplayElement() { return document.getElementById("errorMessage"); } // End getters and setters + +//Sign out +function signOutActionClickHandler() { + ajaxDelete("/api/signOut", (callbackResponse) => { + if ((callbackResponse.data != null) + && (callbackResponse.data.redirectUrl != null) + && (callbackResponse.data.redirectUrl !== "")) { + + window.location.replace(callbackResponse.data.redirectUrl); + } else { + window.location.replace("/"); + } + }); +} +//End sign out \ No newline at end of file diff --git a/src/main/resources/static/scripts/signIn.js b/src/main/resources/static/scripts/signIn.js new file mode 100644 index 00000000..a1524a6a --- /dev/null +++ b/src/main/resources/static/scripts/signIn.js @@ -0,0 +1,8 @@ +document.addEventListener("DOMContentLoaded", function(event) { + // TODO: Anything you want to do when the page is loaded? +}); + +function validateForm() { + // TODO: Validate the user input + return true; +} diff --git a/src/main/resources/static/styles/employeeDetail.css b/src/main/resources/static/styles/employeeDetail.css new file mode 100644 index 00000000..d5121457 --- /dev/null +++ b/src/main/resources/static/styles/employeeDetail.css @@ -0,0 +1,3 @@ +.employeeDetailWrapper { + display: inline-block; +} diff --git a/src/main/resources/static/styles/master.css b/src/main/resources/static/styles/master.css index 2b060e6d..f35bb48a 100644 --- a/src/main/resources/static/styles/master.css +++ b/src/main/resources/static/styles/master.css @@ -30,6 +30,24 @@ td.hidden { display: none } +div.footer { + left: 0; + right: 0; + bottom: 0; + position: absolute; +} + +img.footer { + z-index: 1; + height: 50px; + text-decoration: none; + display: inline-block; + cursor: pointer; + position: fixed; + right: 20; + bottom: 20; +} + div.inputContent, form.inputContent { display: inline-block; diff --git a/src/main/resources/templates/employeeDetail.html b/src/main/resources/templates/employeeDetail.html new file mode 100644 index 00000000..21ac508a --- /dev/null +++ b/src/main/resources/templates/employeeDetail.html @@ -0,0 +1,100 @@ + + + + Employee Detail + + + + + + + + + + + +
+

Employee Detail

+
+ +
+
+

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Employee ID: + +
First Name: + +
Last Name: + +
Password: + +
Confirm password: + +
Employee type: + +
+
+ +
+
+ + +
+ +
+ +
+
+ +
+ Sign Out +
+ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/input.png b/src/main/resources/templates/input.png new file mode 100644 index 00000000..43cdfdd9 Binary files /dev/null and b/src/main/resources/templates/input.png differ diff --git a/src/main/resources/templates/mainMenu.html b/src/main/resources/templates/mainMenu.html new file mode 100644 index 00000000..36bdbf1b --- /dev/null +++ b/src/main/resources/templates/mainMenu.html @@ -0,0 +1,49 @@ + + + + Register - Main Menu + + + + + + + + + + +
+

Main Menu

+
+ +
+
+

+
+ + +
+ + + +
+ Sign Out +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/power_settings_new-24px.svg b/src/main/resources/templates/power_settings_new-24px.svg new file mode 100644 index 00000000..76c2685c --- /dev/null +++ b/src/main/resources/templates/power_settings_new-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/signIn.html b/src/main/resources/templates/signIn.html new file mode 100644 index 00000000..96f63609 --- /dev/null +++ b/src/main/resources/templates/signIn.html @@ -0,0 +1,31 @@ + + + + Register - Sign In + + + + + + + + + + +
+

Sign In

+
+ +
+
+

+
+ +
+ +
+
+ + + + \ No newline at end of file