Merge pull request #93 from AWS-Cloud-School-6/92-feat-add-subnet-inf…

…o-to-routetable #92 Feat: Add Subnet Info to RouteTable
AWS-Cloud-School-6 · Nov 1, 2024 · e8a5ec8 · e8a5ec8
2 parents 73613f8 + 60e4789
commit e8a5ec8
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 3 deletions.
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.idea/modules/McpBackend.test.iml b/.idea/modules/McpBackend.test.iml
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/AwsResourceService$1.class.uniqueId11 b/build/tmp/compileJava/compileTransaction/stash-dir/AwsResourceService$1.class.uniqueId11
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/AwsResourceService.class.uniqueId10 b/build/tmp/compileJava/compileTransaction/stash-dir/AwsResourceService.class.uniqueId10
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/AIWA/McpBackend/controller/api/dto/routetable/RouteTableResponseDto.java b/src/main/java/AIWA/McpBackend/controller/api/dto/routetable/RouteTableResponseDto.java
@@ -1,5 +1,6 @@
 package AIWA.McpBackend.controller.api.dto.routetable;
 
+import AIWA.McpBackend.controller.api.dto.subnet.SubnetResponseDto;
 import lombok.Getter;
 
 import java.util.List;
@@ -11,12 +12,14 @@ public class RouteTableResponseDto {
     private String vpcId;
     private List<RouteDTO> routes;
     private Map<String, String> tags;
+    private List<SubnetResponseDto> associatedSubnets;
 
-    public RouteTableResponseDto(String routeTableId, String vpcId, List<RouteDTO> routes, Map<String, String> tags) {
+    public RouteTableResponseDto(String routeTableId, String vpcId, List<RouteDTO> routes, Map<String, String> tags, List<SubnetResponseDto> associatedSubnets) {
         this.routeTableId = routeTableId;
         this.vpcId = vpcId;
         this.routes = routes;
         this.tags = tags;
+        this.associatedSubnets = associatedSubnets;
     }
 
     // Getters and Setters

diff --git a/src/main/java/AIWA/McpBackend/service/aws/AwsResourceService.java b/src/main/java/AIWA/McpBackend/service/aws/AwsResourceService.java
@@ -116,16 +116,28 @@ public List<SubnetResponseDto> fetchSubnets(String userId) {
     // Route Tables 가져오기
     public List<RouteTableResponseDto> fetchRouteTables(String userId) {
         initializeClient(userId);
+
+        // 서브넷 정보를 먼저 가져옵니다.
+        List<SubnetResponseDto> allSubnets = fetchSubnets(userId);
+
         DescribeRouteTablesRequest request = DescribeRouteTablesRequest.builder().build();
         DescribeRouteTablesResponse response = ec2Client.describeRouteTables(request);
+
         return response.routeTables().stream()
                 .map(routeTable -> {
                     Map<String, String> tagsMap = routeTable.tags() == null ? Collections.emptyMap() :
                             routeTable.tags().stream().collect(Collectors.toMap(Tag::key, Tag::value));
+
                     List<RouteDTO> routes = routeTable.routes().stream()
                             .map(route -> new RouteDTO(route.gatewayId(), route.destinationCidrBlock()))
                             .collect(Collectors.toList());
-                    return new RouteTableResponseDto(routeTable.routeTableId(), routeTable.vpcId(), routes, tagsMap);
+
+                    // 각 라우팅 테이블과 연결된 서브넷을 필터링합니다.
+                    List<SubnetResponseDto> associatedSubnets = allSubnets.stream()
+                            .filter(subnet -> subnet.getVpcId().equals(routeTable.vpcId()))
+                            .collect(Collectors.toList());
+
+                    return new RouteTableResponseDto(routeTable.routeTableId(), routeTable.vpcId(), routes, tagsMap, associatedSubnets);
                 })
                 .collect(Collectors.toList());
     }