Return null if container type is not found (#15974)

umbraco · Apr 4, 2024 · b5c6a20 · b5c6a20
1 parent be16aa0
commit b5c6a20
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs
@@ -49,7 +49,7 @@ public IEnumerable<EntityContainer> Get(string name, int level)
             .Where(
                 "text=@name AND level=@level AND nodeObjectType=@umbracoObjectTypeId",
                 new { name, level, umbracoObjectTypeId = NodeObjectTypeId });
-        return Database.Fetch<NodeDto>(sql).Select(CreateEntity);
+        return Database.Fetch<NodeDto>(sql).Select(CreateEntity).WhereNotNull();
     }
 
     // never cache
@@ -73,15 +73,15 @@ protected override IEnumerable<EntityContainer> PerformGetAll(params int[]? ids)
                     GetBaseQuery(false)
                         .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
                         .WhereIn<NodeDto>(x => x.NodeId, batch))
-                .Select(CreateEntity);
+                .Select(CreateEntity).WhereNotNull();
         }
 
         // else
         Sql<ISqlContext> sql = GetBaseQuery(false)
             .Where("nodeObjectType=@umbracoObjectTypeId", new { umbracoObjectTypeId = NodeObjectTypeId })
             .OrderBy<NodeDto>(x => x.Level);
 
-        return Database.Fetch<NodeDto>(sql).Select(CreateEntity);
+        return Database.Fetch<NodeDto>(sql).Select(CreateEntity).WhereNotNull();
     }
 
     protected override IEnumerable<EntityContainer> PerformGetByQuery(IQuery<EntityContainer> query) =>
@@ -103,16 +103,20 @@ protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
         return sql;
     }
 
-    private static EntityContainer CreateEntity(NodeDto nodeDto)
+    private static EntityContainer? CreateEntity(NodeDto nodeDto)
     {
         if (nodeDto.NodeObjectType.HasValue == false)
         {
             throw new InvalidOperationException("Node with id " + nodeDto.NodeId + " has no object type.");
         }
 
-        // throws if node is not a container
         Guid containedObjectType = EntityContainer.GetContainedObjectType(nodeDto.NodeObjectType.Value);
 
+        if (containedObjectType == Guid.Empty)
+        {
+            return null;
+        }
+
         var entity = new EntityContainer(nodeDto.NodeId, nodeDto.UniqueId,
             nodeDto.ParentId, nodeDto.Path, nodeDto.Level, nodeDto.SortOrder,
             containedObjectType,