fix (#291)

oceanbase · Sep 10, 2023 · b528db7 · b528db7
1 parent 957a1f1
commit b528db7
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 10 deletions.
diff --git a/...er/odc-service/src/main/java/com/oceanbase/odc/metadb/iam/UserOrganizationRepository.java b/...er/odc-service/src/main/java/com/oceanbase/odc/metadb/iam/UserOrganizationRepository.java
@@ -21,4 +21,6 @@
 public interface UserOrganizationRepository extends JpaRepository<UserOrganizationEntity, Long>,
  JpaSpecificationExecutor<UserOrganizationEntity> {
  boolean existsByOrganizationId(Long organizationId);
+
+ boolean existsByOrganizationIdAndUserId(Long organizationId, Long userId);
 }
diff --git a/...ain/java/com/oceanbase/odc/service/collaboration/DefaultOrganizationResourceMigrator.java b/...ain/java/com/oceanbase/odc/service/collaboration/DefaultOrganizationResourceMigrator.java
@@ -75,6 +75,9 @@ public class DefaultOrganizationResourceMigrator implements OrganizationResource
  @Autowired
  private VerticalPermissionValidator verticalPermissionValidator;
 
+ @Autowired
+ private UserOrganizationMigrator userOrganizationMigrator;
+
  @Override
  public void migrate(@NonNull User user) {
  if (Objects.isNull(user)) {
@@ -92,6 +95,7 @@ public void migrate(@NonNull User user) {
  user.getOrganizationId(), user.getId());
  ruleApplyingMigrator.migrate(user.getOrganizationId());
  }
+ userOrganizationMigrator.migrate(user);
  return null;
  } catch (Exception ex) {
  transactionStatus.setRollbackOnly();

diff --git a/...rvice/src/main/java/com/oceanbase/odc/service/collaboration/TeamOrganizationMigrator.java b/...rvice/src/main/java/com/oceanbase/odc/service/collaboration/TeamOrganizationMigrator.java
@@ -38,7 +38,6 @@
 import com.oceanbase.odc.metadb.connection.ConnectionConfigRepository;
 import com.oceanbase.odc.metadb.iam.OrganizationRepository;
 import com.oceanbase.odc.metadb.iam.RoleRepository;
-import com.oceanbase.odc.metadb.iam.UserOrganizationEntity;
 import com.oceanbase.odc.metadb.iam.UserOrganizationRepository;
 import com.oceanbase.odc.service.common.migrate.DefaultValueEncoderFactory;
 import com.oceanbase.odc.service.common.migrate.DefaultValueGeneratorFactory;
@@ -89,25 +88,21 @@ public class TeamOrganizationMigrator {
 
  @Transactional(rollbackFor = Exception.class)
  public void migrate(@NonNull User user) {
- UserOrganizationEntity userOrganizationEntity = new UserOrganizationEntity();
- userOrganizationEntity.setOrganizationId(user.getOrganizationId());
- userOrganizationEntity.setUserId(user.getId());
- UserOrganizationEntity saved = userOrganizationRepository.saveAndFlush(userOrganizationEntity);
  /**
  * init resources for this TEAM organization
  */
  ResourceInitializer initializer = new ResourceInitializer(
- getResourceConfig(dataSource, saved.getUserId(), saved.getOrganizationId()));
+ getResourceConfig(dataSource, user.getId(), user.getOrganizationId()));
  try {
  initializer.init();
- migrateDataSource(saved.getOrganizationId());
- migrateRole(saved.getOrganizationId());
+ migrateDataSource(user.getOrganizationId());
+ migrateRole(user.getOrganizationId());
  } catch (Exception e) {
- throw new RuntimeException("init organization resource failed, organizationId=" + saved.getOrganizationId(),
+ throw new RuntimeException("init organization resource failed, organizationId=" + user.getOrganizationId(),
  e);
  }
  log.info("create TEAM organization and resources for user succeed, userId={}, organizationId={}",
- saved.getUserId(), saved.getOrganizationId());
+ user.getId(), user.getOrganizationId());
  }
 
  private ResourceConfig getResourceConfig(DataSource dataSource, Long userId, Long organizationId) {

diff --git a/...rvice/src/main/java/com/oceanbase/odc/service/collaboration/UserOrganizationMigrator.java b/...rvice/src/main/java/com/oceanbase/odc/service/collaboration/UserOrganizationMigrator.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023 OceanBase.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.oceanbase.odc.service.collaboration;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import com.oceanbase.odc.core.authority.util.SkipAuthorize;
+import com.oceanbase.odc.metadb.iam.UserOrganizationEntity;
+import com.oceanbase.odc.metadb.iam.UserOrganizationRepository;
+import com.oceanbase.odc.service.iam.model.User;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Author: Lebie
+ * @Date: 2023/9/10 00:59
+ * @Description: []
+ */
+@Slf4j
+@Service
+@Validated
+@SkipAuthorize
+public class UserOrganizationMigrator {
+ @Autowired
+ private UserOrganizationRepository userOrganizationRepository;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void migrate(User user) {
+ if (!userOrganizationRepository.existsByOrganizationIdAndUserId(user.getOrganizationId(), user.getId())) {
+ UserOrganizationEntity userOrganizationEntity = new UserOrganizationEntity();
+ userOrganizationEntity.setOrganizationId(user.getOrganizationId());
+ userOrganizationEntity.setUserId(user.getId());
+ userOrganizationRepository.saveAndFlush(userOrganizationEntity);
+ }
+ }
+}