regDateAdd added to model to send in API

Jobs/UpdateResolutionJob.cs

@@ -14,7 +14,7 @@ namespace birzha_contracts.Jobs{
         
         private readonly ILogger<UpdateJob> _logger;
         private readonly IServiceProvider _provider;
-        private HttpClient client = new HttpClient();
+        private static HttpClient _client = new HttpClient();
 
         
 
@@ -24,43 +24,70 @@ namespace birzha_contracts.Jobs{
             _provider = provider;
         }
 
-        public Task Execute(IJobExecutionContext context)
+        private async Task<string> GetData(HttpRequestMessage request)
         {
+            var response = await _client.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+            return await response.Content.ReadAsStringAsync();
+        }
+
+        public async Task Execute(IJobExecutionContext context)
+        {
+            var tasks = new List<Task<string>>();
             using(var scope = _provider.CreateScope())
             {
                 var firstTimeDB = Convert.ToBoolean(ConfigManager.AppSetting["FirstTimeDB"]);
                 var dbContext = scope.ServiceProvider.GetService<MvcContractContext>();
                 var contracts = new List<ContractResolution>();
+                var domain = Convert.ToString(ConfigManager.AppSetting["Domain"]);
+                _client.BaseAddress = new Uri(domain);
+                var api = ConfigManager.AppSetting["API_contract_resolution"];
+                
                 if(firstTimeDB){
                     var dateFrom = Convert.ToDateTime(ConfigManager.AppSetting["FirstTimeDBFillDateFrom"]);
-                    contracts = dbContext!.ContractResolution.OrderByDescending(x => x.ID).Take(1000).ToList();
+                    contracts = dbContext!.ContractResolution.Where(x => x.ModifiedDate >= dateFrom).OrderByDescending(d => d.ModifiedDate).ToList();
+                    while(contracts.Any()){
+                        _logger.LogInformation("Sending request: Contract-Resolution");
+                        var chunk = contracts.Take(500).ToList();
+                        contracts = contracts.Skip(500).ToList();
+
+                        var data = JsonConvert.SerializeObject(chunk);
+
+                        var content = new StringContent(data.ToString(), Encoding.UTF8, "application/json");
+
+                        var request = new HttpRequestMessage(HttpMethod.Post, $""+api+"");
+                        request.Content = content;
+
+                        tasks.Add(GetData(request));
+                        
+                        _logger.LogInformation("Sending resolution success!");
+                    }
                 }
                 else{
                     var minutesAgo = Convert.ToDouble(ConfigManager.AppSetting["DataMinutesAgo"]);
                     minutesAgo = minutesAgo * (-1);
-                    contracts = dbContext!.ContractResolution.OrderByDescending(x => x.ID).Take(1000).ToList();
-                }
-                
-                
+                    contracts = dbContext!.ContractResolution.Where(x => x.ModifiedDate > DateTime.Now.AddMinutes(minutesAgo)).OrderByDescending(d => d.ModifiedDate).ToList();
+                    while(contracts.Any()){
                         _logger.LogInformation("Sending request: Contract-Resolution");
-                var data = JsonConvert.SerializeObject(contracts);
+                        var chunk = contracts.Take(500).ToList();
+                        contracts = contracts.Skip(500).ToList();
+
+                        var data = JsonConvert.SerializeObject(chunk);
 
                         var content = new StringContent(data.ToString(), Encoding.UTF8, "application/json");
 
-                var domain = Convert.ToString(ConfigManager.AppSetting["Domain"]);
-                client.BaseAddress = new Uri(domain);
-
-                var api = ConfigManager.AppSetting["API_contract_resolution"];
                         var request = new HttpRequestMessage(HttpMethod.Post, $""+api+"");
-
                         request.Content = content;
 
-                var response = client.Send(request);
-                _logger.LogInformation("Sending success!");
+                        tasks.Add(GetData(request));
+
+                        _logger.LogInformation("Sending resolution success!");
+                    }
+                }
             }
 
             _logger.LogInformation("Success!");
-            return Task.CompletedTask;
+            await Task.WhenAll(tasks);
         }
     }
 }

Models/Contract.cs

@@ -10,6 +10,8 @@ public class Contract
 
     public DateTime? RegDate { get; set; }
 
+    public DateTime? RegDateAdd { get; set; }
+
     public DateTime? ModifiedDate { get; set; }
 
     public Int32? MarkerSpec { get; set; }

appsettings.json

@@ -5,11 +5,11 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "UpdateTime":"0 */3 * * * ?",
+  "UpdateTime":"0 */2 * * * ?",
   "Domain":"https://panel.exchange.gov.tm",
   "DataMinutesAgo":3,
-  "FirstTimeDBFillDateFrom": "2022-10-10 00:00:10.183",
-  "FirstTimeDB":false,
+  "FirstTimeDBFillDateFrom": "2022-10-01 00:00:10.183",
+  "FirstTimeDB":true,
   "API_contracts":"/api/contract/import",
   "API_contract_resolution":"/api/contract/resolution-import",
   "AllowedHosts": "*",

bin/Debug/net6.0/appsettings.json

@@ -5,10 +5,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "UpdateTime":"0 */1 * * * ?",
+  "UpdateTime":"0 */2 * * * ?",
   "Domain":"https://panel.exchange.gov.tm",
   "DataMinutesAgo":3,
-  "FirstTimeDBFillDateFrom": "2022-10-10 00:00:10.183",
+  "FirstTimeDBFillDateFrom": "2022-10-01 00:00:10.183",
   "FirstTimeDB":true,
   "API_contracts":"/api/contract/import",
   "API_contract_resolution":"/api/contract/resolution-import",

obj/Debug/net6.0/birzha-contracts.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,61 +8,61 @@ build_property.PlatformNeutralAssembly =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = birzha_contracts
 build_property.RootNamespace = birzha_contracts
-build_property.ProjectDir = C:\inetpub\wwwroot\birzha-contracts\
+build_property.ProjectDir = c:\inetpub\wwwroot\birzha-contracts\
 build_property.RazorLangVersion = 6.0
 build_property.SupportLocalizedComponentNames = 
 build_property.GenerateRazorMetadataSourceChecksumAttributes = 
-build_property.MSBuildProjectDirectory = C:\inetpub\wwwroot\birzha-contracts
+build_property.MSBuildProjectDirectory = c:\inetpub\wwwroot\birzha-contracts
 build_property._RazorSourceGeneratorDebug = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Create.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Create.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXENyZWF0ZS5jc2h0bWw=
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Delete.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Delete.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXERlbGV0ZS5jc2h0bWw=
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Details.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Details.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXERldGFpbHMuY3NodG1s
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Edit.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Edit.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXEVkaXQuY3NodG1s
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Index.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Index.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXEluZGV4LmNzaHRtbA==
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Push.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Contracts/Push.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcQ29udHJhY3RzXFB1c2guY3NodG1s
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Home/Index.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Home/Index.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcSG9tZVxJbmRleC5jc2h0bWw=
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Home/Privacy.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Home/Privacy.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcSG9tZVxQcml2YWN5LmNzaHRtbA==
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Shared/Error.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Shared/Error.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcU2hhcmVkXEVycm9yLmNzaHRtbA==
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Shared/_ValidationScriptsPartial.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Shared/_ValidationScriptsPartial.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcU2hhcmVkXF9WYWxpZGF0aW9uU2NyaXB0c1BhcnRpYWwuY3NodG1s
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/_ViewImports.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/_ViewImports.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcX1ZpZXdJbXBvcnRzLmNzaHRtbA==
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/_ViewStart.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/_ViewStart.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcX1ZpZXdTdGFydC5jc2h0bWw=
 build_metadata.AdditionalFiles.CssScope = 
 
-[C:/inetpub/wwwroot/birzha-contracts/Views/Shared/_Layout.cshtml]
+[c:/inetpub/wwwroot/birzha-contracts/Views/Shared/_Layout.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcU2hhcmVkXF9MYXlvdXQuY3NodG1s
 build_metadata.AdditionalFiles.CssScope = b-hroascsfxa

obj/staticwebassets.pack.sentinel

@@ -136,3 +136,21 @@
 2.0
 2.0
 2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0
+2.0