Merge pull request #298 from WeBankPartners/258_validation_of_deleting_ci

#258 Fix the issue of deleting ci

Author: junchensz

cmdb-core/src/main/java/com/webank/cmdb/service/CiService.java

@@ -70,7 +70,7 @@ public interface CiService extends CmdbService {
 
     Object cloneCiAsParent(EntityManager entityManager, int ciTypeId, String guid);
 
-    List<Map<String, Object>> lookupReferenceByCis(int ciTypeId, String guid);
+    List<Map<String, Object>> lookupReferenceByCis(int ciTypeId, String guid, boolean checkFinalState);
 
     List<Map<String, Object>> lookupReferenceToCis(int ciTypeId, String guid);
 

cmdb-core/src/main/java/com/webank/cmdb/service/impl/CiServiceImpl.java

@@ -203,7 +203,7 @@ public synchronized void reload() {
         Map<Integer, List<AdmCiTypeAttr>> referedAttrMap = new HashMap<>();
         ciTypes.forEach(ciType -> {
             if (!CiStatus.shouldBeLoadedForDynamicEntity(CiStatus.fromCode(ciType.getStatus()))) {
-                logger.warn("CiType [{}] status is {} , ignore ...");
+                logger.warn("CiType [{}] status is {} , ignore ...", ciType.getName(), ciType.getStatus());
                 return;
             }
 
@@ -1200,14 +1200,14 @@ public void delete(int ciTypeId, List<String> ids) {
     public void doDelete(EntityManager entityManager, int ciTypeId, String guid, boolean enableStateTransition) {
         DynamicEntityMeta entityMeta = getDynamicEntityMetaMap().get(ciTypeId);
         Object entityBean = validateCi(ciTypeId, guid, entityMeta, entityManager, ACTION_REMOVAL);
-        ciDataInterceptorService.preDelete(ciTypeId, guid, entityMeta);
         if (enableStateTransition) {
+            ciDataInterceptorService.preDelete(ciTypeId, guid, true, entityMeta);
             DynamicEntityHolder entityHolder = new DynamicEntityHolder(entityMeta, entityBean);
             this.stateTransEngine.process(entityManager, ciTypeId, guid, StateOperation.Delete.getCode(), null, entityHolder);
         } else {
+            ciDataInterceptorService.preDelete(ciTypeId, guid, false, entityMeta);
             entityManager.remove(entityBean);
         }
-        //entityManager.flush();
         ciDataInterceptorService.postDelete(ciTypeId, guid, entityMeta);
     }
 
@@ -2059,14 +2059,14 @@ public DynamicEntityHolder getCiHolder(int ciTypeId, String guid) {
     }
 
     @Override
-    public List<Map<String, Object>> lookupReferenceByCis(int ciTypeId, String guid) {
+    public List<Map<String, Object>> lookupReferenceByCis(int ciTypeId, String guid, boolean checkFinalState) {
         List<Map<String, Object>> dependentCis = Lists.newLinkedList();
         List<AdmCiTypeAttr> referredAttrs = ciTypeAttrRepository.findByInputTypeAndReferenceId(InputType.Reference.getCode(), ciTypeId);
         referredAttrs.forEach(attr -> {
             List<Map<String, Object>> ciData = queryWithFilters(attr.getCiTypeId(), Lists.newArrayList(new Filter(attr.getPropertyName(), FilterOperator.Equal.getCode(), guid)), false);
             if (ciData != null && ciData.size() > 0) {
                 ciData.forEach(data -> {
-                    if (isFinalStateCi(attr, data)) {
+                    if (checkFinalState && isFinalStateCi(attr, data)) {
                         return;
                     };
 

cmdb-core/src/main/java/com/webank/cmdb/service/interceptor/CiDataInterceptorService.java

@@ -637,8 +637,8 @@ private void handleReferenceAutoFill(DynamicEntityHolder entityHolder, EntityMan
         });
     }
 
-    public void preDelete(int ciTypeId, String guid, DynamicEntityMeta entityMeta) {
-        List<Map<String, Object>> dependentCis = ciService.lookupReferenceByCis(ciTypeId, guid);
+    public void preDelete(int ciTypeId, String guid, boolean checkFinalState, DynamicEntityMeta entityMeta) {
+        List<Map<String, Object>> dependentCis = ciService.lookupReferenceByCis(ciTypeId, guid, checkFinalState);
         if (!dependentCis.isEmpty()) {
             throw new InvalidArgumentException(String.format("Ci [%s] is referenced by other ci currently, can not be deleted.", guid), dependentCis);
         }

cmdb-core/src/main/resources/database/04.cmdb.experience.data.sql

@@ -1,4 +1,32 @@
 SET FOREIGN_KEY_CHECKS=0;
+INSERT INTO `adm_sequence` (`id_adm_sequence`, `seq_name`, `current_val`, `increment_val`, `length_limitation`, `left_zero_padding`) VALUES
+	(25, 'system_design', 14, 1, 8, 'N'),
+	(26, 'subsys_design', 15, 1, 8, 'N'),
+	(27, 'unit_design', 21, 1, 8, 'N'),
+	(28, 'IDC_design', 3, 1, 8, 'N'),
+	(29, 'zone_design', 7, 1, 8, 'N'),
+	(30, 'DCN_desgin', 8, 1, 8, 'N'),
+	(31, 'resource_set_design', 11, 1, 8, 'N'),
+	(32, 'service_design', 7, 1, 8, 'N'),
+	(33, 'invoke_design', 9, 1, 8, 'N'),
+	(34, 'subsys', 11, 1, 8, 'N'),
+	(35, 'IDC', 21, 1, 8, 'N'),
+	(36, 'zone', 7, 1, 8, 'N'),
+	(37, 'DCN', 13, 1, 8, 'N'),
+	(38, 'resource_set', 13, 1, 8, 'N'),
+	(39, 'zone_link_design', 8, 1, 8, 'N'),
+	(40, 'zone_link', 9, 1, 8, 'N'),
+	(41, 'unit', 10, 1, 8, 'N'),
+	(42, 'package', 15, 1, 8, 'N'),
+	(43, 'network_segment', 13, 1, 8, 'N'),
+	(44, 'ip_addr', 82, 1, 8, 'N'),
+	(45, 'running_instance', 15, 1, 8, 'N'),
+	(46, 'host', 3503, 1, 8, 'N'),
+	(47, 'service', 1, 1, 8, 'N'),
+	(48, 'invoke', 1, 1, 8, 'N'),
+	(49, 'invoke_sequence_design', 1, 1, 8, 'N'),
+	(50, 'block_storage', 5, 1, 8, 'N');
+
 INSERT INTO `DCN` (`guid`, `p_guid`, `r_guid`, `updated_by`, `updated_date`, `created_by`, `created_date`, `key_name`, `state`, `fixed_date`, `code`, `description`, `orchestration`, `biz_key`, `dcn_design`, `name`, `zone`) VALUES
 	('0019_0000000001', NULL, '0019_0000000001', 'admin', '2019-07-24 12:26:42', 'admin', '2019-07-24 07:12:44', 'PRD-GZ1-SF-RDCN', 37, NULL, 'RDCN', 'RDCN', NULL, NULL, '0025_0000000001', 'RDCN1', '0017_0000000001'),
 	('0019_0000000005', NULL, '0019_0000000005', 'admin', '2019-07-24 12:26:43', 'admin', '2019-07-24 07:30:50', 'PRD-GZ1-DMZ-DMZ', 37, NULL, 'DMZ', 'DMZ', NULL, NULL, '0025_0000000002', 'DMZ', '0017_0000000004'),

cmdb-core/src/test/java/com/webank/cmdb/service/CiServiceImplLegacyModelTest.java

@@ -353,7 +353,7 @@ public void deleteReferencedCiThenGetException() {
     @Transactional
     @Test
     public void queryReferenceByCis() {
-        List<Map<String, Object>> cis = ciService.lookupReferenceByCis(2, "0002_0000000001");
+        List<Map<String, Object>> cis = ciService.lookupReferenceByCis(2, "0002_0000000001", false);
         Assert.assertThat(cis.size(), equalTo(13));
     }