Add module otp, add forgot password and change password

pom.xml

@@ -35,6 +35,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity6</artifactId>

src/main/java/com/attendenceSystem/annotation/RegisterPasswordMatch.java

@@ -0,0 +1,23 @@
+package com.attendenceSystem.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.attendenceSystem.validator.RegisterPasswordMatchValidator;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = RegisterPasswordMatchValidator.class)
+public @interface RegisterPasswordMatch {
+
+    String message() default "Mật khẩu xác nhận không khớp";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/com/attendenceSystem/annotation/{PasswordMatch.java → UpdatePasswordMatch.java}

@@ -5,19 +5,18 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.attendenceSystem.validator.PasswordMatchValidator;
+import com.attendenceSystem.validator.UpdatePasswordMatchValidator;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy = PasswordMatchValidator.class)
-public @interface PasswordMatch {
-
+@Constraint(validatedBy = UpdatePasswordMatchValidator.class)
+public @interface UpdatePasswordMatch {
     String message() default "Mật khẩu xác nhận không khớp";
 
     Class<?>[] groups() default {};
 
     Class<? extends Payload>[] payload() default {};
-}
+}

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

@@ -23,12 +23,15 @@ public final class Routes {
         public static final String FORGOT_PASSWORD = "/forgot-password";
         public static final String VERIFY_OTP = "/verify-otp";
         public static final String CHANGE_PASSWORD = "/change-password";
+        public static final String UPDATE_PASSWORD = "/update-password";
         public static final String LOGOUT = "/logout";
     }
 
     public static final class User {
         public static final String ROOT = "/user";
         public static final String PROFILE = "/profile";
+        public static final String CHANGE_PASSWORD = "/change-password";
+        public static final String UPDATE_PASSWORD = "/update-password";
     }
 
     public static final class Dashboard {

src/main/java/com/attendenceSystem/module/attendance/util/AttendanceCalculator.java

@@ -71,4 +71,9 @@ public class AttendanceCalculator {
                 }
                 return Duration.between(checkInTime, checkOutTime).toMinutes();
         }
+
+        public double totalWorkingHours(Instant checkInTime, Instant checkOutTime) {
+                long minutes = workingMinutes(checkInTime, checkOutTime);
+                return minutes / 60.0;
+        }
 }

src/main/java/com/attendenceSystem/module/otp/README.md

@@ -0,0 +1,85 @@
+# OTP Module
+
+## Overview
+Module OTP là module hỗ trợ (support module) xử lý sinh, gửi và xác minh mã OTP (One-Time Password) cho các mục đích:
+- Quên mật khẩu (FORGOT_PASSWORD)
+- Đăng ký tài khoản (REGISTER)
+- Thay đổi email (CHANGE_EMAIL)
+
+Module này được các module khác (ví dụ: user module) gọi thông qua REST API.
+
+## Cấu trúc
+
+### DTOs
+
+#### Request (Class)
+- `SendOtpRequest` - Yêu cầu gửi OTP
+  - destination: email/số điện thoại
+  - purpose: mục đích sử dụng OTP
+
+- `VerifyOtpRequest` - Yêu cầu xác minh OTP
+  - destination: email/số điện thoại
+  - code: mã OTP
+  - purpose: mục đích sử dụng OTP
+
+#### Response (Record)
+- `OtpResponse` - Thông tin OTP đã tạo
+  - id: định danh OTP
+  - destination: email/số điện thoại
+  - purpose: mục đích
+  - expiredAt: thời gian hết hạn
+  - createdAt: thời gian tạo
+  - used: đã sử dụng hay chưa
+
+### Entities
+- `Otp` - Entity lưu trữ OTP trong database
+- `OtpPurpose` - Enum định nghĩa các mục đích sử dụng OTP
+
+### Services
+- `OptService` - Interface chính
+- `OtpSender` - Interface gửi OTP
+- `OtpServiceImpl` - Implementation chính
+- `OtpSenderImpl` - Implementation gửi OTP (stub)
+
+### Repositories
+- `OtpRepository` - JPA Repository với custom methods
+
+### Controllers
+- `OtpApiController` - REST API endpoints (chỉ có REST API, không có MVC controller)
+
+### Mappers
+- `SendOtpRequestMapper` - Chuyển SendOtpRequest → Otp entity
+- `OtpResponseMapper` - Chuyển Otp entity → OtpResponse
+
+## Endpoints
+
+### REST API
+- `POST /api/otp/send` - Gửi OTP
+- `POST /api/otp/verify` - Xác minh OTP
+
+## Cấu hình
+- OTP có độ dài 6 số
+- Thời gian hết hạn: 5 phút
+- Mã OTP được tạo ngẫu nhiên
+
+## Luồng hoạt động
+
+### Gửi OTP
+1. Nhận request với destination và purpose
+2. Tạo mã OTP ngẫu nhiên 6 số
+3. Lưu OTP vào database (status: unused)
+4. Gửi OTP qua channel phù hợp (email/SMS)
+5. Trả về thông tin OTP
+
+### Xác minh OTP
+1. Tìm OTP mới nhất cho destination và purpose (chưa sử dụng)
+2. Kiểm tra OTP có hết hạn không
+3. So sánh mã OTP
+4. Đánh dấu OTP đã sử dụng
+5. Trả về thông tin OTP đã xác minh
+
+## Patterns
+- Request DTOs: Class
+- Response DTOs: Record
+- Mapper: Static methods
+- Service: Constructor injection với Lombok @RequiredArgsConstructor

src/main/java/com/attendenceSystem/module/otp/api/OtpApiController.java

@@ -0,0 +1,36 @@
+package com.attendenceSystem.module.otp.api;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.attendenceSystem.constant.Routes;
+import com.attendenceSystem.module.otp.dto.request.SendOtpRequest;
+import com.attendenceSystem.module.otp.dto.request.VerifyOtpRequest;
+import com.attendenceSystem.module.otp.dto.response.OtpResponse;
+import com.attendenceSystem.module.otp.service.OptService;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping(Routes.API + "/otp")
+@RequiredArgsConstructor
+public class OtpApiController {
+
+    private final OptService otpService;
+
+    @PostMapping("/send")
+    public ResponseEntity<OtpResponse> sendOtp(@Valid @RequestBody SendOtpRequest request) {
+        OtpResponse response = otpService.send(request);
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping("/verify")
+    public ResponseEntity<OtpResponse> verifyOtp(@Valid @RequestBody VerifyOtpRequest request) {
+        OtpResponse response = otpService.verify(request);
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/com/attendenceSystem/module/otp/dto/request/SendOtpRequest.java

@@ -0,0 +1,22 @@
+package com.attendenceSystem.module.otp.dto.request;
+
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SendOtpRequest {
+    @NotBlank(message = "Điểm đến (email/số điện thoại) không được để trống")
+    private String destination;
+
+    @NotNull(message = "Mục đích OTP không được để trống")
+    private OtpPurpose purpose;
+}

src/main/java/com/attendenceSystem/module/otp/dto/request/VerifyOtpRequest.java

@@ -0,0 +1,25 @@
+package com.attendenceSystem.module.otp.dto.request;
+
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class VerifyOtpRequest {
+    @NotBlank(message = "Điểm đến (email/số điện thoại) không được để trống")
+    private String destination;
+
+    @NotBlank(message = "Mã OTP không được để trống")
+    private String code;
+
+    @NotNull(message = "Mục đích OTP không được để trống")
+    private OtpPurpose purpose;
+}

src/main/java/com/attendenceSystem/module/otp/dto/response/OtpResponse.java

@@ -0,0 +1,15 @@
+package com.attendenceSystem.module.otp.dto.response;
+
+import java.time.Instant;
+
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+public record OtpResponse(
+    Long id,
+    String destination,
+    OtpPurpose purpose,
+    Instant expiredAt,
+    Instant createdAt,
+    boolean used
+) {
+}

src/main/java/com/attendenceSystem/module/otp/entity/Otp.java

@@ -0,0 +1,47 @@
+package com.attendenceSystem.module.otp.entity;
+
+import java.time.Instant;
+
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "otp")
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class Otp {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "destination", nullable = false)
+    private String destination;
+    @Column(name = "code", nullable = false)
+    private String code;
+    @Column(name = "purpose", nullable = false)
+    private OtpPurpose purpose;
+    @Column(name = "expired_at", nullable = false)
+    private Instant expiredAt;
+    @Column(name = "created_at", nullable = false)
+    private Instant createdAt;
+    @Column(name = "used", nullable = false)
+    private boolean used;
+
+    public boolean isExpired() {
+        return Instant.now().isAfter(expiredAt);
+    }
+}

src/main/java/com/attendenceSystem/module/otp/entity/converter/OtpPurposeConverter.java

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

src/main/java/com/attendenceSystem/module/otp/entity/enums/OtpPurpose.java

@@ -0,0 +1,32 @@
+package com.attendenceSystem.module.otp.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum OtpPurpose {
+    FORGOT_PASSWORD(1, "Reset Password"),
+    REGISTER(2, "Register Account"),
+    CHANGE_EMAIL(3, "Change Email");
+
+    private final int value;
+    private final String name;
+
+    public static OtpPurpose fromValue(int value) {
+        for (OtpPurpose p : OtpPurpose.values()) {
+            if (p.value == value) {
+                return p;
+            }
+        }
+        return null;
+    }
+    public static OtpPurpose fromName(String name) {
+        for (OtpPurpose p : OtpPurpose.values()) {
+            if (p.name.equals(name)) {
+                return p;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/attendenceSystem/module/otp/exception/OtpExpiredException.java

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

src/main/java/com/attendenceSystem/module/otp/exception/OtpInvalidException.java

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

src/main/java/com/attendenceSystem/module/otp/exception/OtpNotFoundException.java

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

src/main/java/com/attendenceSystem/module/otp/mapper/request/SendOtpRequestMapper.java

@@ -0,0 +1,28 @@
+package com.attendenceSystem.module.otp.mapper.request;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+
+import com.attendenceSystem.module.otp.dto.request.SendOtpRequest;
+import com.attendenceSystem.module.otp.entity.Otp;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SendOtpRequestMapper {
+
+    private static final int OTP_EXPIRY_MINUTES = 5;
+
+    public static Otp toEntity(SendOtpRequest request, String code) {
+        Instant now = Instant.now();
+        return Otp.builder()
+                .destination(request.getDestination())
+                .code(code)
+                .purpose(request.getPurpose())
+                .expiredAt(now.plus(OTP_EXPIRY_MINUTES, ChronoUnit.MINUTES))
+                .createdAt(now)
+                .used(false)
+                .build();
+    }
+}

src/main/java/com/attendenceSystem/module/otp/mapper/request/VerifyOtpRequestMapper.java

@@ -0,0 +1,9 @@
+package com.attendenceSystem.module.otp.mapper.request;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class VerifyOtpRequestMapper {
+    // No mapping needed for now; verification logic is in the service
+}

src/main/java/com/attendenceSystem/module/otp/mapper/response/OtpResponseMapper.java

@@ -0,0 +1,22 @@
+package com.attendenceSystem.module.otp.mapper.response;
+
+import com.attendenceSystem.module.otp.dto.response.OtpResponse;
+import com.attendenceSystem.module.otp.entity.Otp;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class OtpResponseMapper {
+
+    public static OtpResponse fromEntity(Otp otp) {
+        return new OtpResponse(
+                otp.getId(),
+                otp.getDestination(),
+                otp.getPurpose(),
+                otp.getExpiredAt(),
+                otp.getCreatedAt(),
+                otp.isUsed()
+        );
+    }
+}

src/main/java/com/attendenceSystem/module/otp/repository/OtpRepository.java

@@ -0,0 +1,30 @@
+package com.attendenceSystem.module.otp.repository;
+
+import java.time.Instant;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import com.attendenceSystem.module.otp.entity.Otp;
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+@Repository
+public interface OtpRepository extends JpaRepository<Otp, Long> {
+
+    Optional<Otp> findTopByDestinationAndPurposeAndUsedFalseOrderByCreatedAtDesc(
+            String destination, OtpPurpose purpose);
+
+    @Modifying
+    @Query("UPDATE Otp o SET o.used = true WHERE o.destination = :destination AND o.purpose = :purpose")
+    void invalidateByDestinationAndPurpose(
+            @Param("destination") String destination,
+            @Param("purpose") OtpPurpose purpose);
+
+    @Modifying
+    @Query("DELETE FROM Otp o WHERE o.expiredAt < :now")
+    void deleteExpiredOtps(@Param("now") Instant now);
+}

src/main/java/com/attendenceSystem/module/otp/service/OptService.java

@@ -0,0 +1,12 @@
+package com.attendenceSystem.module.otp.service;
+
+import com.attendenceSystem.module.otp.dto.request.SendOtpRequest;
+import com.attendenceSystem.module.otp.dto.request.VerifyOtpRequest;
+import com.attendenceSystem.module.otp.dto.response.OtpResponse;
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+
+public interface OptService {
+    OtpResponse send(SendOtpRequest request);
+    OtpResponse verify(VerifyOtpRequest request);
+    void invalidate(String destination, OtpPurpose purpose);
+}

src/main/java/com/attendenceSystem/module/otp/service/OtpSender.java

@@ -0,0 +1,6 @@
+package com.attendenceSystem.module.otp.service;
+
+public interface OtpSender {
+    // OtpChannel getChannel();
+    void send(String destination, String code);
+}

src/main/java/com/attendenceSystem/module/otp/service/impl/EmailOtpSenderImpl.java

@@ -0,0 +1,35 @@
+package com.attendenceSystem.module.otp.service.impl;
+
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+
+import com.attendenceSystem.module.otp.service.OtpSender;
+
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EmailOtpSenderImpl implements OtpSender {
+    private final JavaMailSender mailSender;
+    private static final String SUBJECT = "Mã OTP xác thực";
+
+    @Override
+    public void send(String destination, String code) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setTo(destination);
+            helper.setSubject(SUBJECT);
+            helper.setText("Mã OTP của bạn là: <strong>" + code + "</strong><br>"
+                    + "Mã này có hiệu lực trong 5 phút.", true);
+
+            mailSender.send(message);
+        } catch (MessagingException e) {
+            throw new RuntimeException("Không thể gửi email OTP: " + e.getMessage(), e);
+        }
+    }
+}

src/main/java/com/attendenceSystem/module/otp/service/impl/OtpServiceImpl.java

@@ -0,0 +1,76 @@
+package com.attendenceSystem.module.otp.service.impl;
+
+import java.security.SecureRandom;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.otp.dto.request.SendOtpRequest;
+import com.attendenceSystem.module.otp.dto.request.VerifyOtpRequest;
+import com.attendenceSystem.module.otp.dto.response.OtpResponse;
+import com.attendenceSystem.module.otp.entity.Otp;
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+import com.attendenceSystem.module.otp.exception.OtpExpiredException;
+import com.attendenceSystem.module.otp.exception.OtpInvalidException;
+import com.attendenceSystem.module.otp.exception.OtpNotFoundException;
+import com.attendenceSystem.module.otp.mapper.request.SendOtpRequestMapper;
+import com.attendenceSystem.module.otp.mapper.response.OtpResponseMapper;
+import com.attendenceSystem.module.otp.repository.OtpRepository;
+import com.attendenceSystem.module.otp.service.OptService;
+import com.attendenceSystem.module.otp.service.OtpSender;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class OtpServiceImpl implements OptService {
+    private final OtpRepository otpRepository;
+    private final OtpSender otpSender;
+
+    private static final SecureRandom RANDOM = new SecureRandom();
+
+    @Transactional
+    @Override
+    public OtpResponse send(SendOtpRequest request) {
+        invalidate(request.getDestination(), request.getPurpose());
+        
+        String code = generateOtpCode();
+        
+        Otp otp = SendOtpRequestMapper.toEntity(request, code);
+        Otp savedOtp = otpRepository.save(otp);
+        
+        otpSender.send(savedOtp.getDestination(), savedOtp.getCode());
+        
+        return OtpResponseMapper.fromEntity(savedOtp);
+    }
+
+    @Transactional
+    @Override
+    public OtpResponse verify(VerifyOtpRequest request) {
+        Otp otp = otpRepository.findTopByDestinationAndPurposeAndUsedFalseOrderByCreatedAtDesc(
+                request.getDestination(), request.getPurpose())
+                .orElseThrow(() -> new OtpNotFoundException("Không tìm thấy OTP cho mục đích này"));
+
+        if (otp.isExpired()) {
+            throw new OtpExpiredException("Mã OTP đã hết hạn. Vui lòng gửi lại OTP mới.");
+        }
+
+        if (!otp.getCode().equals(request.getCode())) {
+            throw new OtpInvalidException("Mã OTP không chính xác.");
+        }
+
+        otp.setUsed(true);
+        otpRepository.save(otp);
+
+        return OtpResponseMapper.fromEntity(otp);
+    }
+
+    @Override
+    public void invalidate(String destination, OtpPurpose purpose) {
+        otpRepository.invalidateByDestinationAndPurpose(destination, purpose);
+    }
+
+    private String generateOtpCode() {
+        return "%06d".formatted(RANDOM.nextInt(1_000_000));
+    }
+}

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

@@ -19,6 +19,11 @@ 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.service.AuthService;
+import com.attendenceSystem.module.user.service.UserService;
+
+import com.attendenceSystem.module.otp.exception.OtpExpiredException;
+import com.attendenceSystem.module.otp.exception.OtpInvalidException;
+import com.attendenceSystem.module.otp.exception.OtpNotFoundException;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -28,6 +33,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping(Routes.Auth.ROOT)
@@ -124,4 +130,45 @@ public class AuthController {
 
         return Routes.REDIRECT+"/";
     }
+
+    @PostMapping(Routes.Auth.FORGOT_PASSWORD)
+    public String forgotPassword(
+            @RequestParam("email") String email,
+            RedirectAttributes redirectAttributes) {
+        try {
+            authService.forgotPassword(email);
+            redirectAttributes.addFlashAttribute("successMessage",
+                    "Mã OTP đã được gửi đến email của bạn. Vui lòng kiểm tra email.");
+            redirectAttributes.addFlashAttribute("email", email);
+            return Routes.REDIRECT + Routes.Auth.ROOT + Routes.Auth.VERIFY_OTP;
+        } catch (IllegalArgumentException e) {
+            redirectAttributes.addFlashAttribute("errorMessage", e.getMessage());
+            return Routes.REDIRECT + Routes.Auth.ROOT + Routes.Auth.FORGOT_PASSWORD;
+        }
+    }
+
+    @PostMapping(Routes.Auth.VERIFY_OTP)
+    public String verifyOtp(
+            @RequestParam("email") String email,
+            @RequestParam("otp") String otpCode,
+            Model model,
+            RedirectAttributes redirectAttributes) {
+        try {
+            boolean isValid = authService.verifyOtp(email, otpCode);
+            if (isValid) {
+                redirectAttributes.addFlashAttribute("email", email);
+                redirectAttributes.addFlashAttribute("otpVerified", true);
+                return Routes.REDIRECT + Routes.Auth.ROOT + Routes.Auth.CHANGE_PASSWORD;
+            } else {
+                model.addAttribute("errorMessage", "Mã OTP không chính xác hoặc đã hết hạn.");
+                model.addAttribute("email", email);
+                return Views.Auth.VERIFY_OTP;
+            }
+        } catch (Exception e) {
+            model.addAttribute("errorMessage", e.getMessage());
+            model.addAttribute("email", email);
+            return Views.Auth.VERIFY_OTP;
+        }
+    }
+
 }

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

@@ -8,6 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.constant.Views;
+import com.attendenceSystem.module.user.dto.request.ChangePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordWithOtpRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.service.UserService;
 import com.attendenceSystem.util.SecurityUtil;
@@ -16,7 +19,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping(Routes.User.ROOT)
@@ -56,5 +59,43 @@ public class UserController {
         return Routes.REDIRECT + Routes.User.ROOT;
     }
 
+    @PostMapping(Routes.User.CHANGE_PASSWORD)
+    public String changePassword(
+            @RequestParam("oldPassword") String oldPassword,
+            @RequestParam("newPassword") String newPassword,
+            @RequestParam("confirmPassword") String confirmPassword,
+            Model model) {
+        try {
+            if (!newPassword.equals(confirmPassword)) {
+                throw new IllegalArgumentException("Mật khẩu xác nhận không khớp");
+            }
+            ChangePasswordRequest request = new ChangePasswordRequest(oldPassword, new UpdatePasswordRequest(newPassword, confirmPassword));
+            userService.changePassword(request);
+            return Routes.REDIRECT + Routes.User.ROOT + Routes.User.PROFILE + "?success=true";
+        } catch (Exception e) {
+            model.addAttribute("errorMessage", e.getMessage());
+            return Views.User.PROFILE;
+        }
+    }
+
+    @PostMapping(Routes.User.UPDATE_PASSWORD)
+    public String updatePasswordWithOtp(
+            @RequestParam("destination") String destination,
+            @RequestParam("password") String password,
+            @RequestParam("confirmPassword") String confirmPassword,
+            Model model) {
+        try {
+            if (!password.equals(confirmPassword)) {
+                throw new IllegalArgumentException("Mật khẩu xác nhập không khớp");
+            }
+            UpdatePasswordWithOtpRequest request = new UpdatePasswordWithOtpRequest(destination, new UpdatePasswordRequest(password, confirmPassword));
+            userService.updatePasswordWithOtp(request);
+            return Routes.REDIRECT + Routes.Auth.ROOT + Routes.Auth.LOGIN+ "?success=true";
+        } catch (Exception e) {
+            model.addAttribute("errorMessage", e.getMessage());
+            model.addAttribute("email", destination);
+            return Views.Auth.CHANGE_PASSWORD;
+        }
+    }
 
 }

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

@@ -0,0 +1,14 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChangePasswordRequest {
+    
+    private String oldPassword;
+    private UpdatePasswordRequest request;
+}

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

@@ -1,6 +1,6 @@
 package com.attendenceSystem.module.user.dto.request;
 
-import com.attendenceSystem.annotation.PasswordMatch;
+import com.attendenceSystem.annotation.RegisterPasswordMatch;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import jakarta.validation.constraints.Email;
@@ -11,7 +11,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-@PasswordMatch
+@RegisterPasswordMatch
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

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

@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdatePasswordRequest {
+    private String password;
+    private String confirmPassword;
+}

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

@@ -0,0 +1,13 @@
+package com.attendenceSystem.module.user.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdatePasswordWithOtpRequest {
+    private String destination;
+    private UpdatePasswordRequest request;
+}

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

@@ -8,5 +8,6 @@ public interface AuthService {
     UserResponse login(LoginRequest request);
 
     void register(RegisterRequest request);
-
+    void forgotPassword(String email);
+    boolean verifyOtp(String destination, String code);
 }

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

@@ -3,7 +3,11 @@ package com.attendenceSystem.module.user.service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import com.attendenceSystem.module.user.dto.request.ChangePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordWithOtpRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.User;
 
 public interface UserService {
     Page<UserResponse> getUsers(Pageable pageable);
@@ -11,4 +15,9 @@ public interface UserService {
     void deleteUser(Long id);
     void deactiveUser(Long id);
     void activateUser(Long id);
+
+    void changePassword(ChangePasswordRequest request);
+    void updatePassword(User user, UpdatePasswordRequest request);
+    void updatePasswordWithOtp(UpdatePasswordWithOtpRequest request);
+    
 }

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

@@ -13,7 +13,15 @@ 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 org.springframework.mail.javamail.JavaMailSender;
 
+import com.attendenceSystem.module.otp.dto.request.SendOtpRequest;
+import com.attendenceSystem.module.otp.dto.request.VerifyOtpRequest;
+import com.attendenceSystem.module.otp.entity.enums.OtpPurpose;
+import com.attendenceSystem.module.otp.exception.OtpExpiredException;
+import com.attendenceSystem.module.otp.exception.OtpInvalidException;
+import com.attendenceSystem.module.otp.exception.OtpNotFoundException;
+import com.attendenceSystem.module.otp.service.OptService;
 import com.attendenceSystem.module.user.dto.request.LoginRequest;
 import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
@@ -31,7 +39,7 @@ public class AuthServiceImpl implements AuthService {
     private final UserRepository userRepository;
     private final AuthenticationManager authenticationManager;
     private final PasswordEncoder passwordEncoder;
-    
+    private final OptService otpService;
 
     @Transactional
     @Override
@@ -83,4 +91,33 @@ public class AuthServiceImpl implements AuthService {
     private boolean existsByKeyword(String keyword) {
         return userRepository.existsByUsernameOrEmail(keyword, keyword);
     }
+
+    @Override
+    public void forgotPassword(String email) {
+        User user = findUser(email)
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với email: " + email));
+
+        SendOtpRequest request = SendOtpRequest.builder()
+                .destination(user.getEmail())
+                .purpose(OtpPurpose.FORGOT_PASSWORD)
+                .build();
+
+        otpService.send(request);
+    }
+
+    @Override
+    public boolean verifyOtp(String destination, String code) {
+        try {
+            VerifyOtpRequest request = VerifyOtpRequest.builder()
+                    .destination(destination)
+                    .code(code)
+                    .purpose(OtpPurpose.FORGOT_PASSWORD)
+                    .build();
+
+            otpService.verify(request);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

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

@@ -2,9 +2,15 @@ package com.attendenceSystem.module.user.service.impl;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.core.Authentication;
+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.ChangePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordRequest;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordWithOtpRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.entity.User;
 import com.attendenceSystem.module.user.entity.enums.Role;
@@ -19,6 +25,7 @@ import lombok.RequiredArgsConstructor;
 @Service
 @RequiredArgsConstructor
 public class UserServiceImpl implements UserService {
+    private final PasswordEncoder passwordEncoder;
     private final UserRepository userRepository;
     private final UserResponseMapper userResponseMapper;
 
@@ -45,7 +52,7 @@ public class UserServiceImpl implements UserService {
     public void deactiveUser(Long id) {
         User user = findById(id);
         validateAdminAction(user);
-        if(user.getStatus() == Status.INACTIVE){
+        if (user.getStatus() == Status.INACTIVE) {
             throw new IllegalStateException("Tài khoản đã bị khóa");
         }
         user.setStatus(Status.INACTIVE);
@@ -56,7 +63,7 @@ public class UserServiceImpl implements UserService {
     public void activateUser(Long id) {
         User user = findById(id);
         validateAdminAction(user);
-        if(user.getStatus() == Status.ACTIVE){
+        if (user.getStatus() == Status.ACTIVE) {
             throw new IllegalStateException("Tài khoản chưa bị khóa");
         }
         user.setStatus(Status.ACTIVE);
@@ -81,4 +88,36 @@ public class UserServiceImpl implements UserService {
                 .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với id: " + id));
     }
 
-}
+    @Transactional
+    @Override
+    public void changePassword(ChangePasswordRequest request) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null || !authentication.isAuthenticated()) {
+            throw new IllegalStateException("Người dùng chưa đăng nhập");
+        }
+        String currentUsername = authentication.getName();
+        User user = userRepository.findByUsername(currentUsername)
+                .orElseThrow(() -> new IllegalArgumentException(
+                        "Không tìm thấy người dùng với tên đăng nhập: " + currentUsername));
+        if(!passwordEncoder.matches(request.getOldPassword(), user.getPassword())) {
+            throw new IllegalArgumentException("Mật khẩu cũ không đúng");
+        }
+        updatePassword(user, request.getRequest());
+    }
+
+    @Transactional
+    @Override
+    public void updatePassword(User user, UpdatePasswordRequest request) {
+        user.setPassword(passwordEncoder.encode(request.getPassword()));
+        userRepository.save(user);
+    }
+
+    @Transactional
+    @Override
+    public void updatePasswordWithOtp(UpdatePasswordWithOtpRequest request) {
+        User user = userRepository.findUserByUsernameOrEmail(request.getDestination(), request.getDestination())
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với email: " + request.getDestination()));
+
+        updatePassword(user, request.getRequest());
+    }
+}

src/main/java/com/attendenceSystem/validator/{PasswordMatchValidator.java → RegisterPasswordMatchValidator.java}

@@ -1,13 +1,13 @@
 package com.attendenceSystem.validator;
 
-import com.attendenceSystem.annotation.PasswordMatch;
+import com.attendenceSystem.annotation.RegisterPasswordMatch;
 import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
-public class PasswordMatchValidator
-        implements ConstraintValidator<PasswordMatch, RegisterRequest> {
+public class RegisterPasswordMatchValidator
+        implements ConstraintValidator<RegisterPasswordMatch, RegisterRequest> {
 
     @Override
     public boolean isValid(RegisterRequest request,

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

@@ -0,0 +1,20 @@
+package com.attendenceSystem.validator;
+
+import com.attendenceSystem.annotation.UpdatePasswordMatch;
+import com.attendenceSystem.module.user.dto.request.UpdatePasswordRequest;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+public class UpdatePasswordMatchValidator implements
+        ConstraintValidator<UpdatePasswordMatch, UpdatePasswordRequest> {
+
+    @Override
+    public boolean isValid(UpdatePasswordRequest request, ConstraintValidatorContext context) {
+        if (request.getPassword() == null || request.getConfirmPassword() == null) {
+            return false;
+        }
+        return request.getPassword().equals(request.getConfirmPassword());
+    }
+
+}

src/main/resources/application.properties

@@ -34,10 +34,12 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 
 
 # SMPT EMAIL
-# spring.mail.host=smtp.gmail.com
-# spring.mail.port=587
-# spring.mail.username=donhatquang401@gmail.com
-# spring.mail.password=lzzxdgzmirxdwqdv
+spring.mail.host=smtp.gmail.com
+spring.mail.port=587
+spring.mail.username=donhatquang401@gmail.com
+spring.mail.password=vhlnjkkypjcbopcw
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
 
 # JPA configuration
 spring.jpa.hibernate.ddl-auto=update
@@ -50,8 +52,7 @@ attendance.end-work=17:00
 
 
 
-# spring.mail.properties.mail.smtp.auth=true
-# spring.mail.properties.mail.smtp.starttls.enable=true
+
 
 # Catch exception
 # server.error.include-message=never

src/main/resources/templates/cms/absent/absent-create.html

@@ -38,18 +38,24 @@
 
                     <div class="card-body">
 
+                        <!-- SUCCESS / ERROR MESSAGES -->
+                        <div th:if="${successMessage}" class="success-message" th:text="${successMessage}"></div>
+                        <div th:if="${errorMessage}" class="error-message" th:text="${errorMessage}"></div>
+
                         <form class="absent-form" method="post" th:action="@{/attendance/leave/create}" th:object="${createLeaveRequest}">
                             <!-- Date -->
                             <div class="form-grid">
 
                                 <div class="form-group">
                                     <label>Từ ngày</label>
-                                    <input type="date"  required>
+                                    <input type="date" name="startDate" th:field="*{startDate}" required>
+                                    <span th:if="${#fields.hasErrors('startDate')}" th:errors="*{startDate}" class="field-error"></span>
                                 </div>
 
                                 <div class="form-group">
                                     <label>Đến ngày</label>
-                                    <input type="date"  required>
+                                    <input type="date" name="endDate" th:field="*{endDate}" required>
+                                    <span th:if="${#fields.hasErrors('endDate')}" th:errors="*{endDate}" class="field-error"></span>
                                 </div>
 
                             </div>
@@ -57,8 +63,9 @@
                             <!-- Lý do -->
                             <div class="form-group">
                                 <label>Lý do</label>
-                                <textarea  rows="5" placeholder="Nhập lý do xin nghỉ..."
+                                <textarea rows="5" name="reason" th:field="*{reason}" placeholder="Nhập lý do xin nghỉ..."
                                     required></textarea>
+                                <span th:if="${#fields.hasErrors('reason')}" th:errors="*{reason}" class="field-error"></span>
                             </div>
 
                             <!-- BUTTON -->

src/main/resources/templates/cms/absent/absent-detail.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    Trong details sẽ có các thông tin: Tên Nhân viên, tên đầy đủ, vai trò, Phòng ban, Được tạo vào thời điểm nào,
+     Từ ngày, Đến ngày, Lý do, Trạng thái, Hành động (Approve/Reject)
+     Details không phải là table.
+</body>
+</html>

src/main/resources/templates/cms/absent/absent-list.html

@@ -99,12 +99,10 @@
                                     <tr>
                                         <th>Nhân viên</th>
                                         <th>Phòng ban</th>
-                                        <th>Lý do</th>
                                         <th>Từ ngày</th>
                                         <th>Đến ngày</th>
-                                        <th>Chi tiết</th>
                                         <th>Trạng thái</th>
-                                        <th>Hành động</th>
+                                        <th>Chi tiết</th>
                                     </tr>
                                 </thead>
 
@@ -118,15 +116,20 @@
                                     <tr th:each="leave : ${leaveRequests.content}">
                                         <td th:text="${leave.fullName()}">Nhân viên</td>
                                         <td>Phòng ban</td>
-                                        <td>CỘT NÀY SAI NGHIỆP VỤ. NÓ NÊN NẰM Ở DETAILS</td>
                                         <td th:text="${leave.startDate()}">Từ ngày</td>
                                         <td th:text="${leave.endDate()}">Đến ngày</td>
-                                        <td>Cột này nên nhét vào hành động. Phê duyệt và từ chối nên nhét vào details</td>
-                                        
                                         <td>
                                             <span class="status pending">Trạng thái</span>
                                         </td>
+                                        <td>
+                                            <a th:href="@{/leave/detail/{id}(id=${leave.id})}" class="btn btn-small btn-primary">
+                                                <i class="fa-solid fa-eye"></i>
+                                                Xem chi tiết
+                                            </a>
+                                        </td>
+
 
+                                        <!-- 
                                         <td>
                                             <div class="action-group">
 
@@ -143,7 +146,7 @@
                                                 </form>
 
                                             </div>
-                                        </td>
+                                        </td> -->
                                     </tr>
 
                                 </tbody>

src/main/resources/templates/cms/attendance/attendance-history.html

@@ -33,10 +33,9 @@
                     <div class="avatar">
                         <img src="/images/default-avatar.png" alt="">
                     </div>
-
                     <div class="profile-info">
-                        <h3>Nguyễn Văn A</h3>
-                        <span>Phòng Công nghệ thông tin</span>
+                        <h3 th:text="${#authentication.principal.fullName}"></h3>
+                        <span th:text="${#authentication.principal.department}"></span>
                     </div>
 
                 </div>
@@ -45,7 +44,7 @@
                 <div class="stats-grid">
 
                     <div class="stats-card">
-                        <span class="stats-value">22</span>
+                        <span class="stats-value" th:text="${attendanceHistory.totalElements}">22</span>
                         <span class="stats-label">Ngày làm việc</span>
                     </div>
 
@@ -96,7 +95,7 @@
 
                     <div class="table-header">
                         <h3>Lịch sử điểm danh</h3>
-                        <span>22 bản ghi</span>
+                        <span th:text="${attendanceHistory.totalElements} + ' bản ghi'">22 bản ghi</span>
                     </div>
 
                     <div class="table-scroll">
@@ -115,33 +114,22 @@
                             </thead>
 
                             <tbody>
-
-                                <tr>
-                                    <td>23/06/2026</td>
-                                    <td>08:01</td>
-                                    <td>17:35</td>
+                                <tr th:each="record : ${attendanceHistory.content}">
+                                    <td th:text="${#temporals.format(record.attendanceDate(), 'dd/MM/yyyy')}">23/06/2026</td>
+                                    <td th:text="${record.checkInTime() != null ? #temporals.format(record.checkInTime(), 'HH:mm') : '--'}">08:01</td>
+                                    <td th:text="${record.checkOutTime() != null ? #temporals.format(record.checkOutTime(), 'HH:mm') : '--'}">17:35</td>
                                     <td>
-                                        <span class="badge success">
-                                            Đúng giờ
-                                        </span>
+                                        <span th:if="${record.late()}" class="badge late">Đi muộn</span>
+                                        <span th:if="${!record.late() and !record.earlyLeave() and record.checkInTime() != null}" class="badge success">Đúng giờ</span>
+                                        <span th:if="${record.earlyLeave()}" class="badge warning">Về sớm</span>
+                                        <span th:if="${record.checkInTime() == null}" class="badge absent">Vắng mặt</span>
                                     </td>
-                                    <td>8h 34p</td>
-                                    <td>-</td>
+                                    <td th:text="${record.workingMinutes() > 0 ? #strings.replace(#strings.replace(#numbers.formatDecimal(record.workingMinutes() / 60, 0, 0), ',', '') + 'h ' + record.workingMinutes() % 60 + 'p', ' 0p', '') : '--'}">8h 34p</td>
+                                    <td th:text="${record.note() != null ? record.note() : '-'}">-</td>
                                 </tr>
-
-                                <tr>
-                                    <td>22/06/2026</td>
-                                    <td>08:15</td>
-                                    <td>17:30</td>
-                                    <td>
-                                        <span class="badge late">
-                                            Đi muộn
-                                        </span>
-                                    </td>
-                                    <td>8h 15p</td>
-                                    <td>Muộn 15 phút</td>
+                                <tr th:if="${attendanceHistory.content.isEmpty()}">
+                                    <td colspan="6" class="text-center">Chưa có dữ liệu điểm danh.</td>
                                 </tr>
-
                             </tbody>
 
                         </table>
@@ -154,7 +142,7 @@
 
     </div>
 
-    
+
 
 
 </body>

src/main/resources/templates/cms/auth/verify-otp.html

@@ -44,10 +44,10 @@
                 <!-- error -->
                 <div class="error-message"></div>
 
-                <form method="post">
+                <form th:action="@{/auth/verify-otp}" method="post">
 
                     <!-- hidden email -->
-                    <input type="hidden" name="email" />
+                    <input type="hidden" name="email" th:value="${email}" />
 
                     <!-- OTP -->
                     <div class="auth-group">

src/main/resources/templates/cms/password/change-password.html

@@ -31,7 +31,7 @@
                 <div class="dashboard-card" style="max-width: 500px; margin: auto;">
 
                     <div class="card-header">
-                        <h2>Thay đổi mật khẩu</h2>
+                        <h2>Đặt lại mật khẩu</h2>
                     </div>
 
                     <div class="card-body">
@@ -43,28 +43,24 @@
                         <div th:if="${errorMessage}" class="error-message" th:text="${errorMessage}">
                         </div>
 
-                        <!-- FORM -->
-                        <form th:action="@{/auth/change-password}" method="post">
+                        <!-- FORM cho forgot password flow -->
+                        <form th:action="@{/user/update-password}" method="post" th:if="${otpVerified}">
 
-                            <!-- Mật khẩu cũ -->
-                            <div class="auth-group">
-                                <label for="oldPassword">Mật khẩu hiện tại</label>
-                                <input id="oldPassword" name="oldPassword" type="password"
-                                    placeholder="Nhập mật khẩu hiện tại" />
-                            </div>
+                            <!-- hidden email -->
+                            <input type="hidden" name="destination" th:value="${email}" />
 
                             <!-- Mật khẩu mới -->
                             <div class="auth-group">
-                                <label for="newPassword">Mật khẩu mới</label>
-                                <input id="newPassword" name="newPassword" type="password"
-                                    placeholder="Nhập mật khẩu mới" />
+                                <label for="password">Mật khẩu mới</label>
+                                <input id="password" name="password" type="password"
+                                    placeholder="Nhập mật khẩu mới" required />
                             </div>
 
                             <!-- Xác nhận -->
                             <div class="auth-group">
                                 <label for="confirmPassword">Xác nhận mật khẩu</label>
                                 <input id="confirmPassword" name="confirmPassword" type="password"
-                                    placeholder="Nhập lại mật khẩu mới" />
+                                    placeholder="Nhập lại mật khẩu mới" required />
                             </div>
 
                             <button class="auth-btn" type="submit">
@@ -73,11 +69,21 @@
 
                         </form>
 
+                        <!-- Thông báo nếu chưa verify OTP -->
+                        <div th:if="${!otpVerified}">
+                            <div class="alert alert-warning">
+                                Vui lòng xác minh OTP trước khi đổi mật khẩu.
+                            </div>
+                            <a th:href="@{/auth/verify-otp}" class="auth-btn" style="display: inline-block; text-decoration: none; text-align: center;">
+                                Xác minh OTP
+                            </a>
+                        </div>
+
                         <hr style="margin: 1rem 0; opacity: 0.2" />
 
                         <div class="other-option">
-                            <a th:href="@{/dashboard}" class="register-link">
-                                ← Quay lại dashboard
+                            <a th:href="@{/auth/login}" class="register-link">
+                                ← Quay lại đăng nhập
                             </a>
                         </div>
 

src/main/resources/templates/cms/sidebar/sidebar-admin.html

@@ -53,18 +53,18 @@
                 <i class="bi bi-person-circle"></i>
             </div>
 
-            <!-- <div>
+            <div>
                 <h3 th:text="${#authentication.principal.fullName}"></h3>
                 <div class="header-description" th:text="${#authentication.principal.role}">
                     Vai trò
                 </div>
-            </div> -->
-            <div>
+            </div>
+            <!-- <div>
                 <h3>Nguyen van an</h3>
                 <div class="header-description">
                     admin
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <form th:action="@{/auth/logout}" method="post" class="logout-form">

src/main/resources/templates/cms/sidebar/sidebar-employee.html

@@ -56,7 +56,7 @@
         </li>
 
         <li class="sidebar-option">
-            <a href="/userInformation" class="sidebar-link">
+            <a href="/user/profile" class="sidebar-link">
                 <span>🪪</span>
                 Thông tin cá nhân
             </a>
@@ -78,18 +78,18 @@
                 <i class="bi bi-person-circle"></i>
             </div>
 
-            <!-- <div>
+            <div>
                 <h3 th:text="${#authentication.principal.fullName}"></h3>
                 <div class="header-description" th:text="${#authentication.principal.role}">
                     Vai trò
                 </div>
-            </div> -->
-            <div>
+            </div>
+            <!-- <div>
                 <h3>Nguyen van an</h3>
                 <div class="header-description">
                     Nhân viên
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <form th:action="@{/auth/logout}" method="post" class="logout-form">

src/main/resources/templates/cms/sidebar/sidebar-manage.html

@@ -60,7 +60,7 @@
             </a>
         </li>
         <li class="sidebar-option">
-            <a href="/userInformation" class="sidebar-link">
+            <a href="/user/profile" class="sidebar-link">
                 <span>🪪</span>
                 Thông tin cá nhân
             </a>
@@ -80,18 +80,18 @@
                 <i class="bi bi-person-circle"></i>
             </div>
 
-            <!-- <div>
+            <div>
                 <h3 th:text="${#authentication.principal.fullName}"></h3>
                 <div class="header-description" th:text="${#authentication.principal.role}">
                     Vai trò
                 </div>
-            </div> -->
-            <div>
+            </div>
+            <!-- <div>
                 <h3>Nguyen van an</h3>
                 <div class="header-description">
                     Manager
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <form th:action="@{/auth/logout}" method="post" class="logout-form">

src/main/resources/templates/cms/user/user-information.html

@@ -43,22 +43,22 @@
 
                             <div class="info-item">
                                 <label>Họ và tên</label>
-                                <p>Nguyễn Văn A</p>
+                                <p th:text="${#authentication.principal.fullName}"></p>
                             </div>
 
                             <div class="info-item">
                                 <label>Email</label>
-                                <p>abc@gmail.com</p>
+                                <p th:text="${#authentication.principal.email}"></p>
                             </div>
 
                             <div class="info-item">
                                 <label>Số điện thoại</label>
-                                <p>0987654321</p>
+                                <p th:text="${#authentication.principal.phone}">Không có</p>
                             </div>
 
                             <div class="info-item">
                                 <label>Phòng ban</label>
-                                <p>Phòng Lab 213</p>
+                                <p th:text="${#authentication.principal.department}">Không có   </p>
                             </div>
 
                         </div>
@@ -76,7 +76,7 @@
 
                     <div class="card-body">
 
-                        <form method="post" th:action="@{/profile/change-password}">
+                        <form method="post" th:action="@{/user/change-password}">
 
                             <div class="form-group">
                                 <label>Mật khẩu hiện tại</label>