Fix folder structure of frontend

pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -34,6 +35,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

src/main/java/com/attendenceSystem/constant/Routes.java

@@ -0,0 +1,13 @@
+package com.attendenceSystem.constant;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Routes {
+    public static final class Auth {
+        public static final String ROOT = "/auth";
+        public static final String LOGIN = "/login";
+        public static final String REGISTER = "/register";
+    }
+}

src/main/java/com/attendenceSystem/exception/GlobalExceptionHandler.java

@@ -0,0 +1,41 @@
+// package com.attendenceSystem.exception;
+
+// import org.springframework.http.HttpStatus;
+// import org.springframework.security.access.AccessDeniedException;
+// import org.springframework.web.bind.annotation.ControllerAdvice;
+// import org.springframework.web.bind.annotation.ExceptionHandler;
+// import org.springframework.web.bind.annotation.ResponseStatus;
+
+// import com.attendenceSystem.exception.custom.BadRequestException;
+// import com.attendenceSystem.exception.custom.ResourceNotFoundException;
+
+// @ControllerAdvice
+// public class GlobalExceptionHandler {
+//     @ExceptionHandler(ResourceNotFoundException.class)
+//     @ResponseStatus(HttpStatus.NOT_FOUND)
+//     public String notFound() {
+//         return "error/404";
+//     }
+
+//     @ExceptionHandler(AccessDeniedException.class)
+//     @ResponseStatus(HttpStatus.FORBIDDEN)
+//     public String forbidden() {
+//         return "error/403";
+//     }
+
+//     @ExceptionHandler(BadRequestException.class)
+//     @ResponseStatus(HttpStatus.BAD_REQUEST)
+//     public String badRequest() {
+//         return "error/400";
+//     }
+
+//     @ExceptionHandler(Exception.class)
+//     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+//     public String internalServerError(Exception ex) {
+
+//         ex.printStackTrace();
+
+//         return "error/500";
+//     }
+
+// }

src/main/java/com/attendenceSystem/exception/custom/BadRequestException.java

@@ -0,0 +1,7 @@
+package com.attendenceSystem.exception.custom;
+
+public class BadRequestException extends RuntimeException{
+    public BadRequestException(String message){
+        super(message);
+    }
+}

src/main/java/com/attendenceSystem/exception/custom/ResourceNotFoundException.java

@@ -0,0 +1,7 @@
+package com.attendenceSystem.exception.custom;
+
+public class ResourceNotFoundException extends RuntimeException{
+    public ResourceNotFoundException(String message){
+        super(message);
+    }
+}

src/main/java/com/attendenceSystem/module/log/dto/request/AuditLogRequest.java

@@ -0,0 +1,14 @@
+package com.attendenceSystem.module.log.dto.request;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+import com.attendenceSystem.module.user.entity.User;
+
+public record AuditLogRequest(
+        User user,
+        LogEntityType logEntityType,
+        Long entityId,
+        LogAction action,
+        String description) {
+
+}

src/main/java/com/attendenceSystem/module/log/dto/response/AuditLogResponse.java

@@ -0,0 +1,18 @@
+package com.attendenceSystem.module.log.dto.response;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+
+import lombok.Builder;
+
+@Builder
+public record AuditLogResponse(
+                Long id,
+                Long userId,
+                String username,
+                LogEntityType entityType,
+                Long entityId,
+                LogAction action,
+                String description,
+                String createdAt) {
+}

src/main/java/com/attendenceSystem/module/log/entity/AuditLog.java

@@ -0,0 +1,58 @@
+package com.attendenceSystem.module.log.entity;
+
+import java.time.Instant;
+
+import org.hibernate.annotations.CreationTimestamp;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+import com.attendenceSystem.module.user.entity.User;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "audit_logs")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AuditLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "entity_id")
+    private Long entityId;
+
+    @Column(name = "entity_type", nullable = false)
+    private LogEntityType entityType;
+
+    @Column(name = "action", nullable = false)
+    private LogAction action;
+
+    @Column(name = "description", columnDefinition = "LONGTEXT")
+    private String description;
+
+    @CreationTimestamp
+    @Column(name = "created_at", updatable = false)
+    private Instant createdAt;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", updatable = false)
+    private User user;
+}

src/main/java/com/attendenceSystem/module/log/entity/converter/LogActionConverter.java

@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.log.entity.converter;
+
+import com.attendenceSystem.module.log.entity.enums.LogAction;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class LogActionConverter implements AttributeConverter<LogAction, Long> {
+
+    @Override
+    public Long convertToDatabaseColumn(LogAction attribute) {
+        return attribute == null ? null : attribute.getCode();
+    }
+
+    @Override
+    public LogAction convertToEntityAttribute(Long dbData) {
+        return dbData == null ? null : LogAction.fromValue(dbData);
+    }
+
+}

src/main/java/com/attendenceSystem/module/log/entity/converter/LogEntityTypeConverter.java

@@ -0,0 +1,21 @@
+package com.attendenceSystem.module.log.entity.converter;
+
+import com.attendenceSystem.module.log.entity.enums.LogEntityType;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class LogEntityTypeConverter implements AttributeConverter<LogEntityType, Long>{
+
+    @Override
+    public Long convertToDatabaseColumn(LogEntityType attribute) {
+        return attribute == null ? null : attribute.getCode();
+    }
+
+    @Override
+    public LogEntityType convertToEntityAttribute(Long dbData) {
+        return dbData == null ? null : LogEntityType.fromValue(dbData);
+    }
+
+}

src/main/java/com/attendenceSystem/module/log/entity/enums/LogAction.java

@@ -0,0 +1,31 @@
+package com.attendenceSystem.module.log.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum LogAction {
+    CREATE(1),
+    UPDATE(2),
+    DELETE(3),
+    RESTORE(4),
+    APPROVE(5),
+    LOCK(6),
+    UNLOCK(7),
+    CHANGE_PASSWORD(8),
+    LOGIN(9),
+    LOGOUT(10),
+    PROCESS(11);
+
+    private final long code;
+
+    public static LogAction fromValue(long code) {
+        for (LogAction action : LogAction.values()) {
+            if (action.code == code) {
+                return action;
+            }
+        }
+        throw new IllegalArgumentException("Không tìm thấy loại hành động: " + code);
+    }
+}

src/main/java/com/attendenceSystem/module/log/entity/enums/LogEntityType.java

@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.log.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum LogEntityType {
+    USER(1);
+
+    private final long code;
+        public static LogEntityType fromValue(long code) {
+        for (LogEntityType action : LogEntityType.values()) {
+            if (action.code == code) {
+                return action;
+            }
+        }
+        throw new IllegalArgumentException("Không tìm thấy loại Entity: " + code);
+    }
+}

src/main/java/com/attendenceSystem/module/log/mapper/request/AuditLogRequestMapping.java

@@ -0,0 +1,5 @@
+package com.attendenceSystem.module.log.mapper.request;
+
+public class AuditLogRequestMapping {
+
+}

src/main/java/com/attendenceSystem/module/log/mapper/response/AuditLogResponseMapper.java

@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.log.mapper.response;
+
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+import com.attendenceSystem.module.log.entity.AuditLog;
+import com.attendenceSystem.util.TimeUtil;
+
+public class AuditLogResponseMapper {
+        public static AuditLogResponse fromEntity(AuditLog auditLog) {
+                return AuditLogResponse.builder()
+                                .id(auditLog.getId())
+                                .userId(auditLog.getUser().getId())
+                                .username(auditLog.getUser().getUsername())
+                                .entityType(auditLog.getEntityType())
+                                .entityId(auditLog.getEntityId())
+                                .action(auditLog.getAction())
+                                .description(auditLog.getDescription())
+                                .createdAt(TimeUtil.formatInstant(auditLog.getCreatedAt(), null))
+                                .build();
+        }
+}

src/main/java/com/attendenceSystem/module/log/repository/AuditLogRepository.java

@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.log.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.attendenceSystem.module.log.entity.AuditLog;
+
+@Repository
+public interface AuditLogRepository extends JpaRepository<AuditLog, Long> {
+    Page<AuditLog> findAllByOrderByCreatedAtDesc(Pageable pageable);
+}

src/main/java/com/attendenceSystem/module/log/service/AuditLogService.java

@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.log.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.attendenceSystem.module.log.dto.request.AuditLogRequest;
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+
+public interface AuditLogService {
+    void log(AuditLogRequest request);
+
+    Page<AuditLogResponse> getLogs(Pageable pageable);
+}

src/main/java/com/attendenceSystem/module/log/service/impl/AuditLogServiceImpl.java

@@ -0,0 +1,40 @@
+package com.attendenceSystem.module.log.service.impl;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.log.dto.request.AuditLogRequest;
+import com.attendenceSystem.module.log.dto.response.AuditLogResponse;
+import com.attendenceSystem.module.log.entity.AuditLog;
+import com.attendenceSystem.module.log.mapper.response.AuditLogResponseMapper;
+import com.attendenceSystem.module.log.repository.AuditLogRepository;
+import com.attendenceSystem.module.log.service.AuditLogService;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class AuditLogServiceImpl implements AuditLogService {
+    private final AuditLogRepository auditLogRepository;
+
+    @Transactional
+    @Override
+    public void log(AuditLogRequest request) {
+        AuditLog auditLog = AuditLog.builder()
+                .user(request.user())
+                .entityType(request.logEntityType())
+                .entityId(request.entityId())
+                .action(request.action())
+                .description(request.description())
+                .build();
+        auditLogRepository.save(auditLog);
+    }
+
+    @Override
+    public Page<AuditLogResponse> getLogs(Pageable pageable) {
+        return auditLogRepository
+                .findAll(pageable)
+                .map(AuditLogResponseMapper::fromEntity);
+    }
+
+}

src/main/java/com/attendenceSystem/module/user/controller/AuthController.java

@@ -0,0 +1,25 @@
+package com.attendenceSystem.module.user.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.attendenceSystem.constant.Routes;
+import com.attendenceSystem.module.user.service.AuthService;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+
+
+
+@Controller
+@RequestMapping(Routes.Auth.ROOT)
+@RequiredArgsConstructor
+public class AuthController {
+    private final AuthService authService;
+
+    @GetMapping(Routes.Auth.REGISTER)
+    public String toRegisterPage() {
+        return "auth/register";
+    }
+    
+}

src/main/java/com/attendenceSystem/module/user/dto/request/LoginRequest.java

@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record LoginRequest(
+        @NotBlank(message = "Tên đăng nhập hoặc email không được để trống")
+        String login,
+
+        @NotBlank(message = "Mật khẩu không được để trống")
+        @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
+        String password) {
+}

src/main/java/com/attendenceSystem/module/user/dto/request/RegisterRequest.java

@@ -0,0 +1,37 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import com.attendenceSystem.annotation.PasswordMatch;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
+@PasswordMatch
+public record RegisterRequest(
+
+        @NotBlank(message = "Tên đăng nhập không được để trống")
+        @Size(min = 3, max = 30, message = "Tên đăng nhập phải có độ dài từ 3 đến 30 ký tự")
+        @Pattern(regexp = "^[a-zA-Z0-9]+$", message = "Tên đăng nhập không được chứa ký tự đặc biệt")
+        String username,
+
+        @NotBlank(message = "Email không được để trống")
+        @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
+        @Email(message = "Email không đúng định dạng")
+        String email,
+
+        @NotBlank(message = "Mật khẩu không được để trống")
+        @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
+        String password,
+
+        @NotBlank(message = "Mật khẩu xác nhận không được để trống")
+        @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+        String rePassword,
+
+        @NotBlank(message = "Họ tên không được để trống")
+        @Size(max = 255, message = "Họ tên không được vượt quá 255 ký tự")
+        String fullName
+
+) {
+}

src/main/java/com/attendenceSystem/module/user/dto/response/UserResponse.java

@@ -0,0 +1,14 @@
+package com.attendenceSystem.module.user.dto.response;
+
+import lombok.Builder;
+
+@Builder
+public record UserResponse(
+        Long id,
+        String username,
+        String email,
+        String fullName,
+        Boolean isActive,
+        String role) {
+
+}

src/main/java/com/attendenceSystem/{user → module/user}/entity/User.java

@@ -1,7 +1,12 @@
-package com.attendenceSystem.user.entity;
+package com.attendenceSystem.module.user.entity;
 
 import java.time.Instant;
 
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import com.attendenceSystem.module.user.entity.enums.Role;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -26,22 +31,27 @@ public class User {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
-    @Column(name = "email")
+    @Column(name = "username", unique = true, nullable = false, length = 30)
+    private String username;
+    @Column(name = "email", unique = true, nullable = false, length = 255)
     private String email;
-    @Column(name = "password")
+    @Column(name = "password", nullable = false, length = 255)
     private String password;
-    @Column(name = "full_name")
+    @Column(name = "role", nullable = false)
+    private Role role;
+    @Column(name = "is_active", nullable = false)
+    @Builder.Default
+    private boolean isActive = true;
+    @Column(name = "full_name", nullable = false, length = 255)
     private String fullName;
-    @Column(name = "avatar")
-    private String avatar;
-    @Column(name = "role")
-    private String role;
-    @Column(name = "status")
-    private String status;
-    @Column(name = "created_at")
+    @CreationTimestamp
+    @Column(name = "created_at", nullable = false, updatable = false)
     private Instant createdAt;
-    @Column(name = "updated_at")
+    @UpdateTimestamp
+    @Column(name = "updated_at", nullable = false)
     private Instant updatedAt;
-    @Column(name = "deleted")
-    private Boolean deleted;
+
+    @Column(name = "must_change_password", nullable = false)
+    @Builder.Default
+    private boolean mustChangePassword = false;
 }

src/main/java/com/attendenceSystem/module/user/entity/converter/RoleConverter.java

@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.user.entity.converter;
+
+import com.attendenceSystem.module.user.entity.enums.Role;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class RoleConverter implements AttributeConverter<Role, Integer> {
+
+    @Override
+    public Integer convertToDatabaseColumn(Role role) {
+        return role == null ? null : role.getValue();
+    }
+
+    @Override
+    public Role convertToEntityAttribute(Integer dbData) {
+        return dbData == null ? null : Role.fromValue(dbData);
+    }
+}

src/main/java/com/attendenceSystem/{user → module/user}/entity/enums/Role.java

@@ -1,4 +1,4 @@
-package com.attendenceSystem.user.entity.enums;
+package com.attendenceSystem.module.user.entity.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java

@@ -0,0 +1,19 @@
+package com.attendenceSystem.module.user.mapper.request;
+
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.entity.User;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class RegisterRequestMapper {
+    public static User toEntity(RegisterRequest request, String hashPassword) {
+        return User.builder()
+                .username(request.username())
+                .email(request.email())
+                .password(hashPassword)
+                .fullName(request.fullName())
+                .build();
+    }
+}

src/main/java/com/attendenceSystem/{user → module/user}/mapper/response/UserResponseMapper.java

@@ -1,12 +1,11 @@
-package com.attendenceSystem.user.mapper.response;
+package com.attendenceSystem.module.user.mapper.response;
 
 import java.time.ZoneId;
 
 import org.springframework.stereotype.Component;
 
-import com.attendenceSystem.user.dto.response.UserResponse;
-import com.attendenceSystem.user.entity.User;
-import com.attendenceSystem.util.TimeUtil;
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
 
 import lombok.RequiredArgsConstructor;
 
@@ -16,23 +15,14 @@ public class UserResponseMapper {
 
     private final ZoneId applicationZoneId;
 
-    public UserResponse toResponse(User user) {
-
+    public UserResponse fromEntity(User user) {
         return UserResponse.builder()
                 .id(user.getId())
+                .username(user.getUsername())
                 .email(user.getEmail())
                 .fullName(user.getFullName())
-                .avatar(user.getAvatar())
-                .status(user.getStatus())
-                .createdAt(
-                        TimeUtil.formatInstant(
-                                user.getCreatedAt(),
-                                applicationZoneId))
-                .updatedAt(
-                        TimeUtil.formatInstant(
-                                user.getUpdatedAt(),
-                                applicationZoneId))
-                .deleted(user.getDeleted())
+                .isActive(user.isActive())
+                .role(user.getRole().name())
                 .build();
     }
 }

src/main/java/com/attendenceSystem/module/user/repository/UserRepository.java

@@ -0,0 +1,24 @@
+package com.attendenceSystem.module.user.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.attendenceSystem.module.user.entity.User;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+    Optional<User> findUserByUsername(String username);
+    Optional<User> findUserByEmail(String email);
+    boolean existsByUsername(String username);
+    boolean existsByEmail(String email);
+    Optional<User> findUserByUsernameOrEmail(String username, String email);
+    boolean existsByUsernameOrEmail(String username, String email);
+    Page<User> findAllByOrderByIdAsc(Pageable pageable);
+    long countByIsActiveTrue();
+    long countByIsActiveFalse();
+    Optional<User> findByUsername(String username);
+}

src/main/java/com/attendenceSystem/module/user/service/AuthService.java

@@ -0,0 +1,12 @@
+package com.attendenceSystem.module.user.service;
+
+import com.attendenceSystem.module.user.dto.request.LoginRequest;
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+
+public interface AuthService {
+    UserResponse login(LoginRequest request);
+
+    void register(RegisterRequest request);
+
+}

src/main/java/com/attendenceSystem/module/user/service/UserService.java

@@ -0,0 +1,12 @@
+package com.attendenceSystem.module.user.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+
+public interface UserService {
+    Page<UserResponse> getAccounts(Pageable pageable);
+    UserResponse getById(Long id);
+    void deleteUser(Long id);
+}

src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java

@@ -0,0 +1,72 @@
+package com.attendenceSystem.module.user.service.impl;
+
+import com.attendenceSystem.module.user.mapper.request.RegisterRequestMapper;
+import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
+import java.util.Optional;
+
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.user.dto.request.LoginRequest;
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.repository.UserRepository;
+import com.attendenceSystem.module.user.service.AuthService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AuthServiceImpl implements AuthService {
+    private final UserResponseMapper userResponseMapper;
+    private final UserRepository userRepository;
+    private final AuthenticationManager authenticationManager;
+    private final PasswordEncoder passwordEncoder;
+
+    @Transactional
+    @Override
+    public void register(RegisterRequest request) {
+        if (existsByKeyword(request.username())) {
+            throw new IllegalArgumentException("Tên đăng nhập đã tồn tại!");
+        }
+        if (existsByKeyword(request.email())) {
+            throw new IllegalArgumentException("Email này đã được đăng ký!");
+        }
+        String hashPassword = passwordEncoder.encode(request.password());
+        User savedUser = RegisterRequestMapper.toEntity(request, hashPassword);
+        userRepository.save(savedUser);
+    }
+
+    @Override
+    public UserResponse login(LoginRequest request) {
+
+        Authentication authentication = authenticationManager.authenticate(
+                new UsernamePasswordAuthenticationToken(
+                        request.login(),
+                        request.password()));
+
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+
+        User user = findUser(authentication.getName())
+                .orElseThrow(() -> new IllegalArgumentException(
+                        "Tên đăng nhập hoặc mật khẩu không đúng."));
+        return userResponseMapper.fromEntity(user);
+    }
+
+    private Optional<User> findUser(String keyword) {
+        return userRepository.findUserByUsernameOrEmail(keyword, keyword);
+    }
+
+    private boolean existsByKeyword(String keyword) {
+        return userRepository.existsByUsernameOrEmail(keyword, keyword);
+    }
+}

src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java

@@ -0,0 +1,43 @@
+package com.attendenceSystem.module.user.service.impl;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
+import com.attendenceSystem.module.user.repository.UserRepository;
+import com.attendenceSystem.module.user.service.UserService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class UserServiceImpl implements UserService {
+    private final UserRepository userRepository;
+    private final UserResponseMapper userResponseMapper;
+
+    @Override
+    public UserResponse getById(Long id) {
+        return userResponseMapper.fromEntity(findById(id));
+    }
+
+    @Transactional
+    @Override
+    public void deleteUser(Long id) {
+        userRepository.delete(findById(id));
+    }
+
+    private User findById(Long id) {
+        return userRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với id: " + id));
+    }
+
+    @Override
+    public Page<UserResponse> getAccounts(Pageable pageable) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getAccounts'");
+    }
+}

src/main/java/com/attendenceSystem/security/ActiveUserFilter.java

@@ -0,0 +1,67 @@
+// package com.attendenceSystem.security;
+
+// import java.io.IOException;
+
+// import org.springframework.security.authentication.AnonymousAuthenticationToken;
+// import org.springframework.security.core.Authentication;
+// import org.springframework.security.core.context.SecurityContextHolder;
+// import org.springframework.stereotype.Component;
+// import org.springframework.web.filter.OncePerRequestFilter;
+
+// import com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.User;
+// import com.attendenceSystem.repository.UserRepository;
+
+// import jakarta.servlet.FilterChain;
+// import jakarta.servlet.ServletException;
+// import jakarta.servlet.http.HttpServletRequest;
+// import jakarta.servlet.http.HttpServletResponse;
+// import jakarta.servlet.http.HttpSession;
+// import lombok.RequiredArgsConstructor;
+
+// @Component
+// @RequiredArgsConstructor
+// public class ActiveUserFilter extends OncePerRequestFilter {
+
+//     private final UserRepository userRepository;
+
+//     @Override
+//     protected void doFilterInternal(
+//             HttpServletRequest request,
+//             HttpServletResponse response,
+//             FilterChain filterChain)
+//             throws ServletException, IOException {
+
+//         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+//         if (authentication != null
+//                 && authentication.isAuthenticated()
+//                 && !(authentication instanceof AnonymousAuthenticationToken)) {
+
+//             String username = authentication.getName();
+
+//             User user = userRepository.findByUsername(username).orElse(null);
+
+//             if (user == null || !user.isActive()) {
+//                 SecurityContextHolder.clearContext();
+//                 HttpSession session = request.getSession(false);
+//                 if (session != null) {
+//                     session.invalidate();
+//                 }
+//                 response.sendRedirect(Routes.USER + "/login");
+//                 return;
+//             }
+//         }
+
+//         filterChain.doFilter(request, response);
+//     }
+
+//     @Override
+//     protected boolean shouldNotFilter(HttpServletRequest request) {
+//         String uri = request.getRequestURI();
+
+//         return uri.startsWith("/css/")
+//                 || uri.startsWith("/js/")
+//                 || uri.startsWith("/images/");
+//     }
+// }

src/main/java/com/attendenceSystem/security/ForceChangePasswordInterceptor.java

@@ -0,0 +1,41 @@
+// package com.attendenceSystem.security;
+
+// import org.springframework.stereotype.Component;
+// import org.springframework.web.servlet.HandlerInterceptor;
+
+// import com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.User;
+// import com.attendenceSystem.repository.UserRepository;
+// import com.attendenceSystem.util.SecurityUtil;
+
+// import jakarta.servlet.http.HttpServletRequest;
+// import jakarta.servlet.http.HttpServletResponse;
+// import lombok.RequiredArgsConstructor;
+
+// @Component
+// @RequiredArgsConstructor
+// public class ForceChangePasswordInterceptor implements HandlerInterceptor {
+//         private final UserRepository userRepository;
+        
+//         @Override
+//         public boolean preHandle(
+//                         HttpServletRequest request,
+//                         HttpServletResponse response,
+//                         Object handler)
+//                         throws Exception {
+//                 String username = SecurityUtil.getCurrentUserName();
+//                 if (username == null) {
+//                         return true;
+//                 }
+//                 User user = userRepository.findUserByUsername(username).orElse(null);
+//                 if (user == null) {
+//                         return true;
+//                 }
+//                 String uri = request.getRequestURI();
+//                 if (user.isMustChangePassword() && !uri.startsWith(Routes.USER + "/change-password")) {
+//                         response.sendRedirect(Routes.USER + "/change-password");
+//                         return false;
+//                 }
+//                 return true;
+//         }
+// }

src/main/java/com/attendenceSystem/security/SecurityConfig.java

@@ -0,0 +1,60 @@
+package com.attendenceSystem.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+// import com.attendenceSystem.constant.Routes;
+// import com.attendenceSystem.entity.enums.Role;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+    // private final ActiveUserFilter activeUserFilter;
+    private final AuthenticationConfiguration authenticationConfiguration;
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .authorizeHttpRequests(auth -> auth
+                        .anyRequest().permitAll())
+                .csrf(csrf -> csrf.disable());
+        return http.build();
+    }
+
+    @Bean
+    public AuthenticationManager authenticationManager() throws Exception {
+        return authenticationConfiguration.getAuthenticationManager();
+    }
+    // Chỉ dùng để test admin
+    // @Bean
+    // public UserDetailsService userDetailsService(
+    // PasswordEncoder passwordEncoder) {
+
+    // UserDetails admin = User.builder()
+    // .username("admin")
+    // .password(passwordEncoder.encode("123456"))
+    // .roles(Role.ADMIN.name())
+    // .build();
+
+    // return new InMemoryUserDetailsManager(admin);
+    // }
+}

src/main/java/com/attendenceSystem/user/dto/request/LoginRequest.java

@@ -1,20 +0,0 @@
-package com.attendenceSystem.user.dto.request;
-
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-@Data
-public class LoginRequest {
-    @NotBlank(message = "Email không được để trống")
-    @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
-    @Email(message = "Email không đúng định dạng")
-    private String email;
-    @NotBlank(message = "Mật khẩu không được để trống")
-    @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
-    private String password;
-
-
-}

src/main/java/com/attendenceSystem/user/dto/request/RegisterRequest.java

@@ -1,38 +0,0 @@
-package com.attendenceSystem.user.dto.request;
-
-import com.attendenceSystem.annotation.PasswordMatch;
-import com.attendenceSystem.user.entity.User;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-import lombok.NonNull;
-
-@Data
-@PasswordMatch
-public class RegisterRequest {
-    @NotBlank(message = "Email không được để trống")
-    @Size(max = 255, message = "Email không được vượt quá 255 ký tự")
-    @Email(message = "Email không đúng định dạng")
-    private String email;
-    @NotBlank(message = "Mật khẩu không được để trống")
-    @Size(min = 8, message = "Mật khẩu phải chứa ít nhất 8 kí tự")
-    private String password;
-    @NotBlank(message = "Mật khẩu xác nhận không được để trống")
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String rePassword;
-    @NotBlank(message = "Họ tên không được để trống")
-    @Size(max = 255, message = "Họ tên không được vượt quá 255 ký tự")
-    private String fullName;
-
-    @NonNull
-    public User toEntity(String hashPassword) {
-        return User.builder()
-                .email(this.email)
-                .password(hashPassword)
-                .fullName(this.fullName)
-                .build();
-    }
-}

src/main/java/com/attendenceSystem/user/dto/response/UserResponse.java

@@ -1,17 +0,0 @@
-package com.attendenceSystem.user.dto.response;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class UserResponse {
-    private Long id;
-    private String email;
-    private String fullName;
-    private String avatar;
-    private String status;
-    private String createdAt;
-    private String updatedAt;
-    private Boolean deleted;
-}

src/main/java/com/attendenceSystem/user/entity/converter/RoleConverter.java

@@ -1,15 +0,0 @@
-// package com.attendenceSystem.user.entity.converter;
-
-// @Converter(autoApply = true)
-// public class RoleConverter implements AttributeConverter<Role, Integer> {
-
-//     @Override
-//     public Integer convertToDatabaseColumn(Role role) {
-//         return role == null ? null : role.getValue();
-//     }
-
-//     @Override
-//     public Role convertToEntityAttribute(Integer dbData) {
-//         return dbData == null ? null : Role.fromValue(dbData);
-//     }
-// }

src/main/java/com/attendenceSystem/user/mapper/request/LoginRequestMapper.java

@@ -1,5 +0,0 @@
-package com.attendenceSystem.user.mapper.request;
-
-public class LoginRequestMapper {
-
-}

src/main/java/com/attendenceSystem/user/mapper/request/RegisterRequestMapper.java

@@ -1,5 +0,0 @@
-package com.attendenceSystem.user.mapper.request;
-
-public class RegisterRequestMapper {
-
-}

src/main/java/com/attendenceSystem/user/repository/UserRepository.java

@@ -1,11 +0,0 @@
-package com.attendenceSystem.user.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import com.attendenceSystem.user.entity.User;
-
-@Repository
-public interface UserRepository extends JpaRepository<User, Long> {
-
-}

src/main/java/com/attendenceSystem/user/service/UserService.java

@@ -1,15 +0,0 @@
-package com.attendenceSystem.user.service;
-
-import com.attendenceSystem.user.dto.request.LoginRequest;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
-import com.attendenceSystem.user.dto.response.UserResponse;
-
-public interface UserService {
-    UserResponse login(LoginRequest request);
-
-    void register(RegisterRequest request);
-
-    void deleteUser(Long id);
-
-    UserResponse findAccountById(Long id);
-}

src/main/java/com/attendenceSystem/user/service/impl/UserServiceImpl.java

@@ -1,65 +0,0 @@
-package com.attendenceSystem.user.service.impl;
-
-import java.time.Instant;
-import java.time.ZoneId;
-
-import com.attendenceSystem.user.dto.request.LoginRequest;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
-import com.attendenceSystem.user.dto.response.UserResponse;
-import com.attendenceSystem.user.entity.User;
-import com.attendenceSystem.user.repository.UserRepository;
-import com.attendenceSystem.user.service.UserService;
-import com.attendenceSystem.util.TimeUtil;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public class UserServiceImpl implements UserService {
-    private final UserRepository userRepository;
-    private final ZoneId applicationZoneId;
-    // private final PasswordEncoder passwordEncoder;
-
-    @Override
-    public UserResponse login(LoginRequest request) {
-        // Tìm tài khoản thông qua email từ request, không có báo lỗi.
-
-        // Kiểm tra mật khẩu từ request có chính xác không. Sai báo lỗi
-
-        // Trả UserResponse
-        return null;
-    }
-
-    // @Transactional
-    @Override
-    public void register(RegisterRequest request) {
-        // Kiểm tra email
-
-        // encode password
-
-        // Lưu User
-    }
-
-    @Override
-    public void deleteUser(Long id) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'deleteUser'");
-    }
-
-    @Override
-    public UserResponse findAccountById(Long id) {
-        // Kiểm tra id == null
-
-        // Tìm kiếm user thông qua id
-
-        // Trả về UserResponse.
-        return null;
-    }
-
-    private String getCurrentTime() {
-
-        return TimeUtil.formatInstant(
-                Instant.now(),
-                applicationZoneId);
-    }
-
-}

src/main/java/com/attendenceSystem/validator/PasswordMatchValidator.java

@@ -1,7 +1,7 @@
 package com.attendenceSystem.validator;
 
 import com.attendenceSystem.annotation.PasswordMatch;
-import com.attendenceSystem.user.dto.request.RegisterRequest;
+import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
@@ -13,13 +13,13 @@ public class PasswordMatchValidator
     public boolean isValid(RegisterRequest request,
             ConstraintValidatorContext context) {
 
-        if (request.getPassword() == null
-                || request.getRePassword() == null) {
+        if (request.password() == null
+                || request.rePassword() == null) {
             return true;
         }
 
-        boolean valid = request.getPassword()
-                .equals(request.getRePassword());
+        boolean valid = request.password()
+                .equals(request.rePassword());
 
         if (!valid) {
             context.disableDefaultConstraintViolation();

src/main/resources/application.properties

@@ -23,14 +23,14 @@ spring.devtools.livereload.enabled=true
 server.servlet.jsp.init-parameters.development=true
 
 # DataSource Configuration for SQL Server
-# spring.datasource.url=jdbc:mariadb://localhost:3306/MOONBLIGHT
-# spring.datasource.username=root
-# spring.datasource.password=QQQewqwqa401!
-# spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-
-spring.datasource.url=jdbc:mysql://localhost:3306/game_promo_web
+spring.datasource.url=jdbc:mariadb://localhost:3306/ATTENDANCE
 spring.datasource.username=root
-spring.datasource.password=annguyenthanh2k5
+spring.datasource.password=QQQewqwqa401!
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+
+# spring.datasource.url=jdbc:mysql://localhost:3306/game_promo_web
+# spring.datasource.username=root
+# spring.datasource.password=annguyenthanh2k5
 
 
 # SMPT EMAIL
@@ -40,7 +40,18 @@ spring.datasource.password=annguyenthanh2k5
 # spring.mail.password=lzzxdgzmirxdwqdv
 
 # JPA configuration
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+
+
 
+# spring.mail.properties.mail.smtp.auth=true
+# spring.mail.properties.mail.smtp.starttls.enable=true
 
+# Catch exception
+# server.error.include-message=never
+# server.error.include-binding-errors=never
+# server.error.include-stacktrace=never
+# server.error.include-exception=false
 
->>>>>>> Stashed changes
+app.timezone=Asia/Ho_Chi_Minh