move logic after user access check

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java

@@ -115,22 +115,12 @@ public DeleteModelTransportAction(
     protected void doExecute(Task task, ActionRequest request, ActionListener<DeleteResponse> actionListener) {
         MLModelDeleteRequest mlModelDeleteRequest = MLModelDeleteRequest.fromActionRequest(request);
         String modelId = mlModelDeleteRequest.getModelId();
-        try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
-            ActionListener<DeleteResponse> wrappedListener = ActionListener.runBefore(actionListener, () -> context.restore());
-            checkDownstreamTaskBeforeDeleteModel(modelId, wrappedListener);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            actionListener.onFailure(e);
-        }
-
-    }
-
-    private void doDeleteModel(String modelId, ActionListener<DeleteResponse> actionListener) {
         MLModelGetRequest mlModelGetRequest = new MLModelGetRequest(modelId, false, false);
         FetchSourceContext fetchSourceContext = getFetchSourceContext(mlModelGetRequest.isReturnContent());
         GetRequest getRequest = new GetRequest(ML_MODEL_INDEX).id(modelId).fetchSourceContext(fetchSourceContext);
         User user = RestActionUtils.getUserContext(client);
         boolean isSuperAdmin = isSuperAdminUserWrapper(clusterService, client);
+
         try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
             ActionListener<DeleteResponse> wrappedListener = ActionListener.runBefore(actionListener, () -> context.restore());
             client.get(getRequest, ActionListener.wrap(r -> {
@@ -156,7 +146,7 @@ private void doDeleteModel(String modelId, ActionListener<DeleteResponse> action
                                     );
                             } else {
                                 if (isModelNotDeployed(mlModelState)) {
-                                    deleteModel(modelId, isHidden, actionListener);
+                                    checkDownstreamTaskBeforeDeleteModel(modelId, isHidden, actionListener);
                                 } else {
                                     wrappedListener
                                         .onFailure(
@@ -179,7 +169,8 @@ private void doDeleteModel(String modelId, ActionListener<DeleteResponse> action
                                                 )
                                             );
                                     } else if (isModelNotDeployed(mlModelState)) {
-                                        deleteModel(modelId, isHidden, actionListener);
+                                        checkDownstreamTaskBeforeDeleteModel(modelId, isHidden, actionListener);
+                                        ;
                                     } else {
                                         wrappedListener
                                             .onFailure(
@@ -364,7 +355,7 @@ private void checkSearchPipelineBeforeDeleteModel(String modelId, ActionListener
 
     }
 
-    private void checkDownstreamTaskBeforeDeleteModel(String modelId, ActionListener<DeleteResponse> actionListener) {
+    private void checkDownstreamTaskBeforeDeleteModel(String modelId, Boolean isHidden, ActionListener<DeleteResponse> actionListener) {
         CountDownLatch countDownLatch = new CountDownLatch(3);
         AtomicBoolean noneBlocked = new AtomicBoolean(true);
         List<String> errorMessages = new ArrayList<>();
@@ -373,7 +364,7 @@ private void checkDownstreamTaskBeforeDeleteModel(String modelId, ActionListener
             noneBlocked.compareAndSet(true, b);
             if (countDownLatch.getCount() == 0) {
                 if (noneBlocked.get()) {
-                    doDeleteModel(modelId, actionListener);
+                    deleteModel(modelId, isHidden, actionListener);
                 } else {
                     actionListener.onFailure(new OpenSearchStatusException(String.join(",", errorMessages), RestStatus.CONFLICT));
                 }

plugin/src/test/java/org/opensearch/ml/action/models/DeleteModelTransportActionTests.java

@@ -675,7 +675,7 @@ private GetResponse buildResponse(MLModel mlModel) throws IOException {
         return getResponse;
     }
 
-    private void prepare() {
+    private void prepare() throws IOException {
         emptyBulkByScrollResponse = new BulkByScrollResponse(new ArrayList<>(), null);
         SearchHits hits = new SearchHits(new SearchHit[] {}, new TotalHits(0, TotalHits.Relation.EQUAL_TO), 0.0f);
         when(searchResponse.getHits()).thenReturn(hits);
@@ -708,5 +708,12 @@ private void prepare() {
         configDataMap = Map
             .of("model_id", "test_id", "list_model_id", List.of("test_list_id"), "test_map_id", Map.of("test_key", "test_map_id"));
         doAnswer(invocation -> new SearchRequest()).when(agentModelsSearcher).constructQueryRequest(any());
+
+        GetResponse getResponse = prepareMLModel(MLModelState.REGISTERED, null, false);
+        doAnswer(invocation -> {
+            ActionListener<GetResponse> actionListener = invocation.getArgument(1);
+            actionListener.onResponse(getResponse);
+            return null;
+        }).when(client).get(any(), any());
     }
 }