WIP: Audit Shadow Kind/Intent

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
Evolveum · Aug 21, 2023 · 6e58995 · 6e58995
1 parent c6dada6
commit 6e58995
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 0 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
@@ -313,6 +313,8 @@ public static void toObjectDeltaOperationType(ObjectDeltaOperation<?> odo, Objec
         if (odo.getResourceName() != null) {
             odoBean.setResourceName(new PolyStringType(odo.getResourceName()));
         }
+        odoBean.setShadowKind(odo.getShadowKind());
+        odoBean.setShadowIntent(odo.getShadowIntent());
     }
 
     private static ChangeTypeType convertChangeType(ChangeType changeType) {

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java
@@ -15,6 +15,8 @@
 
 import com.evolveum.midpoint.util.MiscUtil;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -41,6 +43,9 @@ public class ObjectDeltaOperation<O extends ObjectType> implements DebugDumpable
     private String resourceOid;
     private PolyString resourceName;
 
+    private ShadowKindType shadowKind;
+    private String shadowIntent;
+
     public ObjectDeltaOperation() {
         super();
     }
@@ -359,4 +364,20 @@ public boolean wasReallyExecuted() {
     public String getOid() {
         return objectDelta != null ? objectDelta.getOid() : null;
     }
+
+    public void setShadowKind(ShadowKindType kind) {
+        this.shadowKind = kind;
+    }
+
+    public void setShadowIntent(String intent) {
+        this.shadowIntent = intent;
+    }
+
+    public ShadowKindType getShadowKind() {
+        return this.shadowKind;
+    }
+
+    public String getShadowIntent() {
+        return shadowIntent;
+    }
 }
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -17866,6 +17866,21 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+
+            <xsd:element name="shadowKind" type="tns:ShadowKindType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Shadow kind of the shadow, that is related to this operation.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="shadowIntent" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Shadow kind of the shadow, that is related to this operation.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 

diff --git a/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/RawChangesExecutor.java b/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/RawChangesExecutor.java
@@ -204,6 +204,8 @@ private ObjectDeltaOperation<? extends ObjectType> prepareObjectDeltaOperation(O
                 ShadowType shadow = (ShadowType) objectToDetermineDetailsForAudit;
                 odoToAudit.setResourceOid(ShadowUtil.getResourceOid(shadow));
                 odoToAudit.setResourceName(ShadowUtil.getResourceName(shadow));
+                odoToAudit.setShadowKind(ShadowUtil.getKind(shadow));
+                odoToAudit.setShadowIntent(ShadowUtil.getIntent(shadow));
             }
         }
         return odoToAudit;

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java
@@ -221,6 +221,9 @@ private Collection<MAuditDelta> prepareDeltas(Collection<ObjectDeltaOperation<?>
                 deltaRow.resourceNameOrig = deltaOperation.getResourceName().getOrig();
                 deltaRow.resourceNameNorm = deltaOperation.getResourceName().getNorm();
             }
+            deltaRow.shadowKind = deltaOperation.getShadowKind();
+            deltaRow.shadowIntent = deltaOperation.getShadowIntent();
+
             deltaRow.checksum = computeChecksum(deltaRow.delta, fullResultForCheckSum);
             return deltaRow;
         } catch (Exception ex) {

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/MAuditDelta.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/MAuditDelta.java
@@ -12,6 +12,7 @@
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
 import com.evolveum.prism.xml.ns._public.types_3.ChangeTypeType;
 
 /**
@@ -32,6 +33,10 @@ public class MAuditDelta {
     public UUID resourceOid;
     public String resourceNameNorm;
     public String resourceNameOrig;
+
+    public ShadowKindType shadowKind;
+    public String shadowIntent;
+
     public OperationResultStatusType status;
 
     // "transient" fields not used by Querydsl

diff --git a/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditDeltaMapping.java b/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditDeltaMapping.java
@@ -26,6 +26,8 @@
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectDeltaOperationType.*;
+
 /**
  * Mapping between {@link QAuditDelta} and {@link ObjectDeltaOperationType}.
  */
@@ -48,6 +50,11 @@ public static QAuditDeltaMapping get() {
     private QAuditDeltaMapping(@NotNull SqaleRepoContext repositoryContext) {
         super(TABLE_NAME, DEFAULT_ALIAS_NAME,
                 ObjectDeltaOperationType.class, QAuditDelta.class, repositoryContext);
+        // FIXME: Add mappers
+        addItemMapping(F_RESOURCE_OID);
+        addItemMapping(F_SHADOW_INTENT);
+        addItemMapping(F_SHADOW_KIND);
+
     }
 
     @Override
@@ -71,6 +78,8 @@ public ObjectDeltaOperationType toSchemaObject(MAuditDelta row) {
             odo.setResourceName(new PolyStringType(
                     new PolyString(row.resourceNameOrig, row.resourceNameNorm)));
         }
+        odo.setShadowKind(row.shadowKind);
+        odo.setShadowIntent(row.shadowIntent);
 
         return odo;
     }

diff --git a/...src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditEventRecordMapping.java b/...src/main/java/com/evolveum/midpoint/repo/sqale/audit/qmodel/QAuditEventRecordMapping.java
@@ -13,6 +13,9 @@
 import java.util.*;
 import java.util.function.Function;
 
+import com.evolveum.midpoint.repo.sqlbase.mapping.TableRelationResolver;
+
+import com.google.common.collect.Table;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.ArrayPath;
 import org.jetbrains.annotations.NotNull;
@@ -114,6 +117,9 @@ private QAuditEventRecordMapping(@NotNull SqaleRepoContext repositoryContext) {
                 ctx -> new AuditPropertiesItemFilterProcessor(ctx, q -> q.properties)));
 
         addItemMapping(F_CUSTOM_COLUMN_PROPERTY, AuditCustomColumnItemFilterProcessor.mapper());
+
+        addRelationResolver(F_DELTA,
+                TableRelationResolver.usingJoin(QAuditDeltaMapping::get, (r,d) -> r.id.eq(d.recordId)));
     }
 
     @Override