Merge pull request #176 from openimis/feature/OP-940

OP-940 Test mobiles apps on release server (22.10 Release)
openimis · Nov 10, 2022 · 338c051 · 338c051
2 parents 90d5d93 + 01dd563
commit 338c051
Show file tree

Hide file tree

Showing 34 changed files with 78 additions and 168 deletions.
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/FeedbackModule/Models/Feedback.cs b/OpenImis.ModulesV3/FeedbackModule/Models/Feedback.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.FeedbackModule.Models
 {

diff --git a/OpenImis.ModulesV3/FeedbackModule/Models/FeedbackRequest.cs b/OpenImis.ModulesV3/FeedbackModule/Models/FeedbackRequest.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.FeedbackModule.Models
 {

diff --git a/...i/Util/ErrorHandling/BusinessException.cs → ...is.ModulesV3/Helpers/BusinessException.cs b/...i/Util/ErrorHandling/BusinessException.cs → ...is.ModulesV3/Helpers/BusinessException.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 
-namespace OpenImis.RestApi.Util.ErrorHandling
+namespace OpenImis.ModulesV3.Helpers
 {
     /// <summary>
     /// Exception for business related errors. It's error message will be included in the payload.

diff --git a/OpenImis.ModulesV3/Helpers/DateTimeFormats.cs b/OpenImis.ModulesV3/Helpers/DateTimeFormats.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenImis.ModulesV3.Helpers
+{
+    public static class DateTimeFormats
+    {
+        public const string IsoDateFormat = "yyyy-MM-dd";
+        public const string IsoDateTimeFormat = "yyyy-MM-ddTHH:mm:ss";
+        public const string FileNameDateTimeFormat = "yyyy-MM-ddTHH-mm-ss";
+    }
+}
diff --git a/...is.ModulesV3/Utils/DateTimeSerializers.cs → ....ModulesV3/Helpers/DateTimeSerializers.cs b/...is.ModulesV3/Utils/DateTimeSerializers.cs → ....ModulesV3/Helpers/DateTimeSerializers.cs
@@ -5,34 +5,42 @@
 using System.Text;
 using System.Xml;
 
-namespace OpenImis.ModulesV3.Utils
+namespace OpenImis.ModulesV3.Helpers
 {
-    public static class DateTimeFormats
-    {
-        public static CultureInfo cultureInfo = CultureInfo.InvariantCulture;
-        public const string IsoDateFormat = "yyyy-MM-dd";
-        public const string IsoDateTimeFormat = "yyyy-MM-ddTHH:mm:ss";
-        public const string FileNameDateTimeFormat = "yyyy-MM-ddTHH-mm-ss";
-
-    }
-
-    public class CustomFormatDatetimeSerializer : JsonConverter<DateTime>
+    public class CustomFormatDatetimeSerializer : JsonConverter<DateTime?>
     {
         protected string format;
+        protected string errorMessage;
 
         public CustomFormatDatetimeSerializer(string format)
         {
             this.format = format;
+            this.errorMessage = "Invalid datetime field";
+        }
+
+        public CustomFormatDatetimeSerializer(string format, string errorMessage)
+        {
+            this.format = format;
+            this.errorMessage = errorMessage;
         }
 
-        public override DateTime ReadJson(JsonReader reader, Type objectType, DateTime existingValue, bool hasExistingValue, JsonSerializer serializer)
+        public override DateTime? ReadJson(JsonReader reader, Type objectType, DateTime? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
-            return DateTime.ParseExact(reader.Value.ToString(), this.format, DateTimeFormats.cultureInfo);
+            if (DateTime.TryParseExact(reader.Value.ToString(), format, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime dt))
+            {
+                return dt;
+            }
+            else
+            {
+                throw new BusinessException(errorMessage);
+            }
         }
 
-        public override void WriteJson(JsonWriter writer, DateTime value, JsonSerializer serializer)
+        public override void WriteJson(JsonWriter writer, DateTime? value, JsonSerializer serializer)
         {
-            writer.WriteValue(value.ToString(this.format, DateTimeFormats.cultureInfo));
+            DateTime dt = value ?? new DateTime();
+            writer.WriteValue(dt.ToString(format, CultureInfo.InvariantCulture));
+
         }
     }
 
@@ -41,11 +49,16 @@ public class IsoDateSerializer : CustomFormatDatetimeSerializer
         public IsoDateSerializer() : base(DateTimeFormats.IsoDateFormat)
         {
         }
+
+        public IsoDateSerializer(string errorMessage) : base(DateTimeFormats.IsoDateFormat, errorMessage)
+        {
+        }
     }
 
     public class ImisSPXmlWriter : XmlTextWriter
     {
-        public ImisSPXmlWriter(TextWriter writer) : base(writer) {
+        public ImisSPXmlWriter(TextWriter writer) : base(writer)
+        {
         }
         public ImisSPXmlWriter(Stream stream, Encoding encoding) : base(stream, encoding) { }
         public ImisSPXmlWriter(string filename, Encoding encoding) : base(filename, encoding) { }
@@ -55,7 +68,7 @@ public override void WriteRaw(string data)
             DateTime dt;
 
             if (DateTime.TryParse(data, out dt))
-                base.WriteRaw(dt.ToString(DateTimeFormats.IsoDateFormat, DateTimeFormats.cultureInfo));
+                base.WriteRaw(dt.ToString(DateTimeFormats.IsoDateFormat, CultureInfo.InvariantCulture));
             else
                 base.WriteRaw(data);
         }

diff --git a/OpenImis.ModulesV3/Helpers/Validators/ValidDateAttribute.cs b/OpenImis.ModulesV3/Helpers/Validators/ValidDateAttribute.cs
diff --git a/OpenImis.ModulesV3/InsureeModule/Models/DetailModel.cs b/OpenImis.ModulesV3/InsureeModule/Models/DetailModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.InsureeModule.Models
 {

diff --git a/OpenImis.ModulesV3/InsureeModule/Models/EnrollFamilyModels/Insuree.cs b/OpenImis.ModulesV3/InsureeModule/Models/EnrollFamilyModels/Insuree.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.InsureeModule.Models.EnrollFamilyModels
 {

diff --git a/OpenImis.ModulesV3/InsureeModule/Models/GetInsureeModel.cs b/OpenImis.ModulesV3/InsureeModule/Models/GetInsureeModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 
 namespace OpenImis.ModulesV3.InsureeModule.Models
 {
@@ -17,6 +15,5 @@ public class GetInsureeModel
         public string PhotoBase64 { get; set; }
         public string OtherNames { get; set; }
         public string LastName { get; set; }
-
     }
 }
diff --git a/OpenImis.ModulesV3/InsureeModule/Models/InsureeModel.cs b/OpenImis.ModulesV3/InsureeModule/Models/InsureeModel.cs
@@ -1,10 +1,8 @@
 using Newtonsoft.Json;
 using OpenImis.DB.SqlServer;
+using OpenImis.ModulesV3.Helpers;
 using OpenImis.ModulesV3.Utils;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
 
 namespace OpenImis.ModulesV3.InsureeModule.Models
 {

diff --git a/OpenImis.ModulesV3/MasterDataModule/Models/OfficerModel.cs b/OpenImis.ModulesV3/MasterDataModule/Models/OfficerModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.MasterDataModule.Models
 {

diff --git a/OpenImis.ModulesV3/MasterDataModule/Models/ProductModel.cs b/OpenImis.ModulesV3/MasterDataModule/Models/ProductModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.MasterDataModule.Models
 {

diff --git a/OpenImis.ModulesV3/PolicyModule/Models/GetPolicyRenewalModel.cs b/OpenImis.ModulesV3/PolicyModule/Models/GetPolicyRenewalModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.PolicyModule.Models
 {

diff --git a/OpenImis.ModulesV3/PolicyModule/Models/PolicyRenewalModel.cs b/OpenImis.ModulesV3/PolicyModule/Models/PolicyRenewalModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.PolicyModule.Models
 {
@@ -14,15 +12,12 @@ public class PolicyRenewalModel
         public string ReceiptNo { get; set; }
         public string ProductCode { get; set; }
         public float Amount { get; set; }
-
         [JsonConverter(typeof(IsoDateSerializer))]
         public DateTime Date { get; set; }
         public bool Discontinue { get; set; }
         public int PayerId { get; set; }
-
         public string ControlNumber { get; set; }
 
-
         public Policy GetPolicy()
         {
             return new Policy()

diff --git a/OpenImis.ModulesV3/ReportModule/Models/IndicatorRequestModel.cs b/OpenImis.ModulesV3/ReportModule/Models/IndicatorRequestModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.ReportModule.Models
 {

diff --git a/OpenImis.ModulesV3/ReportModule/Models/SnapshotRequestModel.cs b/OpenImis.ModulesV3/ReportModule/Models/SnapshotRequestModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
-using OpenImis.ModulesV3.Utils;
+using OpenImis.ModulesV3.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenImis.ModulesV3.ReportModule.Models
 {

diff --git a/OpenImis.ModulesV3/Utils/LinqExtensions.cs b/OpenImis.ModulesV3/Utils/LinqExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace OpenImis.ModulesV3.Utils
 {

diff --git a/OpenImis.ModulesV3/Utils/PhotoUtils.cs b/OpenImis.ModulesV3/Utils/PhotoUtils.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using Microsoft.Extensions.Logging;
 
 namespace OpenImis.ModulesV3.Utils

diff --git a/OpenImis.ModulesV3/Utils/Repository.cs b/OpenImis.ModulesV3/Utils/Repository.cs
@@ -1,9 +1,7 @@
 using OpenImis.DB.SqlServer;
 using System;
-using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
 
 namespace OpenImis.ModulesV3.Utils
 {