Get User and Projects in single call

Zenmo · Jan 27, 2025 · cedfd7f · cedfd7f
1 parent 87a170b
commit cedfd7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/frontend/src/admin/user-form.tsx b/frontend/src/admin/user-form.tsx
@@ -39,7 +39,7 @@ export const UserForm: FunctionComponent = () => {
             const fetchUser = async () => {
                 setLoading(true);
                 try {
-                    const response = await fetch(`${import.meta.env.VITE_ZTOR_URL}/users/${userId}`, {
+                    const response = await fetch(`${import.meta.env.VITE_ZTOR_URL}/users/${userId}/projects`, {
                         credentials: "include",
                     });
                     if (response.status === 401) {
@@ -50,6 +50,8 @@ export const UserForm: FunctionComponent = () => {
                         const userData = await response.json();
                         setUser(userData);
                         setOriginalData(userData);
+                        setUserProjects(userData.projects)
+
                     } else {
                         alert(`Error fetching user: ${response.statusText}`);
                     }
@@ -60,20 +62,6 @@ export const UserForm: FunctionComponent = () => {
                 }
             };
 
-            const fetchProjects = async () => {
-                try {
-                    const response = await fetch(`${import.meta.env.VITE_ZTOR_URL}/users/${userId}/projects`, {
-                        credentials: "include",
-                    });
-                    if (!response.ok) return
-
-                    setUserProjects(projectsFromJson(await response.text()))
-                } catch (error) {
-                    console.error("Error fetching projects:", error);
-                }
-            };
-
-            fetchProjects();
             fetchUser();
         } else {
             setIsEditing(true);

diff --git a/zorm/src/main/kotlin/com/zenmo/orm/user/UserRepository.kt b/zorm/src/main/kotlin/com/zenmo/orm/user/UserRepository.kt
@@ -28,6 +28,12 @@ class UserRepository(
                 }
         }
     }
+
+    fun getUserAndProjects(userId: UUID): User {
+        return getUsersAndProjects(
+            (UserTable.id eq userId)
+        ).first()
+    }
 
     fun getUsersAndProjects(filter: Op<Boolean> = Op.TRUE): List<User> {
         return transaction(db) {

diff --git a/ztor/src/main/kotlin/com/zenmo/ztor/plugins/Databases.kt b/ztor/src/main/kotlin/com/zenmo/ztor/plugins/Databases.kt
@@ -65,7 +65,7 @@ fun Application.configureDatabases(): Database {
         get("/users/{userId}/projects") {
             asAdmin {
                 val userId = UUID.fromString(call.parameters["userId"])
-                val user = projectRepository.getProjectsByUserId(userId)
+                val user = userRepository.getUserAndProjects(userId)
                 call.respond(HttpStatusCode.OK, user)
             }
         }