yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops

Browse Source
This commit is contained in:
Stephan
2018-07-09 11:49:56 +02:00
parent 2bae3e2eda c56b983cd6
commit f4983a2b21
7 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Core/Services/IMediaService.cs
View File

@@ -237,14 +237,7 @@ namespace Umbraco.Core.Services
/// <param name="parentId">Id of the Media's new Parent</param>
/// <param name="userId">Id of the User moving the Media</param>
void Move(IMedia media, int parentId, int userId = 0);
/// <summary>
/// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
void MoveToRecycleBin(IMedia media, int userId = 0);
/// <summary>
/// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
/// </summary>
@@ -265,34 +258,7 @@ namespace Umbraco.Core.Services
/// <param name="mediaTypeIds">Ids of the <see cref="IMediaType"/>s</param>
/// <param name="userId">Optional Id of the user issueing the delete operation</param>
void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0);
/// <summary>
/// Permanently deletes an <see cref="IMedia"/> object
/// </summary>
/// <remarks>
/// Please note that this method will completely remove the Media from the database,
/// but current not from the file system.
/// </remarks>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
void Delete(IMedia media, int userId = 0);
/// <summary>
/// Saves a single <see cref="IMedia"/> object
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to save</param>
/// <param name="userId">Id of the User saving the Media</param>
/// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
void Save(IMedia media, int userId = 0, bool raiseEvents = true);
/// <summary>
/// Saves a collection of <see cref="IMedia"/> objects
/// </summary>
/// <param name="medias">Collection of <see cref="IMedia"/> to save</param>
/// <param name="userId">Id of the User saving the Media</param>
/// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
void Save(IEnumerable<IMedia> medias, int userId = 0, bool raiseEvents = true);
/// <summary>
/// Gets an <see cref="IMedia"/> object by its 'UniqueId'
/// </summary>

38
src/Umbraco.Core/Services/Implement/MediaService.cs
View File

@@ -743,16 +743,6 @@ namespace Umbraco.Core.Services.Implement
#region Save
/// <summary>
/// Saves a single <see cref="IMedia"/> object
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to save</param>
/// <param name="userId">Id of the User saving the Media</param>
/// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
public void Save(IMedia media, int userId = 0, bool raiseEvents = true)
{
((IMediaServiceOperations) this).Save(media, userId, raiseEvents);
}
/// <summary>
/// Saves a single <see cref="IMedia"/> object
@@ -859,21 +849,7 @@ namespace Umbraco.Core.Services.Implement
#endregion
#region Delete
/// <summary>
/// Permanently deletes an <see cref="IMedia"/> object as well as all of its Children.
/// </summary>
/// <remarks>
/// Please note that this method will completely remove the Media from the database,
/// as well as associated media files from the file system.
/// </remarks>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
public void Delete(IMedia media, int userId = 0)
{
((IMediaServiceOperations) this).Delete(media, userId);
}
/// <summary>
/// Permanently deletes an <see cref="IMedia"/> object
/// </summary>
@@ -1029,16 +1005,6 @@ namespace Umbraco.Core.Services.Implement
#region Move, RecycleBin
/// <summary>
/// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
public void MoveToRecycleBin(IMedia media, int userId = 0)
{
((IMediaServiceOperations) this).MoveToRecycleBin(media, userId);
}
/// <summary>
/// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
/// </summary>
@@ -1090,7 +1056,7 @@ namespace Umbraco.Core.Services.Implement
// if moving to the recycle bin then use the proper method
if (parentId == Constants.System.RecycleBinMedia)
{
MoveToRecycleBin(media, userId);
((IMediaServiceOperations)this).MoveToRecycleBin(media, userId);
return;
}

1
src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
View File

@@ -15,6 +15,7 @@ using Umbraco.Core.Persistence.Dtos;
using Umbraco.Core.Persistence.Repositories.Implement;
using Umbraco.Core.Scoping;
using Umbraco.Tests.Testing;
using Umbraco.Core.Services;
namespace Umbraco.Tests.Persistence.Repositories
{

1
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
View File

@@ -22,6 +22,7 @@ using Current = Umbraco.Web.Composing.Current;
using Umbraco.Tests.Testing;
using LightInject;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
namespace Umbraco.Tests.PublishedContent
{

1
src/Umbraco.Tests/Services/EntityServiceTests.cs
View File

@@ -6,6 +6,7 @@ using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Entities;
using Umbraco.Core.Services;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;

33
src/Umbraco.Tests/Services/MediaServiceTests.cs
View File

@@ -10,6 +10,7 @@ using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.Dtos;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Services;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;
@@ -33,9 +34,9 @@ namespace Umbraco.Tests.Services
for (int i = 0; i < 10; i++)
{
var m1 = MockedMedia.CreateMediaImage(mediaType1, -1);
mediaService.Save(m1);
((IMediaServiceOperations)(mediaService)).Save(m1);
var m2 = MockedMedia.CreateMediaImage(mediaType2, -1);
mediaService.Save(m2);
((IMediaServiceOperations)(mediaService)).Save(m2);
}
long total;
@@ -73,7 +74,7 @@ namespace Umbraco.Tests.Services
var media = mediaService.GetById(mediaItems.Item1.Id);
// Act
mediaService.MoveToRecycleBin(media);
((IMediaServiceOperations)mediaService).MoveToRecycleBin(media);
// Assert
Assert.That(media.ParentId, Is.EqualTo(-21));
@@ -109,7 +110,7 @@ namespace Umbraco.Tests.Services
var media = mediaService.CreateMedia(string.Empty, -1, "video");
// Act & Assert
Assert.Throws<ArgumentException>(() => mediaService.Save(media));
Assert.Throws<ArgumentException>(() => ((IMediaServiceOperations)(mediaService)).Save(media));
}
[Test]
@@ -120,7 +121,7 @@ namespace Umbraco.Tests.Services
ServiceContext.MediaTypeService.Save(mediaType);
var media = mediaService.CreateMedia("Test", -1, "video");
mediaService.Save(media);
((IMediaServiceOperations)(mediaService)).Save(media);
using (var scope = ScopeProvider.CreateScope())
{
@@ -136,7 +137,7 @@ namespace Umbraco.Tests.Services
ServiceContext.MediaTypeService.Save(mediaType);
var media = MockedMedia.CreateMediaImage(mediaType, -1);
mediaService.Save(media);
((IMediaServiceOperations)(mediaService)).Save(media);
var mediaPath = "/media/test-image.png";
var resolvedMedia = mediaService.GetMediaByPath(mediaPath);
@@ -153,7 +154,7 @@ namespace Umbraco.Tests.Services
ServiceContext.MediaTypeService.Save(mediaType);
var media = MockedMedia.CreateMediaImageWithCrop(mediaType, -1);
mediaService.Save(media);
((IMediaServiceOperations)(mediaService)).Save(media);
var mediaPath = "/media/test-image.png";
var resolvedMedia = mediaService.GetMediaByPath(mediaPath);
@@ -170,7 +171,7 @@ namespace Umbraco.Tests.Services
for (int i = 0; i < 10; i++)
{
var c1 = MockedMedia.CreateMediaImage(mediaType, -1);
ServiceContext.MediaService.Save(c1);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1);
}
var service = ServiceContext.MediaService;
@@ -193,17 +194,17 @@ namespace Umbraco.Tests.Services
for (int i = 0; i < 9; i++)
{
var m1 = MockedMedia.CreateMediaImage(mediaType, -1);
ServiceContext.MediaService.Save(m1);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1);
}
var mediaTypeForFolder = MockedContentTypes.CreateImageMediaType("Folder2");
ServiceContext.MediaTypeService.Save(mediaTypeForFolder);
var mediaFolder = MockedMedia.CreateMediaFolder(mediaTypeForFolder, -1);
ServiceContext.MediaService.Save(mediaFolder);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(mediaFolder);
for (int i = 0; i < 10; i++)
{
var m1 = MockedMedia.CreateMediaImage(mediaType, mediaFolder.Id);
ServiceContext.MediaService.Save(m1);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1);
}
var service = ServiceContext.MediaService;
@@ -231,26 +232,26 @@ namespace Umbraco.Tests.Services
//Create and Save folder-Media -> 1050
var folderMediaType = ServiceContext.MediaTypeService.Get(1031);
var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
ServiceContext.MediaService.Save(folder);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder);
//Create and Save folder-Media -> 1051
var folder2 = MockedMedia.CreateMediaFolder(folderMediaType, -1);
ServiceContext.MediaService.Save(folder2);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder2);
//Create and Save image-Media -> 1052
var imageMediaType = ServiceContext.MediaTypeService.Get(1032);
var image = (Media)MockedMedia.CreateMediaImage(imageMediaType, 1050);
ServiceContext.MediaService.Save(image);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(image);
//Create and Save folder-Media that is trashed -> 1053
var folderTrashed = (Media)MockedMedia.CreateMediaFolder(folderMediaType, -21);
folderTrashed.Trashed = true;
ServiceContext.MediaService.Save(folderTrashed);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folderTrashed);
//Create and Save image-Media child of folderTrashed -> 1054
var imageTrashed = (Media)MockedMedia.CreateMediaImage(imageMediaType, folderTrashed.Id);
imageTrashed.Trashed = true;
ServiceContext.MediaService.Save(imageTrashed);
((IMediaServiceOperations)(ServiceContext.MediaService)).Save(imageTrashed);
return new Tuple<IMedia, IMedia, IMedia, IMedia, IMedia>(folder, folder2, image, folderTrashed, imageTrashed);

1
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
View File

@@ -9,6 +9,7 @@ using Umbraco.Web.WebServices;
using Umbraco.Core.Models.Membership;
using Umbraco.Web.Composing;
using Umbraco.Web._Legacy.UI;
using Umbraco.Core.Services;
namespace umbraco.presentation.webservices
{