Skip to content

Commit 79c22ae

Browse files
JulianVennenMiniDigger
authored andcommitted
Add user id to Project Members
1 parent b6140e4 commit 79c22ae

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

backend/src/main/java/io/papermc/hangar/db/dao/v1/ProjectsApiDAO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ SELECT count(hp.id)
132132

133133
@RegisterConstructorMapper(ProjectMember.class)
134134
@RegisterColumnMapperFactory(CompactRoleColumnMapperFactory.class)
135-
@SqlQuery("SELECT u.name AS \"user\", array_agg(r.name) roles " +
135+
@SqlQuery("SELECT u.name AS \"user\", u.id AS \"userId\", array_agg(r.name) roles " +
136136
" FROM user_project_roles upr" +
137137
" JOIN users u ON upr.user_id = u.id " +
138138
" JOIN roles r ON upr.role_type = r.name " +
139139
" WHERE upr.project_id = :id " +
140-
" GROUP BY u.name ORDER BY max(r.permission::bigint) DESC " +
140+
" GROUP BY u.name, u.id ORDER BY max(r.permission::bigint) DESC " +
141141
" <offsetLimit>")
142142
List<ProjectMember> getProjectMembers(long id, @BindPagination RequestPagination pagination);
143143

backend/src/main/java/io/papermc/hangar/model/api/project/ProjectMember.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
import io.papermc.hangar.model.common.roles.CompactRole;
44
import java.util.List;
55

6-
public record ProjectMember(String user, List<CompactRole> roles) {
6+
public record ProjectMember(String user, long userId, List<CompactRole> roles) {
77
}

0 commit comments

Comments
 (0)