Tsylia/ Fixed the retrieving children for current parent (with or without him).

OutOfSchool/OutOfSchool.WebApi/Controllers/V1/ChildController.cs

@@ -94,6 +94,7 @@ public async Task<IActionResult> GetByParentIdForAdmin(Guid parentId, [FromQuery
     /// <summary>
     /// Get all user's children from the database.
     /// </summary>
+    /// <param name="isGetParent">Retrieve the parents along with the children.</param>
     /// <param name="offsetFilter">Filter to get a part of all children that were found.</param>
     /// <returns>The result is a <see cref="SearchResult{ChildDto}"/> that contains the count of all found children and a list of children that were received.</returns>
     [HasPermission(Permissions.ChildRead)]
@@ -103,11 +104,11 @@ public async Task<IActionResult> GetByParentIdForAdmin(Guid parentId, [FromQuery
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
     [ProducesResponseType(StatusCodes.Status500InternalServerError)]
     [HttpGet]
-    public async Task<IActionResult> GetUsersChildren([FromQuery] OffsetFilter offsetFilter)
+    public async Task<IActionResult> GetUsersChildren([FromQuery] OffsetFilter offsetFilter, [FromQuery] bool isGetParent = false)
     {
         string userId = GettingUserProperties.GetUserId(User);
 
-        return Ok(await service.GetByUserId(userId, offsetFilter).ConfigureAwait(false));
+        return Ok(await service.GetByUserId(userId, isGetParent, offsetFilter).ConfigureAwait(false));
     }
 
     /// <summary>

OutOfSchool/OutOfSchool.WebApi/Services/ChildService.cs

@@ -219,22 +219,29 @@ public async Task<SearchResult<ChildDto>> GetByParentIdOrderedByFirstName(Guid p
     }
 
     /// <inheritdoc/>
-    public async Task<SearchResult<ChildDto>> GetByUserId(string userId, OffsetFilter offsetFilter)
+    public async Task<SearchResult<ChildDto>> GetByUserId(string userId, bool isGetParent, OffsetFilter offsetFilter)
     {
         this.ValidateUserId(userId);
         this.ValidateOffsetFilter(offsetFilter);
 
         logger.LogDebug($"Getting Child's for User started. Looking UserId = {userId}.");
 
-        var totalAmount = await childRepository.Count(x => x.Parent.UserId == userId).ConfigureAwait(false);
+        Expression<Func<Child, bool>> predicate = x => x.Parent.UserId == userId;
+
+        if (!isGetParent)
+        {
+            predicate = predicate.And(x => !x.IsParent);
+        }
+
+        var totalAmount = await childRepository.Count(predicate).ConfigureAwait(false);
 
         var sortExpression = new Dictionary<Expression<Func<Child, object>>, SortDirection>
         {
             { x => x.FirstName, SortDirection.Ascending },
         };
 
         var children = await childRepository
-            .Get(offsetFilter.From, offsetFilter.Size, string.Empty, x => x.Parent.UserId == userId, sortExpression)
+            .Get(offsetFilter.From, offsetFilter.Size, string.Empty, predicate, sortExpression)
             .ToListAsync()
             .ConfigureAwait(false);
 

OutOfSchool/OutOfSchool.WebApi/Services/IChildService.cs

@@ -76,13 +76,14 @@ public interface IChildService
     /// Get children with some UserId.
     /// </summary>
     /// <param name="userId">Key in the User table.</param>
+    /// <param name="isGetParent">Retrieve the parents along with the children.</param>
     /// <param name="offsetFilter">Filter to get a part of all children that were found.</param>
     /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.
     /// The result is a <see cref="SearchResult{ChildDto}"/> that contains the count of all found children and a list of children that were received.</returns>
     /// <exception cref="ArgumentNullException">If one of the parameters was null.</exception>
     /// <exception cref="ArgumentException">If one of the parameters was not valid.</exception>
     /// <exception cref="SqlException">If the database cannot execute the query.</exception>
-    Task<SearchResult<ChildDto>> GetByUserId(string userId, OffsetFilter offsetFilter);
+    Task<SearchResult<ChildDto>> GetByUserId(string userId, bool isGetParent, OffsetFilter offsetFilter);
 
     /// <summary>
     /// Get children by WorkshopId.