Fixed: Tag deletion via api if tag is still in use
This commit is contained in:
parent
af5166e95d
commit
5fe34cb593
|
@ -0,0 +1,20 @@
|
||||||
|
using System;
|
||||||
|
using NzbDrone.Common.Exceptions;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore
|
||||||
|
{
|
||||||
|
public class ModelConflictException : NzbDroneException
|
||||||
|
{
|
||||||
|
public ModelConflictException(Type modelType, int modelId)
|
||||||
|
: base("{0} with ID {1} cannot be modified", modelType.Name, modelId)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModelConflictException(Type modelType, int modelId, string message)
|
||||||
|
: base("{0} with ID {1} {2}", modelType.Name, modelId, message)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -142,6 +142,7 @@
|
||||||
<Compile Include="Datastore\Migration\130_episode_last_searched_time.cs" />
|
<Compile Include="Datastore\Migration\130_episode_last_searched_time.cs" />
|
||||||
<Compile Include="Datastore\Migration\129_add_relative_original_path_to_episode_file.cs" />
|
<Compile Include="Datastore\Migration\129_add_relative_original_path_to_episode_file.cs" />
|
||||||
<Compile Include="Datastore\Migration\128_rename_quality_profiles_add_upgrade_allowed.cs" />
|
<Compile Include="Datastore\Migration\128_rename_quality_profiles_add_upgrade_allowed.cs" />
|
||||||
|
<Compile Include="Datastore\ModelConflictException.cs" />
|
||||||
<Compile Include="DecisionEngine\Specifications\AlreadyImportedSpecification.cs" />
|
<Compile Include="DecisionEngine\Specifications\AlreadyImportedSpecification.cs" />
|
||||||
<Compile Include="CustomFilters\CustomFilter.cs" />
|
<Compile Include="CustomFilters\CustomFilter.cs" />
|
||||||
<Compile Include="CustomFilters\CustomFilterRepository.cs" />
|
<Compile Include="CustomFilters\CustomFilterRepository.cs" />
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Tags
|
namespace NzbDrone.Core.Tags
|
||||||
|
@ -10,5 +11,13 @@ namespace NzbDrone.Core.Tags
|
||||||
public List<int> NotificationIds { get; set; }
|
public List<int> NotificationIds { get; set; }
|
||||||
public List<int> RestrictionIds { get; set; }
|
public List<int> RestrictionIds { get; set; }
|
||||||
public List<int> DelayProfileIds { get; set; }
|
public List<int> DelayProfileIds { get; set; }
|
||||||
|
|
||||||
|
public bool InUse
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return (SeriesIds.Any() || NotificationIds.Any() || RestrictionIds.Any() || DelayProfileIds.Any());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.Messaging.Events;
|
using NzbDrone.Core.Messaging.Events;
|
||||||
using NzbDrone.Core.Notifications;
|
using NzbDrone.Core.Notifications;
|
||||||
using NzbDrone.Core.Profiles.Delay;
|
using NzbDrone.Core.Profiles.Delay;
|
||||||
|
@ -147,6 +149,12 @@ namespace NzbDrone.Core.Tags
|
||||||
|
|
||||||
public void Delete(int tagId)
|
public void Delete(int tagId)
|
||||||
{
|
{
|
||||||
|
var details = Details(tagId);
|
||||||
|
if (details.InUse)
|
||||||
|
{
|
||||||
|
throw new ModelConflictException(typeof(Tag), tagId, $"'{details.Label}' cannot be deleted since it's still in use");
|
||||||
|
}
|
||||||
|
|
||||||
_repo.Delete(tagId);
|
_repo.Delete(tagId);
|
||||||
_eventAggregator.PublishEvent(new TagsUpdatedEvent());
|
_eventAggregator.PublishEvent(new TagsUpdatedEvent());
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Data.SQLite;
|
||||||
using FluentValidation;
|
using FluentValidation;
|
||||||
using Nancy;
|
using Nancy;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.Exceptions;
|
using NzbDrone.Core.Exceptions;
|
||||||
using Sonarr.Http.Exceptions;
|
using Sonarr.Http.Exceptions;
|
||||||
using Sonarr.Http.Extensions;
|
using Sonarr.Http.Extensions;
|
||||||
|
@ -23,26 +24,20 @@ namespace Sonarr.Http.ErrorManagement
|
||||||
{
|
{
|
||||||
_logger.Trace("Handling Exception");
|
_logger.Trace("Handling Exception");
|
||||||
|
|
||||||
var apiException = exception as ApiException;
|
if (exception is ApiException apiException)
|
||||||
|
|
||||||
if (apiException != null)
|
|
||||||
{
|
{
|
||||||
_logger.Warn(apiException, "API Error");
|
_logger.Warn(apiException, "API Error");
|
||||||
return apiException.ToErrorResponse();
|
return apiException.ToErrorResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
var validationException = exception as ValidationException;
|
if (exception is ValidationException validationException)
|
||||||
|
|
||||||
if (validationException != null)
|
|
||||||
{
|
{
|
||||||
_logger.Warn("Invalid request {0}", validationException.Message);
|
_logger.Warn("Invalid request {0}", validationException.Message);
|
||||||
|
|
||||||
return validationException.Errors.AsResponse(HttpStatusCode.BadRequest);
|
return validationException.Errors.AsResponse(HttpStatusCode.BadRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
var clientException = exception as NzbDroneClientException;
|
if (exception is NzbDroneClientException clientException)
|
||||||
|
|
||||||
if (clientException != null)
|
|
||||||
{
|
{
|
||||||
return new ErrorModel
|
return new ErrorModel
|
||||||
{
|
{
|
||||||
|
@ -51,9 +46,25 @@ namespace Sonarr.Http.ErrorManagement
|
||||||
}.AsResponse((HttpStatusCode)clientException.StatusCode);
|
}.AsResponse((HttpStatusCode)clientException.StatusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
var sqLiteException = exception as SQLiteException;
|
if (exception is ModelNotFoundException notFoundException)
|
||||||
|
{
|
||||||
|
return new ErrorModel
|
||||||
|
{
|
||||||
|
Message = exception.Message,
|
||||||
|
Description = exception.ToString()
|
||||||
|
}.AsResponse(HttpStatusCode.NotFound);
|
||||||
|
}
|
||||||
|
|
||||||
if (sqLiteException != null)
|
if (exception is ModelConflictException conflictException)
|
||||||
|
{
|
||||||
|
return new ErrorModel
|
||||||
|
{
|
||||||
|
Message = exception.Message,
|
||||||
|
Description = exception.ToString()
|
||||||
|
}.AsResponse(HttpStatusCode.Conflict);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exception is SQLiteException sqLiteException)
|
||||||
{
|
{
|
||||||
if (context.Request.Method == "PUT" || context.Request.Method == "POST")
|
if (context.Request.Method == "PUT" || context.Request.Method == "POST")
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue