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
2 changes: 1 addition & 1 deletion Src/Core/F15/BusinessLogic/F15Service.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CancellationToken ct
Id = request.TodoTaskId,
Content = taskDetail.Content,
DueDate = taskDetail.DueDate,
IsFinished = taskDetail.IsFinished,
IsCompleted = taskDetail.IsCompleted,
IsImportant = taskDetail.IsImportant,
IsInMyDay = taskDetail.IsInMyDay,
Note = taskDetail.Note,
Expand Down
17 changes: 3 additions & 14 deletions Src/Core/F15/DataAccess/F15Repository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,18 @@ public Task<bool> DoesTodoTaskExistAsync(long taskId, CancellationToken ct)

public async Task<F15TodoTaskModel> GetTaskDetailByIdAsync(long taskId, CancellationToken ct)
{
var foundTask = await _appContext
return await _appContext
.Set<TodoTaskEntity>()
.AsNoTracking()
.Where(entity => entity.Id == taskId)
.Select(entity => new TodoTaskEntity
.Select(entity => new F15TodoTaskModel
{
Content = entity.Content,
DueDate = entity.DueDate,
IsInMyDay = entity.IsInMyDay,
IsImportant = entity.IsImportant,
Note = entity.Note,
IsFinished = entity.IsFinished,
IsCompleted = entity.IsFinished,
})
.FirstOrDefaultAsync(ct);

return new()
{
Content = foundTask.Content,
DueDate = foundTask.DueDate,
IsInMyDay = foundTask.IsInMyDay,
IsImportant = foundTask.IsImportant,
Note = foundTask.Note,
IsFinished = foundTask.IsFinished,
};
}
}
2 changes: 1 addition & 1 deletion Src/Core/F15/Mapper/F15HttpResponseMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private static void Init()
Id = appResponse.Body.TodoTask.Id,
Content = appResponse.Body.TodoTask.Content,
DueDate = appResponse.Body.TodoTask.DueDate,
IsFinished = appResponse.Body.TodoTask.IsFinished,
IsCompleted = appResponse.Body.TodoTask.IsCompleted,
IsImportant = appResponse.Body.TodoTask.IsImportant,
IsInMyDay = appResponse.Body.TodoTask.IsInMyDay,
Note = appResponse.Body.TodoTask.Note,
Expand Down
2 changes: 1 addition & 1 deletion Src/Core/F15/Models/F15AppResponseModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public sealed class TodoTaskModel

public string Note { get; set; }

public bool IsFinished { get; set; }
public bool IsCompleted { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion Src/Core/F15/Models/F15TodoTaskModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ public sealed class F15TodoTaskModel

public string Note { get; set; }

public bool IsFinished { get; set; }
public bool IsCompleted { get; set; }
}
2 changes: 1 addition & 1 deletion Src/Core/F15/Presentation/F15Response.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public sealed class TodoTaskDto

public string Note { get; set; }

public bool IsFinished { get; set; }
public bool IsCompleted { get; set; }
}
}
}
Loading