diff --git a/pom.xml b/pom.xml index e6a3689..d2546d4 100644 --- a/pom.xml +++ b/pom.xml @@ -69,9 +69,18 @@ test - jakarta.validation - jakarta.validation-api - 3.0.2 + org.springframework.security + spring-security-test + test + + + + + + + + org.springframework.boot + spring-boot-starter-validation org.passay diff --git a/src/main/java/com/heftyb/dms/config/WebSecurityConfig.java b/src/main/java/com/heftyb/dms/config/WebSecurityConfig.java index 48647fd..fa5b296 100644 --- a/src/main/java/com/heftyb/dms/config/WebSecurityConfig.java +++ b/src/main/java/com/heftyb/dms/config/WebSecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.FormLoginConfigurer; @@ -13,6 +14,7 @@ @Configuration @EnableWebSecurity +@EnableMethodSecurity public class WebSecurityConfig { // private final UserDetailsService userDetailsService; diff --git a/src/main/java/com/heftyb/dms/controllers/AdminController.java b/src/main/java/com/heftyb/dms/controllers/AdminController.java index 2a8be3f..a949757 100644 --- a/src/main/java/com/heftyb/dms/controllers/AdminController.java +++ b/src/main/java/com/heftyb/dms/controllers/AdminController.java @@ -1,10 +1,15 @@ package com.heftyb.dms.controllers; import com.heftyb.dms.crm.Employee; +import com.heftyb.dms.crm.JobTitle; import com.heftyb.dms.crm.services.EmployeeService; +import com.heftyb.dms.users.RoleDepartment; import com.heftyb.dms.users.User; +import com.heftyb.dms.users.services.RoleService; import com.heftyb.dms.users.services.UserService; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; @@ -17,15 +22,19 @@ @Controller @RequestMapping("admin") +@PreAuthorize("hasRole('ADMIN')") public class AdminController { private final UserService userService; private final EmployeeService employeeService; + private final RoleService roleService; public AdminController(final UserService userService, - final EmployeeService employeeService) { + final EmployeeService employeeService, + final RoleService roleService) { this.userService = userService; this.employeeService = employeeService; + this.roleService = roleService; } @GetMapping({"/", ""}) @@ -36,6 +45,9 @@ public String adminHome(HttpServletRequest request, Model model, Principal princ List users = userService.findAll(); model.addAttribute("users", users); model.addAttribute("username", principal.getName()); + model.addAttribute("roles", roleService.findAll()); + model.addAttribute("deptRoles", RoleDepartment.values()); + model.addAttribute("jobTitles", JobTitle.values()); return "hr_administrator"; } @@ -47,7 +59,7 @@ public String create_employee_form(Principal principal, ModelMap map) { } @PostMapping({"/create_employee", "/create_employee/"}) - public String create_employee(Employee employee) { + public String create_employee(@Valid Employee employee) { employeeService.save(employee); diff --git a/src/main/java/com/heftyb/dms/crm/Employee.java b/src/main/java/com/heftyb/dms/crm/Employee.java index 5564d64..9f109e7 100644 --- a/src/main/java/com/heftyb/dms/crm/Employee.java +++ b/src/main/java/com/heftyb/dms/crm/Employee.java @@ -5,7 +5,10 @@ import com.heftyb.dms.users.User; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; @Entity @@ -19,9 +22,11 @@ public class Employee extends Auditable { private boolean isActive = true; @NotNull + @Size(min = 1) private String firstName; @NotNull + @Size(min = 1) private String lastName; @NotNull @@ -46,7 +51,7 @@ public class Employee extends Auditable { private JobTitle jobTitle; - private Date hiredDate; + private LocalDateTime hiredDate; // private Employee manager; @@ -83,7 +88,7 @@ public Employee() { jobInProgress = false; } - public Employee(String firstName, String lastName, String preferredName, Address address, ContactInformation contactInformation, String taxId, JobTitle jobTitle, Date hiredDate) { + public Employee(String firstName, String lastName, String preferredName, Address address, ContactInformation contactInformation, String taxId, JobTitle jobTitle, LocalDateTime hiredDate) { this.firstName = firstName; this.lastName = lastName; this.preferredName = preferredName; @@ -174,11 +179,11 @@ public void setJobTitle(JobTitle jobTitle) { this.jobTitle = jobTitle; } - public Date getHiredDate() { + public LocalDateTime getHiredDate() { return hiredDate; } - public void setHiredDate(Date hiredDate) { + public void setHiredDate(LocalDateTime hiredDate) { this.hiredDate = hiredDate; } diff --git a/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java b/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java index bc6b2f0..09b801b 100644 --- a/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java +++ b/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java @@ -37,7 +37,13 @@ public Employee findById(long id) { @Override public Employee save(Employee employee) { - Employee e = new Employee(); + Employee e; + if (employee.getId() != 0) { + e = findById(employee.getId()); + } else { + e = new Employee(); + } + e.setActive(employee.isActive()); e.setFirstName(employee.getFirstName()); e.setLastName(employee.getLastName()); e.setPreferredName(employee.getPreferredName()); diff --git a/src/main/java/com/heftyb/dms/repairorder/RepairOrder.java b/src/main/java/com/heftyb/dms/repairorder/RepairOrder.java index 91754be..1823f97 100644 --- a/src/main/java/com/heftyb/dms/repairorder/RepairOrder.java +++ b/src/main/java/com/heftyb/dms/repairorder/RepairOrder.java @@ -11,7 +11,6 @@ import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; import java.time.Instant; import java.util.ArrayList; @@ -68,8 +67,7 @@ public class RepairOrder extends Auditable { private boolean isActive; @NotNull - @Size(max = 1) - @Pattern(regexp = "/([0-9])+/g") + @Pattern(regexp = "[0-9]") private String priority = "0"; diff --git a/src/main/java/com/heftyb/dms/users/Role.java b/src/main/java/com/heftyb/dms/users/Role.java index 4737e0f..439453c 100644 --- a/src/main/java/com/heftyb/dms/users/Role.java +++ b/src/main/java/com/heftyb/dms/users/Role.java @@ -15,6 +15,8 @@ public class Role { private String role; + @Enumerated(EnumType.STRING) + private RoleDepartment department; @OneToMany(mappedBy = "role", cascade = CascadeType.ALL, @@ -58,11 +60,20 @@ public void setUsers(Set users) { this.users = users; } + public RoleDepartment getDepartment() { + return department; + } + + public void setDepartment(RoleDepartment department) { + this.department = department; + } + @Override public String toString() { return "Role{" + "id=" + id + ", role='" + role + '\'' + + ", department=" + department + '}'; } } diff --git a/src/main/java/com/heftyb/dms/users/RoleDepartment.java b/src/main/java/com/heftyb/dms/users/RoleDepartment.java new file mode 100644 index 0000000..8c4704f --- /dev/null +++ b/src/main/java/com/heftyb/dms/users/RoleDepartment.java @@ -0,0 +1,5 @@ +package com.heftyb.dms.users; + +public enum RoleDepartment { + SHARED, OFFICE, SALES, SERVICE, PARTS, TECH_DEV +} diff --git a/src/main/java/com/heftyb/dms/users/controllers/RoleController.java b/src/main/java/com/heftyb/dms/users/controllers/RoleController.java new file mode 100644 index 0000000..5b7b99c --- /dev/null +++ b/src/main/java/com/heftyb/dms/users/controllers/RoleController.java @@ -0,0 +1,39 @@ +package com.heftyb.dms.users.controllers; + +import com.heftyb.dms.users.Role; +import com.heftyb.dms.users.RoleDepartment; +import com.heftyb.dms.users.services.RoleService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +@RequestMapping("/admin/roles") +@PreAuthorize("hasRole('ADMIN')") +public class RoleController { + + private final RoleService roleService; + + public RoleController(final RoleService roleService) { + this.roleService = roleService; + } + + @PostMapping({"/create", "/create/"}) + public String createNewRole(@RequestParam String role, @RequestParam RoleDepartment department) { + Role r = new Role(); + r.setRole(role); + r.setDepartment(department); + roleService.save(r); + + return "redirect:/admin"; + } + + @PostMapping({"/delete", "/delete/"}) + public String deleteRole(@RequestParam long roleId) { + roleService.delete(roleId); + + return "redirect:/admin"; + } +} diff --git a/src/main/java/com/heftyb/dms/users/services/RoleService.java b/src/main/java/com/heftyb/dms/users/services/RoleService.java index 9e25ebc..fc38086 100644 --- a/src/main/java/com/heftyb/dms/users/services/RoleService.java +++ b/src/main/java/com/heftyb/dms/users/services/RoleService.java @@ -13,5 +13,5 @@ public interface RoleService { Role save(Role role); - void Delete(long id); + void delete(long id); } diff --git a/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java b/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java index 7a9bc39..593cf34 100644 --- a/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java +++ b/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java @@ -46,12 +46,12 @@ public Role save(Role role) { } Role r = new Role(); r.setRole(role.getRole()); - + r.setDepartment(role.getDepartment()); return roleRepo.save(r); } @Override - public void Delete(long id) { + public void delete(long id) { findById(id); roleRepo.deleteById(id); } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index bda4d28..366b0a8 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -116,13 +116,17 @@ body { display: flex; flex-direction: column; justify-content: space-evenly; - color: white; - background-color: black; + /*color: white;*/ + /*background-color: black;*/ + height: 100vh; + position: sticky; + top: 0; } .side-navbar-open { - width: 20%; - opacity: 30%; + /*width: 20%;*/ + /*opacity: 30%;*/ + /*position: sticky;*/ } .side-navbar-closed { @@ -365,7 +369,7 @@ td a { justify-content: center; } -.edit-button-wrapper { +.edit-button-wrapper, .flex-between { display: flex; justify-content: space-between; } @@ -810,4 +814,13 @@ td a { /*overflow: hidden;*/ /*text-decoration: underline;*/ /*text-underline: black;*/ +} + +.flex-col { + display: flex; + flex-direction: column; +} + +.just-cent { + justify-content: center; } \ No newline at end of file diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 7c39377..e80358f 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -22,7 +22,7 @@ - +