fix: restore dataContractLatest relationship on single-version delete (DQ-665)

When deleting only the latest contract version, the dataContractLatest
relationship edge was left in DELETED state because JanusGraph doesn't
restore previously-replaced edges. This caused the UI to show "something
went wrong" on the asset's contract tab.

Fix: restoreAssetContractPointers() uses entityStore.createOrUpdate() to
re-establish the dataContractLatest (and dataContractLatestCertified if
VERIFIED) relationship edges pointing to the previous version.

Also adds __state=ACTIVE filter to getSecondLatestVersion ES query to
avoid matching soft-deleted contracts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: shivahanumanthula-atlan

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/preprocessor/contract/ContractPreProcessor.java

@@ -157,11 +157,7 @@ private void processSingleVersionDelete(String contractGuid, String assetGuid) t
         AtlasEntity previousVersion = getSecondLatestVersion(assetGuid);
 
         if (previousVersion != null) {
-            // Previous version becomes the new latest — asset relationship edges to the
-            // deleted contract are auto-removed by JanusGraph on hard delete.
-            // The dataContractLatest/dataContractLatestCertified edges will be set by
-            // the next create/update operation on this contract. For now, just ensure
-            // hasContract stays true since versions remain.
+            restoreAssetContractPointers(assetGuid, previousVersion);
             LOG.info("processSingleVersionDelete: contract={}, asset={}, previousVersion={}",
                     contractGuid, assetGuid, previousVersion.getGuid());
         } else {
@@ -170,6 +166,38 @@ private void processSingleVersionDelete(String contractGuid, String assetGuid) t
         }
     }
 
+    private void restoreAssetContractPointers(String assetGuid, AtlasEntity previousVersion) throws AtlasBaseException {
+        AtlasVertex assetVertex = AtlasGraphUtilsV2.findByGuid(assetGuid);
+        if (assetVertex == null) {
+            LOG.warn("Asset vertex not found for guid {}, cannot restore contract pointers", assetGuid);
+            return;
+        }
+
+        String assetTypeName = GraphHelper.getTypeName(assetVertex);
+        String assetQualifiedName = assetVertex.getProperty(QUALIFIED_NAME, String.class);
+
+        AtlasEntity assetUpdate = new AtlasEntity(assetTypeName);
+        assetUpdate.setGuid(assetGuid);
+        assetUpdate.setAttribute(QUALIFIED_NAME, assetQualifiedName);
+
+        assetUpdate.setRelationshipAttribute(REL_ATTR_LATEST_CONTRACT, getAtlasObjectId(previousVersion));
+
+        String prevStatus = (String) previousVersion.getAttribute(ATTR_CERTIFICATE_STATUS);
+        if (DataContract.Status.VERIFIED.name().equals(prevStatus)) {
+            assetUpdate.setRelationshipAttribute(REL_ATTR_GOVERNED_ASSET_CERTIFIED, getAtlasObjectId(previousVersion));
+        }
+
+        EntityStream entityStream = new AtlasEntityStream(new AtlasEntity.AtlasEntitiesWithExtInfo(assetUpdate));
+
+        try {
+            RequestContext.get().setSkipAuthorizationCheck(true);
+            entityStore.createOrUpdate(entityStream, true);
+            LOG.info("Restored contract pointers on asset {} to previous version {}", assetGuid, previousVersion.getGuid());
+        } finally {
+            RequestContext.get().setSkipAuthorizationCheck(false);
+        }
+    }
+
     private List<AtlasEntityHeader> getAllVersions(String assetGuid) throws AtlasBaseException {
         Map<String, Object> dsl = new HashMap<>();
 
@@ -190,6 +218,7 @@ private AtlasEntity getSecondLatestVersion(String assetGuid) throws AtlasBaseExc
         List<Map<String, Object>> mustClauseList = new ArrayList<>();
         mustClauseList.add(mapOf("term", mapOf("__typeName.keyword", CONTRACT_ENTITY_TYPE)));
         mustClauseList.add(mapOf("term", mapOf(ATTR_ASSET_GUID, assetGuid)));
+        mustClauseList.add(mapOf("term", mapOf("__state", "ACTIVE")));
 
         dsl.put("query", mapOf("bool", mapOf("must", mustClauseList)));
         dsl.put("sort", Collections.singletonList(mapOf(ATTR_CONTRACT_VERSION, mapOf("order", "desc"))));