From b5c6a2088fab6499d499d6d9a6ca98f67546b2f1 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Thu, 4 Apr 2024 09:50:31 +0200
Subject: [PATCH] Return null if container type is not found (#15974)

---
 .../Implement/EntityContainerRepository.cs         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs
index 19110ff926..3d981d5946 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/EntityContainerRepository.cs
@@ -49,7 +49,7 @@ internal class EntityContainerRepository : EntityRepositoryBase<int, EntityConta
             .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,7 +73,7 @@ internal class EntityContainerRepository : EntityRepositoryBase<int, EntityConta
                     GetBaseQuery(false)
                         .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
                         .WhereIn<NodeDto>(x => x.NodeId, batch))
-                .Select(CreateEntity);
+                .Select(CreateEntity).WhereNotNull();
         }
 
         // else
@@ -81,7 +81,7 @@ internal class EntityContainerRepository : EntityRepositoryBase<int, EntityConta
             .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 @@ internal class EntityContainerRepository : EntityRepositoryBase<int, EntityConta
         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,