multiple persons request realized

SocialMinistryDataExchange/Controllers/apiController.cs

@@ -12,23 +12,29 @@ namespace SocialMinistryDataExchange.Controllers {
             _repository = repository;
         }
 
-
         // тестовый запрос с фиксированным документом личности
         [HttpGet]
         [Route("[controller]/getpersonFixDoc")]
-        public async Task<SMResponce> GetPersonFixDoc() {
-            var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(new SMPersonRequest() { rowguid_eais = "223322", document_seria = "V-II", document_number = "123456" }));
+        public async Task<List<SMResponce>> GetPersonFixDoc() {
+            var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(new List<SMPersonRequest>() { new SMPersonRequest() { rowguid_eais = "223322", document_seria = "V-II", document_number = "123456" } }));
+            //var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(new List<SMPersonRequest>() { new SMPersonRequest() { rowguid_eais = "223322", document_seria = "V-II", document_number = "123456" }, new SMPersonRequest() { rowguid_eais = "322223", document_seria = "1234", document_number = "123456" } }));
             return result;
         }
+        // тестовый запрос для получения json формата
+        [HttpGet]
+        [Route("[controller]/getSMPersonNewDataRequest")]
+        public async Task<SMPersonNewDataRequest> GetSMPersonNewDataRequest() {
+            return new SMPersonNewDataRequest();
+        }
+
         // запрос по серии/номеру документа личности
         //[HttpPost]
         [HttpGet]
         [Route("[controller]/getpersonByDoc/{Rowguid}/{Seria}/{Number}")]
-        public async Task<SMResponce> GetPersonByDoc(string Rowguid, string Seria, string Number) {
+        public async Task<List<SMResponce>> GetPersonByDoc(string Rowguid, string Seria, string Number) {
             var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(new SMPersonRequest() { rowguid_eais = Rowguid, document_seria = Seria, document_number = Number }));
             return result;
         }
-
         // запрос статуса нуждаемости по guid личности
         //[HttpPost]
         [HttpGet]
@@ -38,10 +44,5 @@ namespace SocialMinistryDataExchange.Controllers {
             return result;
         }
 
-        [HttpGet]
-        [Route("[controller]/getSMPersonNewDataRequest")]
-        public async Task<SMPersonNewDataRequest> GetSMPersonNewDataRequest() {
-            return new SMPersonNewDataRequest();
-        }
     }
 }

SocialMinistryDataExchange/Model/ISMRepository.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 
 namespace SocialMinistryDataExchange.Model {
     public interface ISMRepository {
-        Task<SMResponce> GetPersonByDoc(string Document);
+        Task<List<SMResponce>> GetPersonByDoc(string Document);
         Task<SMDefenceDemandResponce> GetPersonDefenceDemandByID(string PersonID);
     }
 }

SocialMinistryDataExchange/Model/SMRepository.cs

@@ -21,8 +21,11 @@ namespace SocialMinistryDataExchange.Model {
             return Task.FromResult(status);
         }
 
-        public Task<SMResponce> GetPersonByDoc(string document) {
-            var doc = JsonSerializer.Deserialize<SMPersonRequest>(document);
+        public Task<List<SMResponce>> GetPersonByDoc(string document) {
+            var docs = JsonSerializer.Deserialize<List<SMPersonRequest>>(document);
+            List <SMResponce> responce = new();
+            foreach (SMPersonRequest doc in docs) {
+                SMResponce responce_record = new SMResponce();
                 try {
                     var record = (from pd in _contingentContext.ДокументЛичностиs
                                   where pd.СерияДокумента == doc.document_seria && pd.НомерДокумента == doc.document_number
@@ -58,13 +61,16 @@ namespace SocialMinistryDataExchange.Model {
                     if (record == null) {
                         record = new SMResponceTemp() { rowguid_eais = doc.rowguid_eais, СерияДокумента = doc.document_seria, НомерДокумента = doc.document_number };
                     }
-                var responce = FormatResponce(_contingentContext, record);
-                return Task.FromResult(responce);
+                    responce_record = FormatResponce(_contingentContext, record);
+                    
                 }
                 catch (Exception ex) {
                     // TODO log exception
-                return Task.FromResult(FormatResponce(_contingentContext, new SMResponceTemp() { rowguid_eais = doc.rowguid_eais, СерияДокумента = doc.document_seria, НомерДокумента = doc.document_number }));
+                    responce_record = FormatResponce(_contingentContext, new SMResponceTemp() { rowguid_eais = doc.rowguid_eais, СерияДокумента = doc.document_seria, НомерДокумента = doc.document_number });
                 }
+                responce.Add(responce_record);
+            }
+            return Task.FromResult(responce);
         }
 
         static Guid? GetOrganizationType(IContingentContext context, Guid? OrgTypeUid) {

SocialMinistryDataExchange/Model/SMRequest.cs

@@ -12,24 +12,29 @@ namespace SocialMinistryDataExchange.Model {
         public string MsgID { get; set; }
         public DateTime MsgDataTime { get; set; }
         public string? MsgPriority { get; set; }
+        public CocialDefenceStatusMessage MsgData { get; set; }         
+    }
+    public class CocialDefenceStatusMessage {
         public Person Person { get; set; }
-        public string PersonStatus { get; set; }
+        public PersonCocialDefenceStatus PersonStatus { get; set; }
+        public Person[]? Relatives { get; set; }
+    }
+    public class PersonCocialDefenceStatus {
+        public int Status { get; set; }
         public DateTime PersonStatusStartDate { get; set; }
         public DateTime PersonStatusEndDate { get; set; }
-        public Person[] Relatives { get; set; }
-        public int FamilyPersonsCount { get; set; }
-        public double AvgIncome { get; set; }
-        public double MinIncome { get; set; }
-        public string Territory { get; set; }
+        public int? FamilyPersonsCount { get; set; }
+        public double? AvgIncome { get; set; }
+        public double? MinIncome { get; set; }
     }
     public class Person {
         public string rowguid_eais { get; set; }
         public string? rowguid_contingent { get; set; }
         public string PersonFamilyName { get; set; }
         public string PersonName { get; set; }
-        public string PersonSurname { get; set; }
+        public string? PersonSurname { get; set; }
         public DateTime PersonBirthday { get; set; }
-        public string PersonDocumentType { get; set; }
+        public int PersonDocumentType { get; set; }
         public string PersonDocumentSeria { get; set; }
         public string PersonDocumentNumber { get; set; }
         public DateTime PersonDocumentDate { get; set; }
@@ -37,5 +42,7 @@ namespace SocialMinistryDataExchange.Model {
         public string? PersonAddress { get; set; }
         public string? DependentPerson { get; set; }
         public string? DependenceType { get; set; }
+        public string? Territory { get; set; }
+
     }
 }