Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Removing changelog item when new state is diferent do closed and exis…
…t ChangeLogItem in WorkItem
  • Loading branch information
DiegoGalante committed Jan 29, 2022
commit 57cfb2824fd3e999b0881fa27c3b06c131249ae1
6 changes: 6 additions & 0 deletions AzureDevopsTracker/Entities/WorkItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class WorkItem : Entity
private readonly List<TimeByState> _timeByState;
public IReadOnlyCollection<TimeByState> TimeByStates => _timeByState;
public string CurrentStatus => _workItemsChanges?.OrderBy(x => x.CreatedAt)?.LastOrDefault()?.NewState;
public string LastStatus => _workItemsChanges?.OrderBy(x => x.CreatedAt)?.ToList()?.Skip(1)?.LastOrDefault()?.OldState;

private WorkItem()
{
Expand Down Expand Up @@ -108,6 +109,11 @@ public void ClearTimesByState()
_timeByState.Clear();
}

public void RemoveChangeLogItem()
{
ChangeLogItem = null;
}

public void VinculateChangeLogItem(ChangeLogItem changeLogItem)
{
if (changeLogItem == null)
Expand Down
23 changes: 22 additions & 1 deletion AzureDevopsTracker/Services/AzureDevopsTrackerService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@ public class AzureDevopsTrackerService : IAzureDevopsTrackerService
{
public readonly IWorkItemRepository _workItemRepository;
public readonly IWorkItemAdapter _workItemAdapter;
public readonly IChangeLogItemRepository _changeLogItemRepository;

public AzureDevopsTrackerService(
IWorkItemAdapter workItemAdapter, IWorkItemRepository workItemRepository)
IWorkItemAdapter workItemAdapter,
IWorkItemRepository workItemRepository,
IChangeLogItemRepository changeLogItemRepository)
{
_workItemAdapter = workItemAdapter;
_workItemRepository = workItemRepository;
_changeLogItemRepository = changeLogItemRepository;
}

public async Task Create(CreateWorkItemDTO create, bool addWorkItemChange = true)
Expand Down Expand Up @@ -163,6 +167,11 @@ public void RemoveTimeByStateFromDataBase(WorkItem workItem)

public void CheckWorkItemAvailableToChangeLog(WorkItem workItem, Fields fields)
{
if (workItem.CurrentStatus != "Closed" &&
workItem.LastStatus == "Closed" &&
workItem.ChangeLogItem != null)
RemoveChangeLogItem(workItem);

if (workItem.CurrentStatus != "Closed" ||
fields.ChangeLogDescription.IsNullOrEmpty())
return;
Expand All @@ -188,6 +197,18 @@ public ChangeLogItem ToChangeLogItem(WorkItem workItem, Fields fields)
{
return new ChangeLogItem(workItem.Id, workItem.Title, fields.ChangeLogDescription, workItem.Type);
}

public void RemoveChangeLogItem(WorkItem workItem)
{
var changeLotItem = _changeLogItemRepository.GetById(workItem.ChangeLogItem?.Id).Result;
if (changeLotItem != null)
{
_changeLogItemRepository.Delete(changeLotItem);
_changeLogItemRepository.SaveChangesAsync().Wait();

workItem.RemoveChangeLogItem();
}
}
#endregion
}
}