DGRAPHCORE-355: Allow data deletion for non-internal predicates

query/mutation.go

@@ -44,7 +44,7 @@ func ApplyMutations(ctx context.Context, m *pb.Mutations) (*api.TxnContext, erro
 	}
 	m.Edges = edges
 
-	err = checkIfDeletingAclOperation(ctx, m.Edges)
+	err = checkIfDeletingAclOperation(ctx, m.Edges, m.Schema)
 	if err != nil {
 		return nil, err
 	}
@@ -263,7 +263,7 @@ func ToDirectedEdges(gmuList []*dql.Mutation, newUids map[string]uint64) (
 	return edges, nil
 }
 
-func checkIfDeletingAclOperation(ctx context.Context, edges []*pb.DirectedEdge) error {
+func checkIfDeletingAclOperation(ctx context.Context, edges []*pb.DirectedEdge, schemas []*pb.SchemaUpdate) error {
 	// Don't need to make any checks if ACL is not enabled
 	if !x.WorkerConfig.AclEnabled {
 		return nil
@@ -286,6 +286,15 @@ func checkIfDeletingAclOperation(ctx context.Context, edges []*pb.DirectedEdge)
 
 	isDeleteAclOperation := false
 	for _, edge := range edges {
+		unReservedPredicate := false
+		for _, schema := range schemas {
+			if !x.IsReservedPredicate(schema.Predicate) {
+				unReservedPredicate = true
+			}
+		}
+		if unReservedPredicate {
+			continue
+		}
 		// Disallow deleting of guardians group
 		if edge.Entity == guardianUid && edge.Op == pb.DirectedEdge_DEL {
 			isDeleteAclOperation = true
@@ -298,7 +307,7 @@ func checkIfDeletingAclOperation(ctx context.Context, edges []*pb.DirectedEdge)
 		}
 	}
 	if isDeleteAclOperation {
-		return errors.Errorf("Properties of guardians group and groot user cannot be deleted.")
+		return errors.Errorf("Reserved properties of guardians group and groot user cannot be deleted.")
 	}
 	return nil
 }