Optimize Performance

.env

@@ -0,0 +1,3 @@
+SPRING_DATASOURCE_URL=jdbc:mariadb://localhost:3306/MOONBLIGHT
+SPRING_DATASOURCE_USERNAME=root
+SPRING_DATASOURCE_PASSWORD=QQQewqwqa401!

src/main/java/com/darkfantasy/config/AsyncConfig.java

@@ -0,0 +1,41 @@
+package com.darkfantasy.config;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+    @Bean(name = "taskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+
+        // 1. Số lượng luồng CƠ BẢN luôn được duy trì sẵn sàng (như nhân viên trực ca)
+        executor.setCorePoolSize(5);
+
+        // 2. Kích thước HÀNG ĐỢI. Nếu 5 luồng trên đều bận, các task mới sẽ vào đây xếp
+        // hàng
+        executor.setQueueCapacity(500);
+
+        // 3. Số lượng luồng TỐI ĐA. Nếu 500 chỗ xếp hàng đều chật kín, hệ thống mới gọi
+        // thêm "nhân viên thời vụ" (tối đa lên 20 luồng)
+        executor.setMaxPoolSize(20);
+
+        // Đặt tên cho luồng để sau này log ra nhìn phát biết ngay
+        executor.setThreadNamePrefix("BlightMoon-Async-");
+
+        // 4. CHÍNH SÁCH XỬ LÝ QUÁ TẢI (Cực kỳ quan trọng)
+        // Nếu cả 20 luồng đều bận và 500 chỗ xếp hàng đều đầy thì làm gì?
+        // CallerRunsPolicy: Bắt chính cái luồng gọi (ví dụ luồng đang xử lý API) tự đi
+        // mà thực thi task đó luôn, tuyệt đối không quăng lỗi làm crash ứng dụng.
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/darkfantasy/config/CacheConfig.java

@@ -0,0 +1,9 @@
+package com.darkfantasy.config;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableCaching
+public class CacheConfig {
+}

src/main/java/com/darkfantasy/controller/UserController.java

@@ -102,13 +102,7 @@ public class UserController {
             HttpServletResponse response,
             Authentication authentication) {
         if (authentication != null) {
-            String username = authentication.getName();
-            UserResponse user = userService.findByUsername(username);
-            auditLogService.log(
-                    LogEntityType.USER,
-                    user.getId(),
-                    LogAction.LOGOUT,
-                    "Đăng xuất");
+            userService.logLogout();
         }
 
         new SecurityContextLogoutHandler()

src/main/java/com/darkfantasy/dto/article/ArticleResponse.java

@@ -1,8 +1,9 @@
 package com.darkfantasy.dto.article;
 
+import java.util.Optional;
+
 import com.darkfantasy.entity.Article;
 import com.darkfantasy.entity.User;
-import com.darkfantasy.entity.enums.ArticleType;
 import com.darkfantasy.util.TimeUtil;
 
 import lombok.AllArgsConstructor;
@@ -19,6 +20,7 @@ public class ArticleResponse {
     private Long id;
     private String title;
     private String content;
+    private String summary;
     private String authorUsername;
     private String thumbnailUrl;
     private String type;
@@ -33,26 +35,22 @@ public class ArticleResponse {
                 .id(article.getId())
                 .title(article.getTitle())
                 .content(article.getContent())
+                .summary(generateSummary(article.getContent()))
                 .authorUsername(article.getCreatedBy().getUsername())
                 .thumbnailUrl(article.getThumbnailUrl())
                 .type(article.getType().getDisplayName())
-                .createdByUserName(article.getCreatedBy()!= null? article.getCreatedBy().getUsername() : null)
+                .createdByUserName(article.getCreatedBy() != null ? article.getCreatedBy().getUsername() : null)
                 .createdAt(TimeUtil.formatInstant(article.getCreatedAt()))
-                .updatedByUserName(article.getUpdatedBy()!= null? article.getUpdatedBy().getUsername() : null)
+                .updatedByUserName(article.getUpdatedBy() != null ? article.getUpdatedBy().getUsername() : null)
                 .updatedAt(TimeUtil.formatInstant(article.getUpdatedAt()))
                 .deleted(article.isDeleted())
                 .build();
     }
 
-    public String getSummary() {
-        if (content == null) {
+    private static String generateSummary(String content) {
+        if (content == null || content.isBlank()) {
             return "";
         }
-
-        if (content.length() <= 150) {
-            return content;
-        }
-
-        return content.substring(0, 150) + "...";
+        return content.length() <= 150 ? content : content.substring(0, 150) + "...";
     }
 }

src/main/java/com/darkfantasy/entity/Article.java

@@ -13,6 +13,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
@@ -23,7 +24,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "articles")
+@Table(name = "articles", indexes = {
+        @Index(name = "idx_article_deleted", columnList = "deleted"),
+        @Index(name = "idx_article_created_at", columnList = "created_at")
+})
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/darkfantasy/entity/User.java

@@ -36,6 +36,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -44,7 +45,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "users")
+@Table(name = "users", indexes = {
+        @Index(name = "idx_user_email", columnList = "email", unique = true),
+        @Index(name = "idx_user_username", columnList = "username", unique = true)
+})
 @Getter
 @Setter
 @NoArgsConstructor
@@ -74,7 +78,7 @@ public class User {
     @UpdateTimestamp
     @Column(name = "updated_at", nullable = false)
     private Instant updatedAt;
-    
+
     @Column(name = "must_change_password", nullable = false)
     @Builder.Default
     private boolean mustChangePassword = false;

src/main/java/com/darkfantasy/entity/World.java

@@ -11,6 +11,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
@@ -21,7 +22,19 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "worlds")
+@Table(
+    name = "worlds", 
+    indexes = {
+        // 1. Index đơn cho các cột hay dùng trong mệnh đề WHERE
+        @Index(name = "idx_world_deleted", columnList = "deleted"),
+        
+        // 2. Index cho cột hay dùng để sắp xếp (ORDER BY)
+        @Index(name = "idx_world_priority", columnList = "priority"),
+        
+        // 3. Index kép (Composite Index): 
+        @Index(name = "idx_world_deleted_priority", columnList = "deleted, priority")
+    }
+)
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/darkfantasy/repository/ArticleRepository.java

@@ -4,6 +4,7 @@ import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -12,7 +13,18 @@ import com.darkfantasy.entity.enums.ArticleType;
 
 @Repository
 public interface ArticleRepository extends JpaRepository<Article, Long> {
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
+        Page<Article> findAll(Pageable pageable);
+
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
         Page<Article> findByDeletedFalseOrderByCreatedAtDesc(Pageable pageable);
+
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
         Optional<Article> findFirstByTypeAndDeletedFalseOrderByCreatedAtDesc(ArticleType type);
+
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
         Optional<Article> findByIdAndDeletedFalse(Long id);
+
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
+        Page<Article> findByIdNotAndDeletedFalseOrderByCreatedAtDesc(Long id, Pageable pageable);
 }

src/main/java/com/darkfantasy/repository/AuditLogRepository.java

@@ -2,6 +2,7 @@ package com.darkfantasy.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,4 +11,7 @@ import com.darkfantasy.entity.AuditLog;
 @Repository
 public interface AuditLogRepository extends JpaRepository<AuditLog, Long> {
     Page<AuditLog> findAllByOrderByCreatedAtDesc(Pageable pageable);
+
+    @EntityGraph(attributePaths = {"user"})
+    Page<AuditLog> findAll(Pageable pageable);
 }

src/main/java/com/darkfantasy/repository/ContactMessageRepository.java

@@ -2,6 +2,7 @@ package com.darkfantasy.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,6 +11,11 @@ import com.darkfantasy.entity.ContactMessage;
 @Repository
 public interface ContactMessageRepository extends JpaRepository<ContactMessage, Long> {
     Page<ContactMessage> findByProcessedFalse(Pageable pageable);
+
     Page<ContactMessage> findByProcessedTrue(Pageable pageable);
+
     Long countByProcessedFalse();
+
+    @EntityGraph(attributePaths = { "processedBy" })
+    Page<ContactMessage> findAll(Pageable pageable);
 }

src/main/java/com/darkfantasy/repository/ContributorRepository.java

@@ -4,14 +4,17 @@ import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import com.darkfantasy.entity.Contributor;
 
-
 @Repository
-public interface ContributorRepository extends JpaRepository<Contributor, Long>{
+public interface ContributorRepository extends JpaRepository<Contributor, Long> {
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
         Page<Contributor> findByDeletedFalseOrderByPriorityDesc(Pageable pageable);
+
+        @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
         Optional<Contributor> findByIdAndDeletedFalse(Long id);
 }

src/main/java/com/darkfantasy/repository/FaqRepository.java

@@ -4,15 +4,27 @@ import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import com.darkfantasy.entity.Faq;
 
 @Repository
-public interface FaqRepository extends JpaRepository<Faq, Long>{
+public interface FaqRepository extends JpaRepository<Faq, Long> {
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Page<Faq> findAllByOrderByPriorityDesc(Pageable pageable);
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Page<Faq> findByDeletedFalseOrderByPriorityDesc(Pageable pageable);
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Page<Faq> findAllByOrderByIdAsc(Pageable pageable);
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     List<Faq> findByDeletedFalseOrderByPriorityDesc();
+
+    @Override
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
+    Page<Faq> findAll(Pageable pageable);
 }

src/main/java/com/darkfantasy/repository/StoryRepository.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +12,12 @@ import com.darkfantasy.entity.Story;
 
 @Repository
 public interface StoryRepository extends JpaRepository<Story, Long> {
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Page<Story> findAllByOrderByIdAsc(Pageable pageable);
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     List<Story> findByDeletedFalseOrderByPriorityDesc();
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Story findTopByDeletedFalseOrderByPriorityDesc();
 }

src/main/java/com/darkfantasy/repository/WorldRepository.java

@@ -1,9 +1,11 @@
 package com.darkfantasy.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,7 +13,15 @@ import com.darkfantasy.entity.World;
 
 @Repository
 public interface WorldRepository extends JpaRepository<World, Long> {
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     Page<World> findAllByOrderByIdAsc(Pageable pageable);
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     List<World> findByDeletedFalseOrderByPriorityDesc();
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
     World findTopByDeletedFalseOrderByPriorityDesc();
+
+    @EntityGraph(attributePaths = { "createdBy", "updatedBy" })
+    Optional<World> findById(Long id);
 }

src/main/java/com/darkfantasy/security/CustomUserDetails.java

@@ -0,0 +1,50 @@
+package com.darkfantasy.security;
+
+import com.darkfantasy.entity.User;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public class CustomUserDetails implements UserDetails {
+    private Long id;
+    private String username;
+    private String password;
+    private boolean isActive;
+    private Collection<? extends GrantedAuthority> authorities;
+    private String role;
+
+    
+    public static CustomUserDetails build(User user) {
+        List<GrantedAuthority> authorities = List.of(
+                new SimpleGrantedAuthority("ROLE_" + user.getRole().name())
+        );
+        
+        return new CustomUserDetails(
+                user.getId(),
+                user.getUsername(),
+                user.getPassword(),
+                user.isActive(),
+                authorities,
+                user.getRole().name()
+        );
+    }
+
+    @Override
+    public boolean isAccountNonExpired() { return true; }
+
+    @Override
+    public boolean isAccountNonLocked() { return true; }
+
+    @Override
+    public boolean isCredentialsNonExpired() { return true; }
+
+    @Override
+    public boolean isEnabled() { return isActive; }
+}

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

@@ -23,6 +23,9 @@ public class ForceChangePasswordInterceptor implements HandlerInterceptor {
                         HttpServletResponse response,
                         Object handler)
                         throws Exception {
+                if(!SecurityUtil.isAuthenticated()){
+                        return true;
+                }
                 String username = SecurityUtil.getCurrentUserName();
                 if (username == null) {
                         return true;

src/main/java/com/darkfantasy/service/AuditLogService.java

@@ -9,11 +9,6 @@ import com.darkfantasy.entity.enums.LogAction;
 import com.darkfantasy.entity.enums.LogEntityType;
 
 public interface AuditLogService {
-    void log(
-            LogEntityType entityType,
-            Long entityId,
-            LogAction action,
-            String description);
 
     void log(
         User user,

src/main/java/com/darkfantasy/service/CustomUserDetailsService.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.darkfantasy.entity.User;
 import com.darkfantasy.repository.UserRepository;
+import com.darkfantasy.security.CustomUserDetails;
 
 import lombok.RequiredArgsConstructor;
 
@@ -22,12 +23,7 @@ public class CustomUserDetailsService implements UserDetailsService {
                 .orElseThrow(() -> new UsernameNotFoundException(
                         "Không tìm thấy tài khoản"));
 
-        return org.springframework.security.core.userdetails.User
-                .withUsername(user.getUsername())
-                .password(user.getPassword())
-                .disabled(!user.isActive())
-                .authorities("ROLE_" + user.getRole().name())
-                .build();
+        return CustomUserDetails.build(user);
     }
 
 }

src/main/java/com/darkfantasy/service/EmailService.java

@@ -0,0 +1,5 @@
+package com.darkfantasy.service;
+
+public interface EmailService {
+    void sendPasswordResetEmail(String to, String otp);
+}

src/main/java/com/darkfantasy/service/UserService.java

@@ -41,4 +41,6 @@ public interface UserService {
     void verifyOtp(VerifyOtpRequest request);
 
     void resetPassword(ResetPasswordRequest request);
+
+    void logLogout();
 }

src/main/java/com/darkfantasy/service/impl/ArticleServiceImpl.java

@@ -26,6 +26,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class ArticleServiceImpl implements ArticleService {
     private final UserRepository userRepository;
     private final ArticleRepository articleRepository;
@@ -47,6 +48,7 @@ public class ArticleServiceImpl implements ArticleService {
         article.setCreatedBy(currentUser);
         Article savedArticle = articleRepository.save(article);
         auditLogService.log(
+                currentUser,
                 LogEntityType.ARTICLE,
                 savedArticle.getId(),
                 LogAction.CREATE,
@@ -60,12 +62,6 @@ public class ArticleServiceImpl implements ArticleService {
 
         Article article = findArticle(request.getId());
 
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
-            throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
-        }
-
         User currentUser = getCurrentUser();
 
         article.setTitle(request.getTitle());
@@ -78,6 +74,7 @@ public class ArticleServiceImpl implements ArticleService {
 
         article.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.ARTICLE,
                 article.getId(),
                 LogAction.UPDATE,
@@ -96,6 +93,7 @@ public class ArticleServiceImpl implements ArticleService {
         article.setDeleted(true);
         article.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.ARTICLE,
                 article.getId(),
                 LogAction.DELETE,
@@ -147,6 +145,7 @@ public class ArticleServiceImpl implements ArticleService {
         article.setDeleted(false);
         article.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.ARTICLE,
                 article.getId(),
                 LogAction.RESTORE,
@@ -155,12 +154,10 @@ public class ArticleServiceImpl implements ArticleService {
 
     @Override
     public List<ArticleResponse> getLatestArticlesExcept(Long id, int limit) {
-        Pageable pageable = PageRequest.of(0, limit + 1);
+        Pageable pageable = PageRequest.of(0, limit);
 
-        return articleRepository.findByDeletedFalseOrderByCreatedAtDesc(pageable)
+        return articleRepository.findByIdNotAndDeletedFalseOrderByCreatedAtDesc(id, pageable)
                 .stream()
-                .filter(article -> !article.getId().equals(id))
-                .limit(limit)
                 .map(ArticleResponse::fromEntity)
                 .toList();
     }
@@ -177,14 +174,12 @@ public class ArticleServiceImpl implements ArticleService {
 
     private User getCurrentUser() {
 
-        String currentUsername = SecurityUtil.getCurrentUserName();
+        Long currentUserId = SecurityUtil.getCurrentUserId();
 
-        if (currentUsername == null) {
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
-
-        return userRepository.findUserByUsername(currentUsername)
-                .orElseThrow(() -> new ResourceNotFoundException("Không tìm thấy người dùng"));
+        return userRepository.getReferenceById(currentUserId);
     }
 
     @Override

src/main/java/com/darkfantasy/service/impl/AuditLogServiceImpl.java

@@ -2,6 +2,7 @@ package com.darkfantasy.service.impl;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,40 +20,12 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class AuditLogServiceImpl implements AuditLogService {
 
     private final AuditLogRepository auditLogRepository;
     private final UserRepository userRepository;
 
-    @Transactional
-    @Override
-    public void log(
-            LogEntityType entityType,
-            Long entityId,
-            LogAction action,
-            String description) {
-
-        String username = SecurityUtil.getCurrentUserName();
-
-        if (username == null || "anonymousUser".equals(username)) {
-            return;
-        }
-
-        User currentUser = userRepository
-                .findUserByUsername(username)
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "Không tìm thấy người dùng"));
-
-        AuditLog log = AuditLog.builder()
-                .user(currentUser)
-                .entityType(entityType)
-                .entityId(entityId)
-                .action(action)
-                .description(description)
-                .build();
-
-        auditLogRepository.save(log);
-    }
 
     @Override
     public Page<AuditLogResponse> getLogs(Pageable pageable) {
@@ -61,6 +34,7 @@ public class AuditLogServiceImpl implements AuditLogService {
                 .map(AuditLogResponse::fromEntity);
     }
 
+    @Async
     @Transactional
     @Override
     public void log(
@@ -80,4 +54,5 @@ public class AuditLogServiceImpl implements AuditLogService {
 
         auditLogRepository.save(log);
     }
+
 }

src/main/java/com/darkfantasy/service/impl/ContactMessageServiceImpl.java

@@ -8,19 +8,24 @@ import org.springframework.transaction.annotation.Transactional;
 import com.darkfantasy.dto.contact.ContactMessageResponse;
 import com.darkfantasy.dto.contact.CreateContactMessageRequest;
 import com.darkfantasy.entity.ContactMessage;
+import com.darkfantasy.entity.User;
 import com.darkfantasy.entity.enums.LogAction;
 import com.darkfantasy.entity.enums.LogEntityType;
 import com.darkfantasy.repository.ContactMessageRepository;
+import com.darkfantasy.repository.UserRepository;
 import com.darkfantasy.service.AuditLogService;
 import com.darkfantasy.service.ContactMessageService;
+import com.darkfantasy.util.SecurityUtil;
 
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class ContactMessageServiceImpl implements ContactMessageService {
     private final ContactMessageRepository contactMessageRepository;
     private final AuditLogService auditLogService;
+    private final UserRepository userRepository;
 
     @Transactional
     @Override
@@ -32,11 +37,12 @@ public class ContactMessageServiceImpl implements ContactMessageService {
         ContactMessage message = request.toEntity();
         ContactMessage savedMessage = contactMessageRepository.save(message);
 
-        // auditLogService.log(
-        //         LogEntityType.CONTACT,
-        //         savedMessage.getId(),
-        //         LogAction.CREATE,
-        //         "Tạo liên hệ: " + savedMessage.getMessage());
+        auditLogService.log(
+                null,
+                LogEntityType.CONTACT,
+                savedMessage.getId(),
+                LogAction.CREATE,
+                "Khách vãng lai (" + request.getVisitorEmail() + ") gửi liên hệ");
         return ContactMessageResponse.fromEntity(savedMessage);
     }
 
@@ -65,11 +71,17 @@ public class ContactMessageServiceImpl implements ContactMessageService {
 
         ContactMessage message = findContactMessage(id);
         message.setProcessed(true);
-        auditLogService.log(
-                LogEntityType.CONTACT,
-                message.getId(),
-                LogAction.PROCESS,
-                "Đánh dấu đã xử lý: " + message.getMessage());
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId != null) {
+            User currentUser = userRepository.getReferenceById(currentUserId);
+            auditLogService.log(
+                    currentUser,
+                    LogEntityType.CONTACT,
+                    message.getId(),
+                    LogAction.PROCESS,
+                    "Đánh dấu đã xử lý: " + message.getMessage());
+        }
+
     }
 
     @Transactional

src/main/java/com/darkfantasy/service/impl/ContributorServiceImpl.java

@@ -1,9 +1,6 @@
 package com.darkfantasy.service.impl;
 
-import java.util.List;
-
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class ContributorServiceImpl implements ContributorService {
     private final UserRepository userRepository;
     private final ContributorRepository contributorRepository;
@@ -46,6 +44,7 @@ public class ContributorServiceImpl implements ContributorService {
         contributor.setCreatedBy(currentUser);
         Contributor savedContributor = contributorRepository.save(contributor);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CONTRIBUTOR,
                 savedContributor.getId(),
                 LogAction.CREATE,
@@ -59,12 +58,6 @@ public class ContributorServiceImpl implements ContributorService {
 
         Contributor contributor = findContributor(request.getId());
 
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
-            throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
-        }
-
         User currentUser = getCurrentUser();
 
         contributor.setName(request.getName());
@@ -77,6 +70,7 @@ public class ContributorServiceImpl implements ContributorService {
 
         contributor.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CONTRIBUTOR,
                 contributor.getId(),
                 LogAction.UPDATE,
@@ -95,6 +89,7 @@ public class ContributorServiceImpl implements ContributorService {
         contributor.setDeleted(true);
         contributor.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CONTRIBUTOR,
                 contributor.getId(),
                 LogAction.DELETE,
@@ -126,6 +121,7 @@ public class ContributorServiceImpl implements ContributorService {
         contributor.setDeleted(false);
         contributor.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CONTRIBUTOR,
                 contributor.getId(),
                 LogAction.RESTORE,
@@ -143,14 +139,10 @@ public class ContributorServiceImpl implements ContributorService {
     }
 
     private User getCurrentUser() {
-
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
-
-        return userRepository.findUserByUsername(currentUsername)
-                .orElseThrow(() -> new ResourceNotFoundException("Không tìm thấy người dùng"));
+        return userRepository.getReferenceById(currentUserId);
     }
 }

src/main/java/com/darkfantasy/service/impl/EmailServiceImpl.java

@@ -0,0 +1,27 @@
+package com.darkfantasy.service.impl;
+
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import com.darkfantasy.service.EmailService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EmailServiceImpl implements EmailService {
+
+    private final JavaMailSender mailSender;
+
+    @Async
+    @Override
+    public void sendPasswordResetEmail(String to, String otp) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(to);
+        message.setSubject("Mã OTP đặt lại mật khẩu");
+        message.setText("Mã OTP của bạn là: " + otp + "\n\nMã có hiệu lực trong 5 phút.");
+        mailSender.send(message);
+    }
+}

src/main/java/com/darkfantasy/service/impl/FaqServiceImpl.java

@@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class FaqServiceImpl implements FaqService {
     private final FaqRepository faqRepository;
     private final UserRepository userRepository;
@@ -44,15 +45,17 @@ public class FaqServiceImpl implements FaqService {
     @Transactional
     @Override
     public FaqResponse createFaq(CreateFaqRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể tạo faq với dữ liệu null");
         }
 
         Faq faq = request.toEntity();
-        faq.setCreatedBy(getCurrentUser());
+        faq.setCreatedBy(currentUser);
         Faq savedFaq = faqRepository.save(faq);
         auditLogService.log(
+                currentUser,
                 LogEntityType.FAQ,
                 savedFaq.getId(),
                 LogAction.CREATE,
@@ -63,6 +66,7 @@ public class FaqServiceImpl implements FaqService {
     @Transactional
     @Override
     public FaqResponse updateFaq(UpdateFaqRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể thay đổi faq với dữ liệu null");
@@ -71,8 +75,9 @@ public class FaqServiceImpl implements FaqService {
         faq.setTitle(request.getTitle());
         faq.setContent(request.getContent());
         faq.setPriority(request.getPriority());
-        faq.setUpdatedBy(getCurrentUser());
+        faq.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.FAQ,
                 faq.getId(),
                 LogAction.UPDATE,
@@ -83,13 +88,15 @@ public class FaqServiceImpl implements FaqService {
     @Transactional
     @Override
     public void deleteFaq(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể xóa faq với ID null");
         }
         Faq found = findFaq(id);
         found.setDeleted(true);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.FAQ,
                 found.getId(),
                 LogAction.DELETE,
@@ -99,13 +106,15 @@ public class FaqServiceImpl implements FaqService {
     @Transactional
     @Override
     public void restoreFaq(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể khôi phục faq với ID null");
         }
         Faq found = findFaq(id);
         found.setDeleted(false);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.FAQ,
                 found.getId(),
                 LogAction.RESTORE,
@@ -121,27 +130,21 @@ public class FaqServiceImpl implements FaqService {
                 .toList();
     }
 
-    private Faq findFaq(Long id) {
-        return faqRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy faq với ID: " + id));
-    }
-
     @Override
     public long count() {
         return faqRepository.count();
     }
 
     private User getCurrentUser() {
-
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
-
-        return userRepository
-                .findUserByUsername(currentUsername)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
+        return userRepository.getReferenceById(currentUserId);
     }
 
+    private Faq findFaq(Long id) {
+        return faqRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy faq với ID: " + id));
+    }
 }

src/main/java/com/darkfantasy/service/impl/GameCharacterServiceImpl.java

@@ -25,6 +25,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class GameCharacterServiceImpl implements GameCharacterService {
 
     private final GameCharacterRepository gameCharacterRepository;
@@ -40,17 +41,18 @@ public class GameCharacterServiceImpl implements GameCharacterService {
     @Override
     public GameCharacterResponse createGameCharacter(
             CreateGameCharacterRequest request) {
-
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể tạo nhân vật với dữ liệu null");
         }
 
         GameCharacter character = request.toEntity();
-        character.setCreatedBy(getCurrentUser());
+        character.setCreatedBy(currentUser);
 
         GameCharacter savedCharacter = gameCharacterRepository.save(character);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CHARACTER,
                 savedCharacter.getId(),
                 LogAction.CREATE,
@@ -62,6 +64,7 @@ public class GameCharacterServiceImpl implements GameCharacterService {
     @Transactional
     @Override
     public GameCharacterResponse updateGameCharacter(UpdateGameCharacterRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể thay đổi nhân vật với dữ liệu null");
@@ -72,11 +75,12 @@ public class GameCharacterServiceImpl implements GameCharacterService {
         character.setDescription(request.getDescription());
         character.setQuote(request.getQuote());
         character.setPriority(request.getPriority());
-        character.setUpdatedBy(getCurrentUser());
+        character.setUpdatedBy(currentUser);
         if (request.getImage() != null) {
             character.setImage(request.getImage());
         }
         auditLogService.log(
+                currentUser,
                 LogEntityType.CHARACTER,
                 character.getId(),
                 LogAction.UPDATE,
@@ -88,13 +92,15 @@ public class GameCharacterServiceImpl implements GameCharacterService {
     @Transactional
     @Override
     public void deleteCharacter(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể xóa nhân vật với ID null");
         }
         GameCharacter found = findGameCharacter(id);
         found.setDeleted(true);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.CHARACTER,
                 found.getId(),
                 LogAction.DELETE,
@@ -104,13 +110,15 @@ public class GameCharacterServiceImpl implements GameCharacterService {
     @Transactional
     @Override
     public void restoreCharacter(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể khôi phục nhân vật với ID null");
         }
         GameCharacter found = findGameCharacter(id);
         found.setDeleted(false);
-        found.setUpdatedBy(getCurrentUser());
-                auditLogService.log(
+        found.setUpdatedBy(currentUser);
+        auditLogService.log(
+                currentUser,
                 LogEntityType.CHARACTER,
                 found.getId(),
                 LogAction.RESTORE,
@@ -154,15 +162,10 @@ public class GameCharacterServiceImpl implements GameCharacterService {
     }
 
     private User getCurrentUser() {
-
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
-
-        return userRepository
-                .findUserByUsername(currentUsername)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
+        return userRepository.getReferenceById(currentUserId);
     }
 }

src/main/java/com/darkfantasy/service/impl/StoryServiceImpl.java

@@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class StoryServiceImpl implements StoryService {
     private final StoryRepository storyRepository;
     private final UserRepository userRepository;
@@ -44,6 +45,7 @@ public class StoryServiceImpl implements StoryService {
     @Transactional
     @Override
     public StoryResponse createStory(CreateStoryRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể tạo câu chuyện với dữ liệu null");
@@ -51,10 +53,11 @@ public class StoryServiceImpl implements StoryService {
 
         Story story = request.toEntity();
 
-        story.setCreatedBy(getCurrentUser());
+        story.setCreatedBy(currentUser);
 
         Story savedStory = storyRepository.save(story);
         auditLogService.log(
+                currentUser,
                 LogEntityType.STORY,
                 savedStory.getId(),
                 LogAction.CREATE,
@@ -65,6 +68,7 @@ public class StoryServiceImpl implements StoryService {
     @Transactional
     @Override
     public StoryResponse updateStory(UpdateStoryRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể thay đổi câu chuyện với dữ liệu null");
@@ -79,8 +83,9 @@ public class StoryServiceImpl implements StoryService {
         story.setQuoteContent(request.getQuoteContent());
         story.setQuoteAuthor(request.getQuoteAuthor());
         story.setPriority(request.getPriority());
-        story.setUpdatedBy(getCurrentUser());
+        story.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.STORY,
                 story.getId(),
                 LogAction.UPDATE,
@@ -91,13 +96,15 @@ public class StoryServiceImpl implements StoryService {
     @Transactional
     @Override
     public void deleteStory(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể xóa câu chuyện với ID null");
         }
         Story found = findStory(id);
         found.setDeleted(true);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.STORY,
                 found.getId(),
                 LogAction.DELETE,
@@ -107,13 +114,15 @@ public class StoryServiceImpl implements StoryService {
     @Transactional
     @Override
     public void restoreStory(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể khôi phục câu chuyện với ID null");
         }
         Story found = findStory(id);
         found.setDeleted(false);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.STORY,
                 found.getId(),
                 LogAction.RESTORE,
@@ -123,7 +132,7 @@ public class StoryServiceImpl implements StoryService {
     @Override
     public StoryResponse getStoryDeletedFalseHighestPriority() {
         Story story = storyRepository.findTopByDeletedFalseOrderByPriorityDesc();
-        if(story == null){
+        if (story == null) {
             return null;
         }
         return StoryResponse.fromEntity(story);
@@ -149,15 +158,10 @@ public class StoryServiceImpl implements StoryService {
     }
 
     private User getCurrentUser() {
-
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
-
-        return userRepository
-                .findUserByUsername(currentUsername)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
+        return userRepository.getReferenceById(currentUserId);
     }
 }

src/main/java/com/darkfantasy/service/impl/UserServiceImpl.java

@@ -3,11 +3,9 @@ package com.darkfantasy.service.impl;
 import java.security.SecureRandom;
 import java.time.Instant;
 import java.util.Optional;
-import java.util.Random;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -34,6 +32,7 @@ import com.darkfantasy.exception.custom.ResourceNotFoundException;
 import com.darkfantasy.repository.PasswordResetTokenRepository;
 import com.darkfantasy.repository.UserRepository;
 import com.darkfantasy.service.AuditLogService;
+import com.darkfantasy.service.EmailService;
 import com.darkfantasy.service.UserService;
 import com.darkfantasy.util.SecurityUtil;
 
@@ -41,13 +40,14 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class UserServiceImpl implements UserService {
         private final UserRepository userRepository;
         private final PasswordEncoder passwordEncoder;
         private final AuditLogService auditLogService;
         private final PasswordResetTokenRepository tokenRepository;
-        private final JavaMailSender mailSender;
         private final AuthenticationManager authenticationManager;
+        private final EmailService emailService;
 
         @Transactional
         @Override
@@ -116,24 +116,13 @@ public class UserServiceImpl implements UserService {
                 currentUser.setMustChangePassword(false);
 
                 auditLogService.log(
+                                currentUser,
                                 LogEntityType.USER,
                                 currentUser.getId(),
                                 LogAction.UPDATE,
                                 "Đổi mật khẩu: " + currentUser.getUsername());
         }
 
-        private Optional<User> findUser(String keyword) {
-                return userRepository.findUserByUsernameOrEmail(keyword, keyword);
-        }
-
-        private boolean existsByKeyword(String keyword) {
-                return userRepository.existsByUsernameOrEmail(keyword, keyword);
-        }
-
-        private User findUser(Long id) {
-                return id == null ? null : userRepository.getReferenceById(id);
-        }
-
         @Override
         public UserResponse findAccountById(Long id) {
                 if (id == null)
@@ -143,17 +132,6 @@ public class UserServiceImpl implements UserService {
                 return UserResponse.fromEntity(user);
         }
 
-        private User getCurrentUser() {
-                String currentUsername = SecurityUtil.getCurrentUserName();
-
-                if (currentUsername == null) {
-                        throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
-                }
-
-                return userRepository.findUserByUsername(currentUsername)
-                                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
-        }
-
         @Override
         public Page<UserResponse> getAccounts(Pageable pageable) {
                 return userRepository.findAllByOrderByIdAsc(pageable)
@@ -163,11 +141,12 @@ public class UserServiceImpl implements UserService {
         @Transactional
         @Override
         public void lockUser(Long id) {
-                User user = findUser(id);
+                User user = findUserById(id);
                 if (user.getRole() == Role.ADMIN)
                         throw new IllegalArgumentException("Không có thẩm quyền");
                 user.setActive(false);
                 auditLogService.log(
+                                getCurrentUser(),
                                 LogEntityType.USER,
                                 user.getId(),
                                 LogAction.LOCK,
@@ -177,11 +156,12 @@ public class UserServiceImpl implements UserService {
         @Transactional
         @Override
         public void unlockUser(Long id) {
-                User user = findUser(id);
+                User user = findUserById(id);
                 if (user.getRole() == Role.ADMIN)
                         throw new IllegalArgumentException("Không có thẩm quyền");
                 user.setActive(true);
                 auditLogService.log(
+                                getCurrentUser(),
                                 LogEntityType.USER,
                                 user.getId(),
                                 LogAction.UNLOCK,
@@ -224,14 +204,9 @@ public class UserServiceImpl implements UserService {
                                 .used(false)
                                 .build();
                 tokenRepository.save(token);
-                SimpleMailMessage message = new SimpleMailMessage();
-                message.setTo(user.getEmail());
-                message.setSubject("Mã OTP đ���t lại mật khẩu");
-                message.setText("Mã OTP của bạn là: " + otp + "\n\nMã có hiệu lực trong 5 phút.");
-                mailSender.send(message);
+                emailService.sendPasswordResetEmail(user.getEmail(), otp);
         }
 
-        @Transactional(readOnly = true)
         @Override
         public void verifyOtp(VerifyOtpRequest request) {
                 PasswordResetToken token = tokenRepository
@@ -261,4 +236,40 @@ public class UserServiceImpl implements UserService {
                 user.setPassword(passwordEncoder.encode(request.getNewPassword()));
                 token.setUsed(true);
         }
+
+        @Override
+        public void logLogout() {
+                User currentUser = getCurrentUser();
+                auditLogService.log(
+                                currentUser,
+                                LogEntityType.USER,
+                                currentUser.getId(),
+                                LogAction.LOGOUT,
+                                "Đăng xuất: " + currentUser.getUsername());
+        }
+
+        private Optional<User> findUser(String keyword) {
+                return userRepository.findUserByUsernameOrEmail(keyword, keyword);
+        }
+
+        private boolean existsByKeyword(String keyword) {
+                return userRepository.existsByUsernameOrEmail(keyword, keyword);
+        }
+
+        private User findUserById(Long id) {
+                if (id == null) {
+                        throw new IllegalArgumentException("Id không thể là null");
+                }
+                return userRepository.findById(id)
+                                .orElseThrow(() -> new ResourceNotFoundException("Không tìm thấy người dùng"));
+        }
+
+        private User getCurrentUser() {
+                Long currentUserId = SecurityUtil.getCurrentUserId();
+                if (currentUserId == null) {
+                        throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
+                }
+                return userRepository.getReferenceById(currentUserId);
+        }
+
 }

src/main/java/com/darkfantasy/service/impl/WorldServiceImpl.java

@@ -2,6 +2,8 @@ package com.darkfantasy.service.impl;
 
 import java.util.List;
 
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -24,6 +26,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class WorldServiceImpl implements WorldService {
 
     private final WorldRepository worldRepository;
@@ -42,28 +45,33 @@ public class WorldServiceImpl implements WorldService {
         return WorldResponse.fromEntity(findWorld(id));
     }
 
+    @CacheEvict(value = "publicWorlds", allEntries = true)
     @Transactional
     @Override
     public WorldResponse createWorld(CreateWorldRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể tạo thế giới với dữ liệu null");
         }
 
         World world = request.toEntity();
-        world.setCreatedBy(getCurrentUser());
+        world.setCreatedBy(currentUser);
         World savedWorld = worldRepository.save(world);
         auditLogService.log(
+                currentUser,
                 LogEntityType.WORLD,
                 savedWorld.getId(),
                 LogAction.CREATE,
                 "Thêm thế giới: " + savedWorld.getTitle());
-        return WorldResponse.fromEntity(world);
+        return WorldResponse.fromEntity(savedWorld);
     }
 
+    @CacheEvict(value = "publicWorlds", allEntries = true)
     @Transactional
     @Override
     public WorldResponse updateWorld(UpdateWorldRequest request) {
+        User currentUser = getCurrentUser();
         if (request == null) {
             throw new IllegalArgumentException(
                     "Không thể thay đổi thế giới với dữ liệu null");
@@ -76,8 +84,9 @@ public class WorldServiceImpl implements WorldService {
         if (request.getImage() != null) {
             world.setImage(request.getImage());
         }
-        world.setUpdatedBy(getCurrentUser());
+        world.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.WORLD,
                 world.getId(),
                 LogAction.UPDATE,
@@ -85,32 +94,38 @@ public class WorldServiceImpl implements WorldService {
         return WorldResponse.fromEntity(world);
     }
 
+    @CacheEvict(value = "publicWorlds", allEntries = true)
     @Transactional
     @Override
     public void deleteWorld(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể xóa thế giới với ID null");
         }
         World found = findWorld(id);
         found.setDeleted(true);
-        found.setCreatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.WORLD,
                 found.getId(),
                 LogAction.DELETE,
                 "Xóa thế giới: " + found.getTitle());
     }
 
+    @CacheEvict(value = "publicWorlds", allEntries = true)
     @Transactional
     @Override
     public void restoreWorld(Long id) {
+        User currentUser = getCurrentUser();
         if (id == null) {
             throw new IllegalArgumentException("Không thể khôi phục thế giới với ID null");
         }
         World found = findWorld(id);
         found.setDeleted(false);
-        found.setUpdatedBy(getCurrentUser());
+        found.setUpdatedBy(currentUser);
         auditLogService.log(
+                currentUser,
                 LogEntityType.WORLD,
                 found.getId(),
                 LogAction.RESTORE,
@@ -129,6 +144,7 @@ public class WorldServiceImpl implements WorldService {
         return WorldResponse.fromEntity(world);
     }
 
+    @Cacheable(value = "publicWorlds")
     @Override
     public List<WorldResponse> getWorldsDeletedFalse() {
         return worldRepository
@@ -138,27 +154,22 @@ public class WorldServiceImpl implements WorldService {
                 .toList();
     }
 
-    private World findWorld(Long id) {
-        return worldRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy thế giới với ID: " + id));
-    }
-
     @Override
     public long count() {
         return worldRepository.count();
     }
 
     private User getCurrentUser() {
-
-        String currentUsername = SecurityUtil.getCurrentUserName();
-
-        if (currentUsername == null) {
+        Long currentUserId = SecurityUtil.getCurrentUserId();
+        if (currentUserId == null) {
             throw new IllegalStateException("Không tìm thấy người dùng hiện tại");
         }
+        return userRepository.getReferenceById(currentUserId);
+    }
 
-        return userRepository
-                .findUserByUsername(currentUsername)
-                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng"));
+    private World findWorld(Long id) {
+        return worldRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy thế giới với ID: " + id));
     }
 
 }

src/main/java/com/darkfantasy/util/SecurityUtil.java

@@ -2,46 +2,38 @@ package com.darkfantasy.util;
 
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.darkfantasy.entity.enums.Role;
+import com.darkfantasy.security.CustomUserDetails;
 
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class SecurityUtil {
-    public String getCurrentUserName() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null
-                || !authentication.isAuthenticated()
-                || authentication instanceof AnonymousAuthenticationToken) {
-            return null;
+    public CustomUserDetails getCurrentUser() {
+        if (!isAuthenticated()) {
+            throw new IllegalStateException("Người dùng chưa đăng nhập");
         }
-        return authentication.getName();
-    }
 
-    public Role getCurrentUserRole() {
+        return (CustomUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    }
 
-        Authentication authentication = SecurityContextHolder
-                .getContext()
-                .getAuthentication();
+    public boolean isAuthenticated() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        return authentication != null && authentication.isAuthenticated()
+                && !(authentication instanceof AnonymousAuthenticationToken);
+    }
 
-        if (authentication == null
-                || !authentication.isAuthenticated()
-                || authentication instanceof AnonymousAuthenticationToken) {
+    public Role getCurrentUserRole() {
+        return Role.valueOf(getCurrentUser().getRole());
+    }
 
-            return null;
-        }
+    public String getCurrentUserName() {
+        return getCurrentUser().getUsername();
+    }
 
-        return authentication
-                .getAuthorities()
-                .stream()
-                .map(GrantedAuthority::getAuthority)
-                .filter(authority -> authority.startsWith("ROLE_"))
-                .findFirst()
-                .map(authority -> Role.valueOf(
-                        authority.replace("ROLE_", "")))
-                .orElse(null);
+    public Long getCurrentUserId() {
+        return getCurrentUser().getId();
     }
 }

src/main/resources/application.properties

@@ -26,7 +26,7 @@ server.servlet.jsp.init-parameters.development=true
 spring.datasource.url=${SPRING_DATASOURCE_URL}
 # spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
 # spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
-
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 # Hibernate Dialect
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 
@@ -38,8 +38,16 @@ spring.mail.password=${SPRING_MAIL_PASSWORD}
 
 # JPA configuration
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
 
+# Bật tính năng in câu lệnh SQL ra console
+#Nên bật khi code, khi deploy thì tắt
+spring.jpa.show-sql=false
+
+# Format SQL cho dễ đọc (xuống dòng, thụt lề), nếu không nó sẽ in thành 1 hàng ngang rất rối
+spring.jpa.properties.hibernate.format_sql=true
+
+# Làm nổi bật các từ khóa SQL (SELECT, FROM, JOIN) bằng màu sắc
+spring.jpa.properties.hibernate.highlight_sql=true
 
 
 spring.mail.properties.mail.smtp.auth=true
@@ -56,3 +64,27 @@ spring.cache.type=none
 # spring.cache.type=caffeine
 # spring.cache.caffeine.spec=maximumSize=500,expireAfterWrite=5m
 # spring.cache.cache-names=articles,characters,worlds,stories,faqs,contributors
+
+
+# 1. TỐI ƯU CONNECTION POOL (HikariCP)
+# Số lượng kết nối tối đa giữ với Database (Tránh mở quá nhiều gây sập DB)
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.minimum-idle=5
+# Thời gian chờ tối đa nếu hết kết nối (tính bằng ms)
+spring.datasource.hikari.connection-timeout=30000
+
+# 2. BẬT BATCH PROCESSING (Đóng gói câu SQL)
+# Thay vì bắn 100 câu INSERT rời rạc, Hibernate sẽ gộp lại bắn 1 lần
+spring.jpa.properties.hibernate.jdbc.batch_size=50
+spring.jpa.properties.hibernate.order_inserts=true
+spring.jpa.properties.hibernate.order_updates=true
+
+# 3. TẮT OPEN-IN-VIEW (Quan trọng)
+# Chặn việc Hibernate tự ý giữ kết nối Database trong lúc Controller đang trả về JSON (Anti-pattern)
+spring.jpa.open-in-view=false
+
+
+
+
+spring.config.import=optional:file:.env[.properties]
+