add change role in admin function

pom.xml

@@ -35,11 +35,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
-        <dependency>
-            <groupId>me.paulschwarz</groupId>
-            <artifactId>spring-dotenv</artifactId>
-            <version>4.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>

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

@@ -16,6 +16,7 @@ public final class Routes {
         public static final String ACTIVATE = "/activate";
         public static final String ACCEPT = "/accept";
         public static final String REJECT = "/reject";
+        public static final String CHANGE_ROLE = "/change-role";
     }
 
     public static final class Role {

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

@@ -9,10 +9,15 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.constant.Views;
+import java.util.Arrays;
+import java.util.List;
+
 import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.enums.Role;
 import com.attendenceSystem.module.user.service.AccountService;
 import com.attendenceSystem.util.SecurityUtil;
 
@@ -30,6 +35,10 @@ public class AdminAccountController {
         model.addAttribute("users", accountService.getUsers(pageable));
         model.addAttribute("currentUsername", SecurityUtil.getCurrentUserName());
         model.addAttribute("currentRole", SecurityUtil.getCurrentUserRole());
+        List<Role> availableRoles = Arrays.stream(Role.values())
+                .filter(role -> role != Role.ADMIN)
+                .toList();
+        model.addAttribute("availableRoles", availableRoles);
         return Views.User.LIST;
     }
 
@@ -51,4 +60,10 @@ public class AdminAccountController {
         accountService.activateUser(id);
         return Routes.REDIRECT + Routes.Role.ADMIN + Routes.Account.ROOT;
     }
+
+    @PostMapping(Routes.Account.ROOT + Routes.Action.CHANGE_ROLE + "/{id}")
+    public String changeRole(@PathVariable("id") Long id, @RequestParam("newRole") Role newRole) {
+        accountService.changeRole(id, newRole);
+        return Routes.REDIRECT + Routes.Role.ADMIN + Routes.Account.ROOT;
+    }
 }

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

@@ -4,6 +4,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import com.attendenceSystem.module.user.dto.response.UserResponse;
+import com.attendenceSystem.module.user.entity.enums.Role;
 
 public interface AccountService {
     Page<UserResponse> getUsers(Pageable pageable);
@@ -12,4 +13,5 @@ public interface AccountService {
     void deactivateUser(Long id);
     void activateUser(Long id);
     void changeDepartment(Long id, String departmentCode);
+    void changeRole(Long id, Role newRole);
 }

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

@@ -96,6 +96,26 @@ public class AccountServiceImpl implements AccountService {
         userRepository.save(user);
     }
 
+    @Transactional
+    @Override
+    public void changeRole(final Long id, final Role newRole) {
+        User user = findById(id);
+        validateAdminAction(user);
+
+        // Không cho đổi thành ADMIN
+        if (newRole == Role.ADMIN) {
+            throw new IllegalStateException("Không thể đổi quyền thành ADMIN");
+        }
+
+        // Không cho đổi role của admin
+        if (user.getRole() == Role.ADMIN) {
+            throw new IllegalStateException("Không thể đổi quyền của admin");
+        }
+
+        user.setRole(newRole);
+        userRepository.save(user);
+    }
+
     private User findById(final Long id) {
         return userRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với id: " + id));

src/main/resources/application.properties

@@ -64,3 +64,5 @@ app.timezone=Asia/Ho_Chi_Minh
 # Face ID Configuration
 face-id.api-key=${FACE_ID_API_KEY:dev-secret-key-change-in-production}
 face-id.confidence-threshold=0.90
+
+spring.config.import=optional:file:.env[.properties]

src/main/resources/static/css/account/account-list.css

@@ -226,12 +226,53 @@ tbody tr:hover {
 }
 
 /* ===================================
-   ACTION BUTTONS
+    ROLE CHANGE DROPDOWN
+=================================== */
+
+.role-change {
+    display: flex;
+    align-items: center;
+}
+
+.role-change-form {
+    display: flex;
+    gap: 6px;
+    align-items: center;
+}
+
+.role-select {
+    height: 38px;
+    padding: 0 10px;
+    border: 1px solid var(--border);
+    border-radius: 10px;
+    background: var(--bg-form);
+    color: var(--text-white);
+    font-size: .85rem;
+    font-weight: 500;
+    cursor: pointer;
+    outline: none;
+    transition: .3s;
+    min-width: 110px;
+}
+
+.role-select:focus {
+    border-color: var(--indigo-06);
+    box-shadow: 0 0 0 4px var(--shadow-box);
+}
+
+.role-select option {
+    background: var(--bg-card);
+    color: var(--text-white);
+}
+
+/* ===================================
+    ACTION BUTTONS
 =================================== */
 
 .actions {
     display: flex;
     gap: 8px;
+    flex-wrap: wrap;
 }
 
 .icon-btn {

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

@@ -65,7 +65,18 @@
                                     <div class="actions"
                                         th:with="canManage=${users.username() != currentUsername and users.role() != 'ADMIN'}">
 
-                                        <button class="icon-btn btn-role" th:if="${canManage}">Đổi quyền</button>
+                                        <div class="role-change" th:if="${canManage}">
+                                            <form th:action="@{/admin/accounts/change-role/{id}(id=${users.id()})}" method="post" class="role-change-form">
+                                                <select name="newRole" class="role-select">
+                                                    <option th:each="role : ${availableRoles}"
+                                                            th:value="${role.name()}"
+                                                            th:text="${role.name()}"
+                                                            th:selected="${role.name() == users.role()}">
+                                                    </option>
+                                                </select>
+                                                <button type="button" class="icon-btn btn-role" onclick="confirmRoleChange(this)">Đổi quyền</button>
+                                            </form>
+                                        </div>
                                         <div th:if="${canManage and users.status() == 'ACTIVE'}">
                                             <form th:action="@{/admin/accounts/deactivate/{id}(id=${users.id()})}" method="post">
                                                 <button class="icon-btn lock">🔒</button>
@@ -115,6 +126,23 @@
     </div>
 
 
+    <!-- CONFIRMATION MODAL FOR ROLE CHANGE -->
+    <div id="roleConfirmModal" class="detail-modal">
+        <div class="detail-content" style="max-width: 480px;">
+            <div class="detail-header">
+                <h2>Xác nhận đổi quyền</h2>
+                <button class="close-btn" onclick="closeRoleConfirm()">✕</button>
+            </div>
+            <div class="detail-body" style="grid-template-columns: 1fr;">
+                <p id="roleConfirmMessage" style="color: #e2e8f0; font-size: 1rem; line-height: 1.6;"></p>
+            </div>
+            <div class="detail-header" style="border-top: 1px solid var(--border); border-bottom: none; justify-content: flex-end; gap: 12px;">
+                <button class="icon-btn" style="background: var(--bg-form);" onclick="closeRoleConfirm()">Hủy</button>
+                <button class="icon-btn btn-role" id="roleConfirmSubmit" style="min-width: 100px;">Xác nhận</button>
+            </div>
+        </div>
+    </div>
+
     <div id="accountModal" class="detail-modal">
 
         <div class="detail-content">
@@ -169,6 +197,42 @@
 
     </div>
 
+<script>
+    let pendingForm = null;
+
+    function confirmRoleChange(button) {
+        const form = button.closest('.role-change-form');
+        const select = form.querySelector('.role-select');
+        const selectedRole = select.options[select.selectedIndex].text;
+        const row = form.closest('tr');
+        const userName = row.querySelector('strong').textContent;
+
+        pendingForm = form;
+
+        document.getElementById('roleConfirmMessage').textContent =
+            'Bạn có chắc chắn muốn đổi quyền của "' + userName + '" thành ' + selectedRole + '?';
+
+        document.getElementById('roleConfirmModal').style.display = 'flex';
+        document.getElementById('roleConfirmSubmit').onclick = function() {
+            if (pendingForm) {
+                pendingForm.submit();
+            }
+        };
+    }
+
+    function closeRoleConfirm() {
+        document.getElementById('roleConfirmModal').style.display = 'none';
+        pendingForm = null;
+    }
+
+    // Close modal when clicking outside
+    document.getElementById('roleConfirmModal').addEventListener('click', function(e) {
+        if (e.target === this) {
+            closeRoleConfirm();
+        }
+    });
+</script>
+
 </body>
 
 </html>