Added support for deletion of Simulated Processed Result Transaction

Evolveum · Feb 3, 2023 · 3befabc · 3befabc
1 parent 9adb4e8
commit 3befabc
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/simulation/SimulationResultManagerImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/simulation/SimulationResultManagerImpl.java
@@ -167,7 +167,11 @@ private SimulationDefinitionType findDefinitionById(@NotNull String id) throws C
      * If they exist, they were probably left there from the previously suspended (and now resumed) execution.
      */
     void deleteTransactionIfPresent(String simulationResultOid, String transactionId, OperationResult result) {
-        // TODO implement
+        try {
+            repository.deleteSimulatedProcessedObjects(simulationResultOid, transactionId, result);
+        } catch (SchemaException | ObjectNotFoundException e) {
+            throw new SystemException(e);
+        }
     }
 
     @Override

diff --git a/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java b/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
@@ -339,7 +339,7 @@ interface ModificationsSupplier<T extends ObjectType> {
 
 
     @Experimental
-    default ModifyObjectResult<SimulationResultType> deleteSimulatedProcessedObjects(String oid, @Nullable String transactionId, OperationResult parentResult) {
+    default ModifyObjectResult<SimulationResultType> deleteSimulatedProcessedObjects(String oid, @Nullable String transactionId, OperationResult parentResult) throws SchemaException, ObjectNotFoundException {
         throw new UnsupportedOperationException("Not supported yet");
     }
 

diff --git a/repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java b/repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
@@ -172,6 +172,7 @@ public <T extends ObjectType> String addObject(@NotNull PrismObject<T> object, R
         return modificationOpHandler.addObject(object, options, parentResult);
     }
 
+    @Override
     @NotNull
     public <T extends ObjectType> ModifyObjectResult<T> modifyObject(
             @NotNull Class<T> type, @NotNull String oid, @NotNull Collection<? extends ItemDelta<?, ?>> modifications,
@@ -219,6 +220,12 @@ public <T extends ObjectType> ModifyObjectResult<T> modifyObject(
                 type, oid, getOptions, modificationsSupplier, modifyOptions, parentResult);
     }
 
+    @Override
+    public ModifyObjectResult<SimulationResultType> deleteSimulatedProcessedObjects(String oid,
+            @Nullable String transactionId, OperationResult parentResult) throws SchemaException, ObjectNotFoundException {
+        return repositoryService.deleteSimulatedProcessedObjects(oid, transactionId, parentResult);
+    }
+
     @NotNull
     @Override
     public <T extends ObjectType> DeleteObjectResult deleteObject(Class<T> type, String oid, OperationResult parentResult)

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
@@ -58,6 +58,8 @@
 import com.evolveum.midpoint.repo.sqale.qmodel.ref.QObjectReference;
 import com.evolveum.midpoint.repo.sqale.qmodel.ref.QObjectReferenceMapping;
 import com.evolveum.midpoint.repo.sqale.qmodel.ref.QReferenceMapping;
+import com.evolveum.midpoint.repo.sqale.qmodel.simulation.QProcessedObject;
+import com.evolveum.midpoint.repo.sqale.qmodel.simulation.QProcessedObjectMapping;
 import com.evolveum.midpoint.repo.sqale.update.AddObjectContext;
 import com.evolveum.midpoint.repo.sqale.update.RootUpdateContext;
 import com.evolveum.midpoint.repo.sqlbase.*;
@@ -743,6 +745,34 @@ private void logTraceModifications(@NotNull Collection<? extends ItemDelta<?, ?>
         }
     }
 
+    @Override
+    public ModifyObjectResult<SimulationResultType> deleteSimulatedProcessedObjects(String oid,
+            @Nullable String transactionId, OperationResult parentResult) throws SchemaException, ObjectNotFoundException {
+        // Should we select
+        var operationResult = parentResult.createSubresult("deleteSimulatedProcessedObjects");
+        try (JdbcSession jdbcSession = sqlRepoContext.newJdbcSession().startTransaction()) {
+            RootUpdateContext<SimulationResultType, QObject<MObject>, MObject> update = prepareUpdateContext(jdbcSession, SimulationResultType.class, SqaleUtils.oidToUuidMandatory(oid));
+
+
+            QProcessedObject alias = QProcessedObjectMapping.getProcessedObjectMapping().defaultAlias();
+            jdbcSession.newDelete(alias)
+                .where(alias.ownerOid.eq(SqaleUtils.oidToUuidMandatory(oid))
+                        .and(alias.transactionId.eq(transactionId))
+                        )
+                .execute();
+            update.finishExecutionOwn();
+            jdbcSession.commit();
+            return new ModifyObjectResult<>(update.getPrismObject(), update.getPrismObject(), Collections.emptyList());
+        } catch (RepositoryException | RuntimeException e) {
+            throw handledGeneralException(e, operationResult);
+        } catch (Throwable t) {
+            recordFatalError(operationResult, t);
+            throw t;
+        } finally {
+            operationResult.close();
+        }
+    }
+
     @Override
     public @NotNull <T extends ObjectType> DeleteObjectResult deleteObject(
             Class<T> type, String oid, OperationResult parentResult)