From 6fb2550690f55efa0064f4de6e0039d33234370c Mon Sep 17 00:00:00 2001
From: Sven Geusens <geusens@gmail.com>
Date: Thu, 12 Oct 2023 07:00:06 +0200
Subject: [PATCH] V14/feature/response model trash tracking (#14948)

* Clearify UmbracoMapper functionality trough comment

* Add trash tracking to doc/media(item) response models

* Add mapping for ITracksTrashing

* Removed uneccesary abstraction and seperation

* Cleanup after removing abstractions

* Cleanup unused DI item

* Clean up and formatting

---------

Co-authored-by: Sven Geusens <sge@umbraco.dk>
Co-authored-by: kjac <kja@umbraco.dk>
---
 .../Factories/DocumentPresentationFactory.cs                    | 2 +-
 .../Mapping/Document/DocumentMapDefinition.cs                   | 1 +
 .../Mapping/Items/ItemTypeMapDefinition.cs                      | 1 +
 .../Mapping/Media/MediaMapDefinition.cs                         | 1 +
 .../ViewModels/Document/DocumentResponseModel.cs                | 2 ++
 .../ViewModels/Document/Item/DocumentItemResponseModel.cs       | 2 ++
 .../ViewModels/Media/MediaResponseModel.cs                      | 2 ++
 .../ViewModels/Media/item/MediaItemResponseModel.cs             | 2 ++
 src/Umbraco.Core/Mapping/IUmbracoMapper.cs                      | 2 +-
 9 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs
index 21a1494c9c..be11fadaf5 100644
--- a/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs
+++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs
@@ -1,7 +1,6 @@
 using Umbraco.Cms.Api.Management.ViewModels.Document;
 using Umbraco.Cms.Api.Management.ViewModels.Document.Item;
 using Umbraco.Cms.Api.Management.ViewModels.DocumentBlueprint.Item;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -49,6 +48,7 @@ public class DocumentPresentationFactory : IDocumentPresentationFactory
             Name = entity.Name ?? string.Empty,
             Id = entity.Key,
             Icon = entity.ContentTypeIcon,
+            IsTrashed = entity.Trashed
         };
 
         IContentType? contentType = _contentTypeService.Get(entity.ContentTypeAlias);
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
index 0bfd701765..8f84060fb5 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
@@ -32,6 +32,7 @@ public class DocumentMapDefinition : ContentMapDefinition<IContent, DocumentValu
                     ? source.PublishDate
                     : source.GetPublishDate(culture);
             });
+        target.IsTrashed = source.Trashed;
     }
 
     private ContentState GetSavedState(IContent content, string? culture)
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs
index 449e6e1c36..5ec71173e8 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs
@@ -112,6 +112,7 @@ public class ItemTypeMapDefinition : IMapDefinition
         target.Icon = source.ContentTypeIcon;
         target.Id = source.Key;
         target.Name = source.Name ?? string.Empty;
+        target.IsTrashed = source.Trashed;
     }
 
     // Umbraco.Code.MapAll
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
index 6696c2dbd2..2d0bf1d38f 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs
@@ -23,5 +23,6 @@ public class MediaMapDefinition : ContentMapDefinition<IMedia, MediaValueModel,
         target.ContentTypeId = source.ContentType.Key;
         target.Values = MapValueViewModels(source);
         target.Variants = MapVariantViewModels(source);
+        target.IsTrashed = source.Trashed;
     }
 }
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs
index 83389fb288..ebf3fa385d 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs
@@ -7,4 +7,6 @@ public class DocumentResponseModel : ContentResponseModelBase<DocumentValueModel
     public IEnumerable<ContentUrlInfo> Urls { get; set; } = Array.Empty<ContentUrlInfo>();
 
     public Guid? TemplateId { get; set; }
+
+    public bool IsTrashed { get; set; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/Item/DocumentItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/Item/DocumentItemResponseModel.cs
index 477c3503bd..10dab656be 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/Item/DocumentItemResponseModel.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/Item/DocumentItemResponseModel.cs
@@ -7,4 +7,6 @@ public class DocumentItemResponseModel : ItemResponseModelBase
     public string? Icon { get; set; }
 
     public Guid ContentTypeId { get; set; }
+
+    public bool IsTrashed { get; set; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Media/MediaResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Media/MediaResponseModel.cs
index 384e4e2895..e1f044e561 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Media/MediaResponseModel.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Media/MediaResponseModel.cs
@@ -5,4 +5,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Media;
 public class MediaResponseModel : ContentResponseModelBase<MediaValueModel, MediaVariantResponseModel>
 {
     public IEnumerable<ContentUrlInfo> Urls { get; set; } = Array.Empty<ContentUrlInfo>();
+
+    public bool IsTrashed { get; set; }
 }
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs
index d638c3216c..6775bc1a91 100644
--- a/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs
+++ b/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs
@@ -5,4 +5,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Media.Item;
 public class MediaItemResponseModel : ItemResponseModelBase
 {
     public string? Icon { get; set; }
+
+    public bool IsTrashed { get; set; }
 }
diff --git a/src/Umbraco.Core/Mapping/IUmbracoMapper.cs b/src/Umbraco.Core/Mapping/IUmbracoMapper.cs
index 5cbee7164c..4cfd976a12 100644
--- a/src/Umbraco.Core/Mapping/IUmbracoMapper.cs
+++ b/src/Umbraco.Core/Mapping/IUmbracoMapper.cs
@@ -30,7 +30,7 @@ public interface IUmbracoMapper
     /// </summary>
     /// <typeparam name="TSource">The source type.</typeparam>
     /// <typeparam name="TTarget">The target type.</typeparam>
-    /// <param name="ctor">A constructor method.</param>
+    /// <param name="ctor">A constructor method. Will not be used if the mapping call receives a Target object</param>
     /// <param name="map">A mapping method.</param>
     void Define<TSource, TTarget>(
         Func<TSource, MapperContext, TTarget> ctor,