Skip to content

Commit

Permalink
Implemented clearing down removed links from notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@tstesyn
tstesyn committed Dec 20, 2024
1 parent 5862145 commit fff69fa
Show file tree
Hide file tree
Showing 7 changed files with 505 additions and 27 deletions.
420 changes: 406 additions & 14 deletions Btms.Business.Tests/Services/Linking/LinkingServiceTests.cs
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions Btms.Business/Pipelines/PreProcessing/MovementPreProcessor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class MovementPreProcessor(IMongoDbContext dbContext, ILogger<MovementPre
{
public async Task<PreProcessingResult<Movement>> Process(PreProcessingContext<AlvsClearanceRequest> preProcessingContext)
{

var internalClearanceRequest = AlvsClearanceRequestMapper.Map(preProcessingContext.Message);
var movement = BuildMovement(internalClearanceRequest);
var existingMovement = await dbContext.Movements.Find(movement.Id!);
Expand All @@ -35,7 +34,6 @@ public async Task<PreProcessingResult<Movement>> Process(PreProcessingContext<Al
{
var changeSet = movement.ClearanceRequests[^1].GenerateChangeSet(existingMovement.ClearanceRequests[0]);


var auditEntry = AuditEntry.CreateUpdated(changeSet,
preProcessingContext.MessageId,
movement.ClearanceRequests[0].Header!.EntryVersionNumber.GetValueOrDefault(),
Expand All @@ -61,7 +59,6 @@ public async Task<PreProcessingResult<Movement>> Process(PreProcessingContext<Al

logger.MessageSkipped(preProcessingContext.MessageId, preProcessingContext.Message.Header?.EntryReference!);
return PreProcessResult.Skipped(existingMovement);

}

public static Movement BuildMovement(Model.Alvs.AlvsClearanceRequest request)
Expand Down
67 changes: 62 additions & 5 deletions Btms.Business/Services/Linking/LinkingService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Btms.Model.ChangeLog;
using Btms.Model.Ipaffs;
using Btms.Model.Relationships;
using Json.Path;
using Microsoft.Extensions.Logging;

namespace Btms.Business.Services.Linking;
Expand Down Expand Up @@ -54,6 +55,8 @@ public async Task<LinkResult> Link(LinkContext linkContext, CancellationToken ca
logger.LinkNotAttempted(linkContext.GetType().Name, linkContext.GetIdentifiers());
return new LinkResult(LinkOutcome.NotLinked);
}

await CheckMovementForRemovedLinks(movementLinkContext, cancellationToken);

result = await FindMovementLinks(movementLinkContext.PersistedMovement, cancellationToken);
break;
Expand All @@ -70,7 +73,6 @@ public async Task<LinkResult> Link(LinkContext linkContext, CancellationToken ca
default: throw new ArgumentException("context type not supported");
}


if (result.Outcome == LinkOutcome.NotLinked)
{
logger.LinkNotFound(linkContext.GetType().Name, linkContext.GetIdentifiers());
Expand All @@ -83,9 +85,9 @@ public async Task<LinkResult> Link(LinkContext linkContext, CancellationToken ca
metrics.Linked<ImportNotification>(result.Notifications.Count);

using var transaction = await dbContext.StartTransaction(cancellationToken);
foreach (var notification in result.Notifications)
foreach (var movement in result.Movements)
{
foreach (var movement in result.Movements)
foreach (var notification in result.Notifications)
{
notification.AddRelationship(new TdmRelationshipObject
{
Expand Down Expand Up @@ -129,11 +131,50 @@ await dbContext.Notifications.Update(notification, notification._Etag, transacti
}
}



return result;
}

private async Task CheckMovementForRemovedLinks(MovementLinkContext linkContext,
CancellationToken cancellationToken = default)
{
var jp = JsonPath.Parse($"$.{nameof(Movement._MatchReferences)}");
var pathResult = jp.Evaluate(linkContext!.ChangeSet?.Previous);

var chedRefs = pathResult?.Matches?
.Select(m => m.Value)?
.SelectMany(x => x!.AsArray())
.Select(x => $"{x!.AsValue()}").ToList();

if (chedRefs?.Count > 0)
{
var removedRefs = chedRefs.Select(x => linkContext.PersistedMovement._MatchReferences.Contains(x) == false);
if (removedRefs.Any())
{
foreach (var chedRef in chedRefs)
{
await RemoveMovementLinkFromNotification(linkContext.PersistedMovement.Id, chedRef, cancellationToken);
}
}
}
}

private async Task RemoveMovementLinkFromNotification(string? movementId, string chedRef, CancellationToken cancellationToken = default)
{
var notification = dbContext.Notifications.SingleOrDefault(x => x._MatchReference == chedRef);

if (notification != null)
{
var relationshipLink = notification.Relationships.Movements.Data?
.SingleOrDefault(x => x.Id == movementId && x.Type == "movements");

if (relationshipLink != null)
{
notification.RemoveRelationship(relationshipLink);
await dbContext.Notifications.Update(notification, notification._Etag);
}
}
}

private static bool ShouldLinkMovement(ChangeSet? changeSet)
{
return changeSet is null || changeSet.HasDocumentsChanged();
Expand Down Expand Up @@ -194,4 +235,20 @@ public static bool HasDocumentsChanged(this ChangeSet changeSet)
.Any(x => ItemsRegex().IsMatch(x.Path.ToString())
|| DocumentsRegex().IsMatch(x.Path.ToString()));
}

public static bool LinksToRemove(this ChangeSet changeSet)
{
return changeSet.JsonPatch.Operations
.Any(x => ItemsRegex().IsMatch(x.Path.ToString())
|| DocumentsRegex().IsMatch(x.Path.ToString()));
}

private static void TidyRemovedLinks(this MovementLinkContext linkContext)
{
var changeSet = linkContext.ChangeSet;
changeSet!.JsonPatch.Operations
.Any(x => ItemsRegex().IsMatch(x.Path.ToString())
|| DocumentsRegex().IsMatch(x.Path.ToString()));
bool derp = changeSet is null || changeSet.HasDocumentsChanged();
}
}
13 changes: 13 additions & 0 deletions Btms.Model/Auditing/AuditEntry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,19 @@ public static AuditEntry CreateLinked(string id, int version)
Status = "Linked"
};
}

public static AuditEntry CreateUnlinked(string id, int version, DateTime? lastUpdated)
{
return new AuditEntry
{
Id = id,
Version = version,
CreatedSource = lastUpdated,
CreatedBy = CreatedBySystem,
CreatedLocal = DateTime.UtcNow,
Status = "Unlinked"
};
}

public static AuditEntry CreateMatch(string id, int version)
{
Expand Down
10 changes: 6 additions & 4 deletions Btms.Model/ChangeLog/ChangeSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

namespace Btms.Model.ChangeLog;

public class ChangeSet(JsonPatch jsonPatch)
public class ChangeSet(JsonPatch jsonPatch, JsonNode jsonNodePrevious)
{
private static JsonSerializerOptions _jsonOptions = new()
private static readonly JsonSerializerOptions _jsonOptions = new()
{
TypeInfoResolver = new ChangeSetTypeInfoResolver(),
PropertyNameCaseInsensitive = true,
Expand All @@ -17,15 +17,17 @@ public class ChangeSet(JsonPatch jsonPatch)

public JsonPatch JsonPatch { get; } = jsonPatch;

public JsonNode Previous { get; } = jsonNodePrevious;

public static ChangeSet CreateChangeSet<T>(T current, T previous)
{
var previousNode = JsonNode.Parse(previous.ToJsonString(_jsonOptions));
var currentNode = JsonNode.Parse(current.ToJsonString(_jsonOptions));
var diff = previousNode.CreatePatch(currentNode);

//exclude fields from patch, like _ts, audit entries etc
var operations = diff.Operations.Where(x => !x.Path.ToString().Contains("_ts"));

return new ChangeSet(new JsonPatch(operations));
return new ChangeSet(new JsonPatch(operations), previousNode!);
}
}
18 changes: 18 additions & 0 deletions Btms.Model/Ipaffs/ImportNotification.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,24 @@ public void AddRelationship(TdmRelationshipObject relationship)
AuditEntries.Add(AuditEntry.CreateLinked(string.Empty, Version.GetValueOrDefault()));
}
}

public void RemoveRelationship(RelationshipDataItem relationship)
{
var unlinked = false;

if (Relationships.Movements.Data.Contains(relationship))
{
Relationships.Movements.Data.Remove(relationship);
unlinked = true;
}

Relationships.Movements.Matched = Relationships.Movements.Data.TrueForAll(x => x.Matched.GetValueOrDefault());

if (unlinked)
{
AuditEntries.Add(AuditEntry.CreateUnlinked(string.Empty, Version.GetValueOrDefault(), UpdatedSource));
}
}

public void Changed(AuditEntry auditEntry)
{
Expand Down
1 change: 0 additions & 1 deletion Btms.Model/Movement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public class Movement : IMongoIdentifiable, IDataEntity, IAuditable


[BsonElement("_matchReferences")]
[ChangeSetIgnore]
public List<string> _MatchReferences
{
get
Expand Down

0 comments on commit fff69fa

Please sign in to comment.