Merge branch 'main' into feat/DTOSS-5219-add-durable-function-for-dem…

…ogragphic

application/CohortManager/src/Functions/Shared/Common/Utilities/ReflectionUtilities.cs

@@ -16,4 +16,15 @@ public static PropertyInfo GetKey<TEntity>() where TEntity : class
         return type.GetProperties().FirstOrDefault(p =>
             p.CustomAttributes.Any(attr => attr.AttributeType == typeof(KeyAttribute)));
     }
+
+
+    public static Type GetPropertyType(Type type, string property)
+    {
+        return type.GetProperty(property).PropertyType;
+    }
+
+    public static bool PropertyExists(Type type, string property) =>
+        Array.Exists(type.GetProperties(), p => p.Name == property);
+
+
 }

application/CohortManager/src/Functions/Shared/DataServices.Client/DataServiceClient.cs

@@ -42,33 +42,15 @@ public async Task<IEnumerable<TEntity>> GetAll()
     public async Task<IEnumerable<TEntity>> GetByFilter(Expression<Func<TEntity, bool>> predicate)
     {
 
-        try
-        {
-            //Resolves the constants
-            var expr = new ClosureResolver().Visit(predicate);
-            _logger.LogWarning(expr.ToString());
-
-
-            var jsonString = await _callFunction.SendGet(_baseUrl, new Dictionary<string, string> { { "query", expr.ToString() } });
-            if (string.IsNullOrEmpty(jsonString))
-            {
-                return null;
-            }
-            IEnumerable<TEntity> result = JsonSerializer.Deserialize<IEnumerable<TEntity>>(jsonString);
-            return result;
 
-        }
-        catch (WebException wex)
+        var jsonString = await GetJsonStringByFilter(predicate);
+        if(string.IsNullOrEmpty(jsonString))
         {
-            HttpWebResponse response = (HttpWebResponse)wex.Response;
-            if (response.StatusCode! == HttpStatusCode.NotFound)
-            {
-                return null;
-            }
-
-            _logger.LogError(wex, "An Exception Happened while calling data service API");
-            throw;
+            return null;
         }
+        IEnumerable<TEntity> result = JsonSerializer.Deserialize<IEnumerable<TEntity>>(jsonString);
+        return result;
+
     }
 
     public virtual async Task<TEntity> GetSingle(string id)
@@ -99,16 +81,27 @@ public virtual async Task<TEntity> GetSingle(string id)
             throw;
         }
     }
+    public async Task<TEntity> GetSingleByFilter(Expression<Func<TEntity, bool>> predicate)
+    {
+
+        var jsonString = await GetJsonStringByFilter(predicate,true);
+        if(string.IsNullOrEmpty(jsonString))
+        {
+            return null;
+        }
+        TEntity result = JsonSerializer.Deserialize<TEntity>(jsonString);
+        return result;
+
+    }
 
     public async Task<bool> Delete(string id)
     {
         var result = await _callFunction.SendDelete(UrlBuilder(_baseUrl, id));
         return result;
     }
-
-    public async Task<bool> AddRange(IEnumerable<TEntity> entity)
+    public async Task<bool> AddRange(IEnumerable<TEntity> entities)
     {
-        var jsonString = JsonSerializer.Serialize<IEnumerable<TEntity>>(entity);
+        var jsonString = JsonSerializer.Serialize<IEnumerable<TEntity>>(entities);
 
         if (string.IsNullOrEmpty(jsonString))
         {
@@ -164,11 +157,44 @@ public async Task<bool> Update(TEntity entity)
         return true;
     }
 
+    private async Task<string> GetJsonStringByFilter(Expression<Func<TEntity,bool>> predicate, bool returnOneRecord = false)
+    {
+        try
+        {
+
+            //Resolves the constants
+            var expr  = new ClosureResolver().Visit(predicate);
+
+            var queryItems = new Dictionary<string,string>{{"query",expr.ToString()}};
+
+            if(returnOneRecord)
+            {
+                queryItems.Add("single","true");
+            }
+
+            var jsonString = await _callFunction.SendGet(_baseUrl,queryItems);
+            return jsonString;
+        }
+        catch(WebException wex)
+        {
+            HttpWebResponse response = (HttpWebResponse)wex.Response;
+            if(response.StatusCode! == HttpStatusCode.NotFound)
+            {
+                return null;
+            }
+
+            _logger.LogError(wex,"An Exception Happened while calling data service API");
+            throw;
+        }
+
+    }
+
     private static string UrlBuilder(string baseUrl, string argument)
     {
         baseUrl = baseUrl.TrimEnd('/');
         argument = argument.TrimStart('/');
         return string.Format("{0}/{1}", baseUrl, argument);
     }
 
+
 }

application/CohortManager/src/Functions/Shared/DataServices.Client/IDataServiceClient.cs

@@ -4,11 +4,40 @@ namespace DataServices.Client;
 
 public interface IDataServiceClient<TEntity>
 {
+    /// <summary>
+    /// Gets all items
+    /// </summary>
+    /// <returns>Returns a task with a result type of TEntity</returns>
     Task<IEnumerable<TEntity>> GetAll();
+    /// <summary>
+    /// Gets a single item given the primary key of the table given as an argument
+    /// </summary>
+    /// <param name="id">Primary key of table being queried</param>
+    /// <returns>Returns a task with a result type of TEntity</returns>
     Task<TEntity> GetSingle(string id);
-    Task<IEnumerable<TEntity>> GetByFilter(Expression<Func<TEntity, bool>> predicate);
+    /// <summary>
+    /// Gets a single by an expression such as i => i.item == "This item"
+    /// </summary>
+    /// <param name="predicate">linq query defining the filter on the table</param>
+    /// <returns>Returns a task with the result type of TEntity</returns>
+    Task<TEntity> GetSingleByFilter(Expression<Func<TEntity,bool>> predicate);
+    /// <summary>
+    /// Get a list of items where they meet the given predicate
+    /// </summary>
+    /// <param name="predicate">linq query defining the filter on the table</param>
+    /// <returns>Returns a task with the result type of IEnumerable<TEntity></returns>
+    Task<IEnumerable<TEntity>> GetByFilter(Expression<Func<TEntity,bool>> predicate);
+    /// <summary>
+    /// Adds a given records to the database
+    /// </summary>
+    /// <param name="entity">object of type TEntity to be inserted in the database</param>
+    /// <returns>a boolean representing if the record was inserted successfully</returns>
     Task<bool> Add(TEntity entity);
-    Task<bool> AddRange(IEnumerable<TEntity> entity);
-    Task<bool> Delete(string id);
+    /// <summary>
+    /// Adds an IEnumerable of type TEntity to the database
+    /// </summary>
+    /// <param name="entities">IEnumerable<TEntity> of items to be added to the database</param>
+    /// <returns>a boolean representing if the record was inserted successfully</returns>
+    Task<bool> AddRange(IEnumerable<TEntity> entities);
 
 }

application/CohortManager/src/Functions/Shared/DataServices.Core/DataServiceAccessor.cs

@@ -19,9 +19,12 @@ public DataServiceAccessor(DataServicesContext context, ILogger<DataServiceAcces
 
     public async Task<TEntity> GetSingle(Expression<Func<TEntity, bool>> predicate)
     {
-        var result = _context.Set<TEntity>().SingleOrDefault(predicate);
+        var result = _context.Set<TEntity>().Where(predicate).ToList();
+        if(result.Count > 1){
+            throw new MultipleRecordsFoundException("Multiple Records where found for filter expression when only one was expected");
+        }
         await Task.CompletedTask;
-        return result;
+        return result.Single();
     }
 
     public async Task<List<TEntity>> GetRange(Expression<Func<TEntity, bool>> predicates)
@@ -71,18 +74,21 @@ public async Task<TEntity> Update(TEntity entity, Expression<Func<TEntity, bool>
         using var transaction = await _context.Database.BeginTransactionAsync();
         TEntity updatedEntity =  _context.Entry(existingEntity).CurrentValues.SetValues(entity);
         var rowsEffected  = await _context.SaveChangesAsync();
+
+
         if(rowsEffected == 1)
         {
             return updatedEntity;
         }
         else if(rowsEffected > 1)
         {
             await transaction.RollbackAsync();
-            _logger.LogError("Multiple Records were updated by PUT request, Changes have been Rolledback");
-            throw new Exception("Multiple Records were updated by PUT request, Changes have been Rolledback");
+            _logger.LogError("Multiple Records were updated by PUT request, Changes have been Rolled-back");
+            throw new MultipleRecordsFoundException("Multiple Records were updated by PUT request, Changes have been Rolled-back");
         }
+
         _logger.LogError("No records were updated despite a record being found");
-        throw new Exception("Multiple Records were updated by PUT request, Changes have been Rolledback");
+        throw new MultipleRecordsFoundException("Multiple Records were updated by PUT request, Changes have been Rolled-back");
 
     }
 

application/CohortManager/src/Functions/Shared/DataServices.Core/Exceptions/MultipleRecordsFoundException.cs

@@ -0,0 +1,17 @@
+namespace DataServices.Core;
+
+public class MultipleRecordsFoundException : Exception
+{
+    public MultipleRecordsFoundException()
+    {
+    }
+    public MultipleRecordsFoundException(string message)
+        : base(message)
+    {
+    }
+
+    public MultipleRecordsFoundException(string message, Exception inner)
+        : base(message, inner)
+    {
+    }
+}

application/CohortManager/src/Functions/Shared/DataServices.Core/RequestHandler.cs

@@ -11,6 +11,7 @@ namespace DataServices.Core;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using Common;
+using FluentValidation.Validators;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Logging;
@@ -21,12 +22,10 @@ public class RequestHandler<TEntity> : IRequestHandler<TEntity> where TEntity :
 
     private readonly IDataServiceAccessor<TEntity> _dataServiceAccessor;
     private readonly ILogger<RequestHandler<TEntity>> _logger;
-
     private readonly AuthenticationConfiguration _authConfig;
-
     private readonly PropertyInfo _keyInfo;
-
-    private static JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions{
+    private static JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions
+        {
             UnmappedMemberHandling = JsonUnmappedMemberHandling.Disallow
         };
 
@@ -38,7 +37,6 @@ public RequestHandler(IDataServiceAccessor<TEntity> dataServiceAccessor, ILogger
         _logger = logger;
         _authConfig = authenticationConfiguration;
         _keyInfo = ReflectionUtilities.GetKey<TEntity>();
-
     }
 
     public async Task<HttpResponseData> HandleRequest(HttpRequestData req, string? key = null)
@@ -93,17 +91,37 @@ private async Task<HttpResponseData> Get(HttpRequestData req)
             _logger.LogWarning("Unauthorized Method was called");
             return CreateErrorResponse(req,UnauthorizedErrorMessage,HttpStatusCode.Unauthorized);
         }
-        try{
+
+        try
+        {
             var predicate = CreateFilterExpression(req);
-            var result = await _dataServiceAccessor.GetRange(predicate);
-            if(result == null || !result.Any())
+            object result;
+
+            if (GetBooleanQueryItem(req,"single"))
+            {
+                result = await _dataServiceAccessor.GetSingle(predicate);
+            }
+            else
+            {
+                result = await _dataServiceAccessor.GetRange(predicate);
+            }
+
+            if (!ResultHasContent(result))
             {
                 return CreateErrorResponse(req,"No Data Found",HttpStatusCode.NoContent);
             }
+
             return CreateHttpResponse(req,new DataServiceResponse<string>
             {
                 JsonData = JsonSerializer.Serialize(result)
             });
+        }
+        catch(MultipleRecordsFoundException mre)
+        {
+            _logger.LogWarning(mre,"Multiple Records were returned from filter expression when only one was expected: {message}",mre.Message);
+            return CreateErrorResponse(req,"Multiple rows met filter condition when only one row was expected",HttpStatusCode.BadRequest);
+
+
         }
         catch(Exception ex)
         {
@@ -256,7 +274,7 @@ private Expression<Func<TEntity, bool>> CreateGetByKeyExpression(string filter)
     {
         var entityParameter = Expression.Parameter(typeof(TEntity));
         var entityKey = Expression.Property(entityParameter, _keyInfo.Name);
-        var filterConstant = Expression.Constant(Convert.ChangeType(filter, GetPropertyType(typeof(TEntity), _keyInfo.Name)));
+        var filterConstant = Expression.Constant(Convert.ChangeType(filter, ReflectionUtilities.GetPropertyType(typeof(TEntity), _keyInfo.Name)));
         var expr = Expression.Equal(entityKey, filterConstant);
 
         return Expression.Lambda<Func<TEntity, bool>>(expr, entityParameter);
@@ -278,13 +296,13 @@ private Expression<Func<TEntity, bool>> CreateFilterExpression(HttpRequestData r
                 return DynamicExpressionParser.ParseLambda<TEntity,bool>(new ParsingConfig(),true, req.Query[item]);
             }
 
-            if (!PropertyExists(typeof(TEntity), item))
+            if (!ReflectionUtilities.PropertyExists(typeof(TEntity), item))
             {
                 _logger.LogWarning("Query Item: '{item}' does not exist in TEntity: '{entityName}'", item, typeof(TEntity).Name);
                 continue;
             }
             var entityKey = Expression.Property(entityParameter, item);
-            var filterConstant = Expression.Constant(Convert.ChangeType(req.Query[item], GetPropertyType(typeof(TEntity), item)));
+            var filterConstant = Expression.Constant(Convert.ChangeType(req.Query[item], ReflectionUtilities.GetPropertyType(typeof(TEntity), item)));
             var comparison = Expression.Equal(entityKey, filterConstant);
             if (expr == null)
             {
@@ -298,17 +316,34 @@ private Expression<Func<TEntity, bool>> CreateFilterExpression(HttpRequestData r
 
     }
 
-    private static Type GetPropertyType(Type type, string property)
+    private static bool GetBooleanQueryItem(HttpRequestData req, string headerKey, bool defaultValue = false)
     {
-        return type.GetProperty(property).PropertyType;
+        if(req.Query[headerKey] == null){
+            return defaultValue;
+        }
+        if(bool.TryParse(req.Query[headerKey],out var result)){
+            return result;
+        }
+        return defaultValue;
     }
 
-    private static bool PropertyExists(Type type, string property) =>
-        Array.Exists(type.GetProperties(), p => p.Name == property);
-
+    private static bool ResultHasContent(Object obj)
+    {
+        if(obj == null)
+        {
+            return true;
+        }
 
+        if(obj is not IEnumerable<TEntity>) // Object isnt null and isnt IEnumerable so will have data
+        {
+            return true;
+        }
 
+        var data = (IEnumerable<TEntity>)obj;
+        var result = data.Any();
 
+        return result;
+    }
 
     private HttpResponseData CreateErrorResponse(HttpRequestData req, string message, HttpStatusCode statusCode)
     {