Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions AzureDevopsTracker/Entities/ChangeLogItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class ChangeLogItem : Entity
public string Description { get; private set; }
public string WorkItemType { get; private set; }
public string ChangeLogId { get; private set; }
public bool WasReleased => string.IsNullOrEmpty(ChangeLogId?.Trim());

/*EF*/
public ChangeLog ChangeLog { get; private set; }
Expand Down
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
24 changes: 23 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,12 @@ public void RemoveTimeByStateFromDataBase(WorkItem workItem)

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

if (workItem.CurrentStatus != "Closed" ||
fields.ChangeLogDescription.IsNullOrEmpty())
return;
Expand All @@ -188,6 +198,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 changeLogItem = _changeLogItemRepository.GetById(workItem.ChangeLogItem?.Id).Result;
if (changeLogItem != null)
{
_changeLogItemRepository.Delete(changeLogItem);
_changeLogItemRepository.SaveChangesAsync().Wait();

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