[codex] Complete portal OpenAPI migration

.github/workflows/openapi-compatibility.yml

@@ -43,7 +43,6 @@ jobs:
       - name: Run checker tests
         run: |
           python3 scripts/openapi/check_openapi_compatibility_test.py
-          python3 scripts/openapi/collect_portal_frontend_urls_test.py
       - name: Compare portal OpenAPI spec URL against base branch
         env:
           BASE_REF: ${{ github.base_ref }}

CHANGES.md

@@ -16,6 +16,7 @@ Apollo 3.0.0
 * [Change: migrate Apollo Portal namespace core UI operations to OpenAPI](https://github.com/apolloconfig/apollo/pull/5612)
 * [Change: migrate Apollo Portal release, branch, and instance UI operations to OpenAPI](https://github.com/apolloconfig/apollo/pull/5616)
 * [Change: migrate Apollo Portal permission and AccessKey UI operations to OpenAPI](https://github.com/apolloconfig/apollo/pull/5617)
+* [Change: complete Apollo Portal UI management OpenAPI migration](https://github.com/apolloconfig/apollo/pull/5618)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/18?closed=1)

apollo-portal/pom.xml

@@ -27,7 +27,7 @@
 	<artifactId>apollo-portal</artifactId>
 	<name>Apollo Portal</name>
 	<properties>
-		<apollo.openapi.spec.url>https://raw.githubusercontent.com/apolloconfig/apollo-openapi/refs/tags/v0.3.3/apollo-openapi.yaml</apollo.openapi.spec.url>
+		<apollo.openapi.spec.url>https://raw.githubusercontent.com/apolloconfig/apollo-openapi/v0.3.5/apollo-openapi.yaml</apollo.openapi.spec.url>
 		<github.path>${project.artifactId}</github.path>
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 	</properties>
@@ -44,6 +44,7 @@
 		<dependency>
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-openapi</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.openapitools</groupId>

apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerAppOpenApiService.java

@@ -28,10 +28,11 @@
 import com.ctrip.framework.apollo.openapi.model.OpenMissEnvDTO;
 import com.ctrip.framework.apollo.openapi.util.OpenApiModelConverters;
 import com.ctrip.framework.apollo.portal.component.PortalSettings;
-import com.ctrip.framework.apollo.portal.entity.model.AppModel;
+import com.ctrip.framework.apollo.portal.enricher.adapter.OpenAppDtoUserInfoEnrichedAdapter;
 import com.ctrip.framework.apollo.portal.environment.Env;
 import com.ctrip.framework.apollo.portal.listener.AppDeletionEvent;
 import com.ctrip.framework.apollo.portal.listener.AppInfoChangedEvent;
+import com.ctrip.framework.apollo.portal.service.AdditionalUserInfoEnrichService;
 import com.ctrip.framework.apollo.portal.service.AppService;
 import com.ctrip.framework.apollo.portal.service.ClusterService;
 import com.ctrip.framework.apollo.portal.service.RoleInitializationService;
@@ -61,16 +62,19 @@ public class ServerAppOpenApiService implements AppOpenApiService {
   private final AppService appService;
   private final ApplicationEventPublisher publisher;
   private final RoleInitializationService roleInitializationService;
+  private final AdditionalUserInfoEnrichService additionalUserInfoEnrichService;
   private static final Logger logger = LoggerFactory.getLogger(ServerAppOpenApiService.class);
 
   public ServerAppOpenApiService(PortalSettings portalSettings, ClusterService clusterService,
       AppService appService, ApplicationEventPublisher publisher,
-      RoleInitializationService roleInitializationService) {
+      RoleInitializationService roleInitializationService,
+      AdditionalUserInfoEnrichService additionalUserInfoEnrichService) {
     this.portalSettings = portalSettings;
     this.clusterService = clusterService;
     this.appService = appService;
     this.publisher = publisher;
     this.roleInitializationService = roleInitializationService;
+    this.additionalUserInfoEnrichService = additionalUserInfoEnrichService;
   }
 
   private App convert(OpenAppDTO dto) {
@@ -137,7 +141,7 @@ public List<OpenEnvClusterInfo> getEnvClusterInfo(String appId) {
   @Override
   public List<OpenAppDTO> getAllApps() {
     final List<App> apps = this.appService.findAll();
-    return OpenApiModelConverters.fromApps(apps);
+    return enrichApps(OpenApiModelConverters.fromApps(apps));
   }
 
   @Override
@@ -146,7 +150,7 @@ public List<OpenAppDTO> getAppsInfo(List<String> appIds) {
       return Collections.emptyList();
     }
     final List<App> apps = this.appService.findByAppIds(new HashSet<>(appIds));
-    return OpenApiModelConverters.fromApps(apps);
+    return enrichApps(OpenApiModelConverters.fromApps(apps));
   }
 
   @Override
@@ -180,7 +184,7 @@ public List<OpenAppDTO> getAppsBySelf(Set<String> appIds, Integer page, Integer
       return Collections.emptyList();
     }
     List<App> apps = appService.findByAppIds(targetAppIds, pageable);
-    return OpenApiModelConverters.fromApps(apps);
+    return enrichApps(OpenApiModelConverters.fromApps(apps));
   }
 
   /**
@@ -245,4 +249,10 @@ public List<OpenMissEnvDTO> findMissEnvs(String appId) {
     }
     return response;
   }
+
+  private List<OpenAppDTO> enrichApps(List<OpenAppDTO> apps) {
+    additionalUserInfoEnrichService.enrichAdditionalUserInfo(apps,
+        OpenAppDtoUserInfoEnrichedAdapter::new);
+    return apps;
+  }
 }

apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerItemOpenApiService.java

@@ -129,9 +129,9 @@ public void removeItem(String appId, String env, String clusterName, String name
   @Override
   public OpenItemPageDTO findItemsByNamespace(String appId, String env, String clusterName,
       String namespaceName, int page, int size) {
-    PageDTO<com.ctrip.framework.apollo.openapi.dto.OpenItemDTO> items = this.itemService
-        .findItemsByNamespace(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
-    return OpenApiModelConverters.fromLegacyOpenItemPageDTO(items);
+    PageDTO<ItemDTO> items = this.itemService.findItemsByNamespace(appId, Env.valueOf(env),
+        clusterName, namespaceName, page, size);
+    return OpenApiModelConverters.fromItemPageDTO(items);
   }
 
   @Override

apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/server/service/ServerPermissionOpenApiService.java

@@ -239,6 +239,7 @@ public void addCreateApplicationRoleToUsers(List<String> userIds, String operato
   @Override
   public void deleteCreateApplicationRoleFromUser(String userId, String operator) {
     RequestPrecondition.checkArgumentsNotEmpty(userId);
+    checkUserExists(userId);
     rolePermissionService.removeRoleFromUsers(SystemRoleManagerService.CREATE_APPLICATION_ROLE_NAME,
         Sets.newHashSet(userId), operator);
   }
@@ -265,6 +266,7 @@ public void addManageAppMasterRoleToUser(String appId, String userId, String ope
   @Override
   public void removeManageAppMasterRoleFromUser(String appId, String userId, String operator) {
     RequestPrecondition.checkArgumentsNotEmpty(userId);
+    checkUserExists(userId);
     roleInitializationService.initManageAppMasterRole(appId, operator);
     rolePermissionService.removeRoleFromUsers(
         RoleUtils.buildAppRoleName(appId, PermissionType.MANAGE_APP_MASTER),