Skip to content

Commit 5170043

Browse files
committed
feat:add user_id to k8s response
1 parent eee2efc commit 5170043

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.poolc.api.kubernetes.dto;
2+
3+
public interface ActiveMemberDto {
4+
String getMember_uuid();
5+
String getLogin_id();
6+
}

src/main/java/org/poolc/api/kubernetes/dto/GetKubernetesResponseDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
@Getter
99
public class GetKubernetesResponseDto {
10-
private final List<String> activeMembers;
10+
private final List<ActiveMemberDto> activeMembers;
1111

1212
@JsonCreator
13-
public GetKubernetesResponseDto(List<String> activeMembers) {
13+
public GetKubernetesResponseDto(List<ActiveMemberDto> activeMembers) {
1414
this.activeMembers = activeMembers;
1515
}
1616
}

src/main/java/org/poolc/api/kubernetes/repository/KubernetesRepository.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.poolc.api.kubernetes.repository;
22

33
import org.poolc.api.kubernetes.domain.KubernetesMapping;
4+
import org.poolc.api.kubernetes.dto.ActiveMemberDto;
45
import org.springframework.data.jpa.repository.JpaRepository;
56
import org.springframework.data.jpa.repository.Modifying;
67
import org.springframework.data.jpa.repository.Query;
@@ -12,19 +13,22 @@
1213
public interface KubernetesRepository extends JpaRepository<KubernetesMapping, Long> {
1314

1415

15-
@Query(value = "SELECT DISTINCT MEMBER_UUID\n" +
16-
"FROM ROLES\n" +
17-
"WHERE MEMBER_UUID IN (\n" +
16+
@Query(value = "SELECT DISTINCT T2.MEMBER_UUID\n" +
17+
" , (SELECT login_id" +
18+
" FROM MEMBER T1" +
19+
" WHERE T1.UUID = T2.MEMBER_UUID)\n" +
20+
"FROM ROLES T2\n" +
21+
"WHERE T2.MEMBER_UUID IN (\n" +
1822
" SELECT MEMBER_UUID\n" +
1923
" FROM ROLES\n" +
2024
" WHERE ROLES = 'MEMBER'\n" +
2125
")\n" +
22-
"AND MEMBER_UUID NOT IN (\n" +
26+
"AND T2.MEMBER_UUID NOT IN (\n" +
2327
" SELECT MEMBER_UUID\n" +
2428
" FROM ROLES\n" +
2529
" WHERE ROLES = 'INACTIVE'\n" +
2630
")", nativeQuery = true)
27-
List<String> findAllActiveMembers();
31+
List<ActiveMemberDto> findAllActiveMembers();
2832

2933
@Modifying
3034
@Transactional

src/main/java/org/poolc/api/kubernetes/service/KubernetesService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.RequiredArgsConstructor;
44
import org.poolc.api.kubernetes.domain.KubernetesMapping;
5+
import org.poolc.api.kubernetes.dto.ActiveMemberDto;
56
import org.poolc.api.kubernetes.repository.KubernetesRepository;
67
import org.springframework.beans.factory.annotation.Value;
78
import org.springframework.stereotype.Service;
@@ -19,7 +20,7 @@ public class KubernetesService {
1920
@Value("${kubernetes.api.key}")
2021
private String API_KEY;
2122

22-
public List<String> getAllActiveMembers(String apiKey) {
23+
public List<ActiveMemberDto> getAllActiveMembers(String apiKey) {
2324
if(!isValidApiKey(apiKey)) {
2425
throw new IllegalArgumentException("Invalid API key");
2526
}

0 commit comments

Comments
 (0)