Skip to content

Commit b3fbe75

Browse files
committed
chore: rename affected resource helpers, add comments
1 parent ac7a15d commit b3fbe75

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/JsonApiDotNetCore/Hooks/Execution/AffectedResourceDiff.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ namespace JsonApiDotNetCore.Hooks
1717
public interface IAffectedResourcesDiff<TEntity> : IAffectedResources<TEntity> where TEntity : class, IIdentifiable
1818
{
1919
HashSet<TEntity> DatabaseValues { get; }
20-
IEnumerable<ResourceDiffPair<TEntity>> GetDiff();
20+
IEnumerable<ResourceDiffPair<TEntity>> GetDiffs();
2121
}
2222

23-
public class ResourceDiff<TEntity> : AffectedResources<TEntity>, IAffectedResourcesDiff<TEntity> where TEntity : class, IIdentifiable
23+
public class AffectedResourceDiff<TEntity> : AffectedResources<TEntity>, IAffectedResourcesDiff<TEntity> where TEntity : class, IIdentifiable
2424
{
2525

2626
private readonly HashSet<TEntity> _databaseValues;
@@ -31,20 +31,22 @@ public class ResourceDiff<TEntity> : AffectedResources<TEntity>, IAffectedResou
3131
/// </summary>
3232
public HashSet<TEntity> DatabaseValues { get => _databaseValues ?? ThrowNoDbValuesError(); }
3333

34-
public ResourceDiff(IEnumerable requestEntities,
34+
public AffectedResourceDiff(IEnumerable requestEntities,
3535
IEnumerable databaseEntities,
3636
Dictionary<RelationshipAttribute, IEnumerable> relationships) : base(requestEntities, relationships)
3737
{
3838
_databaseValues = (HashSet<TEntity>)databaseEntities;
3939
_databaseValuesLoaded |= _databaseValues != null;
4040
}
4141

42-
public IEnumerable<ResourceDiffPair<TEntity>> GetDiff()
42+
public IEnumerable<ResourceDiffPair<TEntity>> GetDiffs()
4343
{
44+
if (!_databaseValuesLoaded) ThrowNoDbValuesError();
45+
4446
foreach (var entity in Entities)
4547
{
4648
TEntity currentValueInDatabase = null;
47-
if (_databaseValuesLoaded) currentValueInDatabase = _databaseValues.Single(e => entity.StringId == e.StringId);
49+
currentValueInDatabase = _databaseValues.Single(e => entity.StringId == e.StringId);
4850
yield return new ResourceDiffPair<TEntity>(entity, currentValueInDatabase);
4951
}
5052
}

src/JsonApiDotNetCore/Hooks/ResourceHookExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public virtual IEnumerable<TEntity> BeforeUpdate<TEntity>(IEnumerable<TEntity> e
4949
{
5050
var relationships = node.RelationshipsToNextLayer.Select(p => p.Attribute).ToArray();
5151
var dbValues = LoadDbValues(typeof(TEntity), (IEnumerable<TEntity>)node.UniqueEntities, ResourceHook.BeforeUpdate, relationships);
52-
var diff = new ResourceDiff<TEntity>(node.UniqueEntities, dbValues, node.PrincipalsToNextLayer());
52+
var diff = new AffectedResourceDiff<TEntity>(node.UniqueEntities, dbValues, node.PrincipalsToNextLayer());
5353
IEnumerable<TEntity> updated = container.BeforeUpdate(diff, pipeline);
5454
node.UpdateUnique(updated);
5555
node.Reassign(entities);

test/UnitTests/ResourceHooks/ResourceHookExecutor/Update/BeforeUpdate_WithDbValues_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void BeforeUpdate_NoImplicit_Without_Child_Hook_Implemented()
210210

211211
private bool TodoCheck(IAffectedResourcesDiff<TodoItem> diff, string checksum)
212212
{
213-
var diffPair = diff.GetDiff().Single();
213+
var diffPair = diff.GetDiffs().Single();
214214
var dbCheck = diffPair.DatabaseValue.Description == checksum;
215215
var reqCheck = diffPair.Entity.Description == null;
216216
return (dbCheck && reqCheck);

test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ void MockHooks<TModel>(Mock<IResourceHookContainer<TModel>> resourceDefinition)
262262
.Verifiable();
263263
resourceDefinition
264264
.Setup(rd => rd.BeforeUpdate(It.IsAny<IAffectedResourcesDiff<TModel>>(), It.IsAny<ResourcePipeline>()))
265-
.Returns<ResourceDiff<TModel>, ResourcePipeline>((entityDiff, context) => entityDiff.Entities)
265+
.Returns<AffectedResourceDiff<TModel>, ResourcePipeline>((entityDiff, context) => entityDiff.Entities)
266266
.Verifiable();
267267
resourceDefinition
268268
.Setup(rd => rd.BeforeDelete(It.IsAny<IAffectedResources<TModel>>(), It.IsAny<ResourcePipeline>()))

0 commit comments

Comments
 (0)