Finish release/v1.4.0

Release/v1.4.0
openimis · Nov 15, 2022 · 57d15ac · 57d15ac
2 parents f2b8bb5 + 74ee7e8
commit 57d15ac
Show file tree

Hide file tree

Showing 66 changed files with 508 additions and 319 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,2 @@
-bin\
-obj\
+bin/
+obj/
diff --git a/OpenImis.DB.SqlServer/DataHelper/DataHelper.cs b/OpenImis.DB.SqlServer/DataHelper/DataHelper.cs
@@ -11,19 +11,21 @@ namespace OpenImis.DB.SqlServer.DataHelper
 {
     public class DataHelper
     {
-        private readonly string ConnectionString;
+        private readonly string _connectionString;
+        private readonly int _commandTimeout = 30;
 
         public int ReturnValue { get; set; }
 
         public DataHelper(IConfiguration configuration)
         {
-            ConnectionString = configuration["ConnectionStrings:IMISDatabase"];
+            _connectionString = configuration["ConnectionStrings:IMISDatabase"];
+            if (configuration["ConnectionSettings:CommandTimeout"] != null) _commandTimeout = Int32.Parse(configuration["ConnectionSettings:CommandTimeout"]);
         }
 
         public DataSet FillDataSet(string SQL, SqlParameter[] parameters, CommandType commandType)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType, CommandTimeout = _commandTimeout })
             using (var adapter = new SqlDataAdapter(command))
             {
                 DataSet ds = new DataSet();
@@ -48,8 +50,8 @@ public DataSet FillDataSet(string SQL, SqlParameter[] parameters, CommandType co
 
         public DataTable GetDataTable(string SQL, SqlParameter[] parameters, CommandType commandType)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType, CommandTimeout = _commandTimeout })
             using (var adapter = new SqlDataAdapter(command))
             {
                 DataTable dt = new DataTable();
@@ -67,8 +69,8 @@ public DataTable GetDataTable(string SQL, SqlParameter[] parameters, CommandType
 
         public DataSet GetDataSet(string SQL, SqlParameter[] parameters, CommandType commandType)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType, CommandTimeout = _commandTimeout })
             using (var adapter = new SqlDataAdapter(command))
             {
                 DataSet ds = new DataSet();
@@ -86,8 +88,8 @@ public DataSet GetDataSet(string SQL, SqlParameter[] parameters, CommandType com
 
         public void Execute(string SQL, SqlParameter[] parameters, CommandType commandType)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType, CommandTimeout = _commandTimeout })
             {
                 sqlConnection.Open();
 
@@ -102,8 +104,8 @@ public void Execute(string SQL, SqlParameter[] parameters, CommandType commandTy
 
         public async Task ExecuteAsync(string SQL, SqlParameter[] parameters, CommandType commandType)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(SQL, sqlConnection) { CommandType = commandType, CommandTimeout = _commandTimeout })
             {
                 if (command.Connection.State == 0)
                 {
@@ -121,8 +123,8 @@ public async Task ExecuteAsync(string SQL, SqlParameter[] parameters, CommandTyp
 
         public ProcedureOutPut Procedure(string StoredProcedure, SqlParameter[] parameters, int tableIndex = 0)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure, CommandTimeout = _commandTimeout })
             using (var adapter = new SqlDataAdapter(command))
             {
                 DataSet dt = new DataSet();
@@ -155,8 +157,8 @@ public ProcedureOutPut Procedure(string StoredProcedure, SqlParameter[] paramete
 
         public IList<SqlParameter> ExecProcedure(string StoredProcedure, SqlParameter[] parameters)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure, CommandTimeout = _commandTimeout })
             {
                 SqlParameter returnParameter = new SqlParameter("@RV", SqlDbType.Int);
                 returnParameter.Direction = ParameterDirection.ReturnValue;
@@ -181,8 +183,8 @@ public IList<SqlParameter> ExecProcedure(string StoredProcedure, SqlParameter[]
 
         public async Task<IList<SqlParameter>> ExecProcedureAsync(string StoredProcedure, SqlParameter[] parameters)
         {
-            using (var sqlConnection = new SqlConnection(ConnectionString))
-            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure })
+            using (var sqlConnection = new SqlConnection(_connectionString))
+            using (var command = new SqlCommand(StoredProcedure, sqlConnection) { CommandType = CommandType.StoredProcedure, CommandTimeout = _commandTimeout })
             {
                 SqlParameter returnParameter = new SqlParameter("@RV", SqlDbType.Int);
                 returnParameter.Direction = ParameterDirection.ReturnValue;

diff --git a/OpenImis.DB.SqlServer/ImisDB.cs b/OpenImis.DB.SqlServer/ImisDB.cs
@@ -1,13 +1,29 @@
 using System;
+using System.Data;
+using System.Data.Common;
 using System.IO;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.Configuration;
 
 namespace OpenImis.DB.SqlServer
 {
     public partial class ImisDB : IMISContext
     {
+        private int _commandTimeout = 30;
+
+        public DbCommand CreateCommand()
+        {
+            var connection = Database.GetDbConnection();
+            var command = connection.CreateCommand();
+            command.CommandTimeout = _commandTimeout;
+            return command;
+        }
+
+        public void CheckConnection()
+        {
+            var connection = Database.GetDbConnection();
+            if (connection.State.Equals(ConnectionState.Closed)) connection.Open();
+        }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -19,8 +35,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
             //.AddJsonFile("appsettings.json")
             .AddJsonFile(Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != null ? $"{path}appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json" : $"{path}appsettings.Production.json", optional: false, reloadOnChange: true)
             .Build();
-
-            optionsBuilder.UseSqlServer(configuration.GetConnectionString("IMISDatabase"));
+            if (configuration["ConnectionSettings:CommandTimeout"] != null) _commandTimeout = Int32.Parse(configuration["ConnectionSettings:CommandTimeout"]);
+            optionsBuilder.UseSqlServer(configuration.GetConnectionString("IMISDatabase"), options => options.CommandTimeout(_commandTimeout));
         }
     }
 }
diff --git a/OpenImis.ModulesV2/InsureeModule/Repositories/InsureeRepository.cs b/OpenImis.ModulesV2/InsureeModule/Repositories/InsureeRepository.cs
@@ -130,7 +130,7 @@ join G in imisContext.TblGender on I.Gender equals G.Code
                                     DOB = I.Dob.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture),
                                     Gender = G.Gender,
                                     InsureeName = I.LastName + " " + I.OtherNames,
-                                    PhotoPath = P.PhotoFolder + P.PhotoFileName
+                                    PhotoPath = System.IO.Path.Combine(P.PhotoFolder, P.PhotoFileName)
                                 })
                              .FirstOrDefault();
                 }

diff --git a/OpenImis.ModulesV3/ClaimModule/ClaimModule.cs b/OpenImis.ModulesV3/ClaimModule/ClaimModule.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using OpenImis.ModulesV3.ClaimModule.Logic;
 
 namespace OpenImis.ModulesV3.ClaimModule
@@ -8,20 +9,22 @@ public class ClaimModule
     {
         private IConfiguration _configuration;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly ILoggerFactory _loggerFactory;
 
         private ClaimLogic _claimLogic;
 
-        public ClaimModule(IConfiguration configuration, IHostingEnvironment hostingEnvironment)
+        public ClaimModule(IConfiguration configuration, IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)
         {
             _configuration = configuration;
             _hostingEnvironment = hostingEnvironment;
+            _loggerFactory = loggerFactory;
         }
 
         public ClaimLogic GetClaimLogic()
         {
             if (_claimLogic == null)
             {
-                _claimLogic = new ClaimLogic(_configuration, _hostingEnvironment);
+                _claimLogic = new ClaimLogic(_configuration, _hostingEnvironment, _loggerFactory);
             }
             return _claimLogic;
         }

diff --git a/OpenImis.ModulesV3/ClaimModule/Logic/ClaimLogic.cs b/OpenImis.ModulesV3/ClaimModule/Logic/ClaimLogic.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using OpenImis.DB.SqlServer;
 using OpenImis.ModulesV3.ClaimModule.Models;
 using OpenImis.ModulesV3.ClaimModule.Models.RegisterClaim;
@@ -12,14 +13,16 @@ public class ClaimLogic
     {
         private IConfiguration _configuration;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly ILoggerFactory _loggerFactory;
         protected ClaimRepository claimRepository;
 
-        public ClaimLogic(IConfiguration configuration, IHostingEnvironment hostingEnvironment)
+        public ClaimLogic(IConfiguration configuration, IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)
         {
             _configuration = configuration;
             _hostingEnvironment = hostingEnvironment;
+            _loggerFactory = loggerFactory;
 
-            claimRepository = new ClaimRepository(_configuration, _hostingEnvironment);
+            claimRepository = new ClaimRepository(_configuration, _hostingEnvironment, _loggerFactory);
         }
 
         public List<SubmitClaimResponse> Create(List<Claim> claims)
@@ -30,7 +33,7 @@ public List<SubmitClaimResponse> Create(List<Claim> claims)
             foreach (var claim in claims)
             {
                 result = claimRepository.Create(claim);
-
+                
                 Errors.Claim errorCode;
                 string message;
                 switch (result)
@@ -77,16 +80,22 @@ public List<SubmitClaimResponse> Create(List<Claim> claims)
                         break;
                     default:
                         errorCode = Errors.Claim.UnexpectedException;
-                        message = "Unhandled exception occured. Please contact the system administrator";
+                        message = $"Unhandled exception occured ({result}). Please contact the system administrator";
                         break;
                 }
 
+                var rejectedItems = claimRepository.GetRejectedItems(claim.Details.HFCode, claim.Details.ClaimCode);
+                var rejectedServices = claimRepository.GetRejectedServices(claim.Details.HFCode, claim.Details.ClaimCode);
+
+
                 claimResponse.Add(
                     new SubmitClaimResponse
                     {
                         ClaimCode = claim.Details.ClaimCode,
                         Response = (int)errorCode,
-                        Message = message
+                        Message = message,
+                        RejectedItems = rejectedItems,
+                        RejectedServices = rejectedServices
                     });
 
             }

diff --git a/OpenImis.ModulesV3/ClaimModule/Models/ClaimOutPut.cs b/OpenImis.ModulesV3/ClaimModule/Models/ClaimOutPut.cs
@@ -1,9 +1,7 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OpenImis.ModulesV3.ClaimModule.Models
 {

diff --git a/OpenImis.ModulesV3/ClaimModule/Models/ClaimsModel.cs b/OpenImis.ModulesV3/ClaimModule/Models/ClaimsModel.cs
@@ -1,11 +1,7 @@
-using Newtonsoft.Json;
-using OpenImis.ModulesV3.Helpers.Validators;
-using OpenImis.ModulesV3.Utils;
+using Newtonsoft.Json;  
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OpenImis.ModulesV3.ClaimModule.Models
 {
@@ -14,17 +10,13 @@ public class ClaimsModel
         [Required]
         public string claim_administrator_code { get; set; }
         public ClaimStatus status_claim { get; set; }
-        [ValidDate(ErrorMessage = "4:Wrong or missing enrolment date")]
-        [JsonConverter(typeof(IsoDateSerializer))]
+        [JsonConverter(typeof(IsoDateSerializer), "Invalid visit_date_from")]
         public DateTime? visit_date_from { get; set; }
-        [ValidDate(ErrorMessage = "4:Wrong or missing enrolment date")]
-        [JsonConverter(typeof(IsoDateSerializer))]
+        [JsonConverter(typeof(IsoDateSerializer), "Invalid visit_date_to")]
         public DateTime? visit_date_to { get; set; }
-        [ValidDate(ErrorMessage = "4:Wrong or missing enrolment date")]
-        [JsonConverter(typeof(IsoDateSerializer))]
+        [JsonConverter(typeof(IsoDateSerializer), "Invalid processed_date_from")]
         public DateTime? processed_date_from { get; set; }
-        [ValidDate(ErrorMessage = "4:Wrong or missing enrolment date")]
-        [JsonConverter(typeof(IsoDateSerializer))]
+        [JsonConverter(typeof(IsoDateSerializer), "Invalid processed_date_to")]
         public DateTime? processed_date_to { get; set; }
     }
 

diff --git a/OpenImis.ModulesV3/ClaimModule/Models/DsiInputModel.cs b/OpenImis.ModulesV3/ClaimModule/Models/DsiInputModel.cs
@@ -1,12 +1,7 @@
 
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Helpers.Validators;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OpenImis.ModulesV3.ClaimModule.Models
 {

diff --git a/OpenImis.ModulesV3/ClaimModule/Models/RegisterClaim/Claim.cs b/OpenImis.ModulesV3/ClaimModule/Models/RegisterClaim/Claim.cs
@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
 using System.Collections.Generic;
 

diff --git a/OpenImis.ModulesV3/ClaimModule/Models/SubmitClaimResponse.cs b/OpenImis.ModulesV3/ClaimModule/Models/SubmitClaimResponse.cs
@@ -4,11 +4,30 @@
 
 namespace OpenImis.ModulesV3.ClaimModule.Models
 {
+    public class RejectedItem
+    {
+        public string Code { get; set; }
+        public short? Error { get; set; }
+        public string Reason { get; set; }
+    }
+
+    public class RejectedService
+    {
+        public string Code { get; set; }
+        public short? Error { get; set; }
+        public string Reason { get; set; }
+    }
+
     public class SubmitClaimResponse
     {
         public string ClaimCode { get; set; }
         public int Response { get; set; }
         public string Message { get; set; }
+
+        public List<RejectedItem> RejectedItems { get; set; }
+
+        public List<RejectedService> RejectedServices { get; set; }
+
     }
 
 }