final working version finished

This commit is contained in:
merdan 2022-11-22 17:59:03 +05:00
parent 37849f8ecf
commit bb1daf2cba
11 changed files with 26 additions and 8 deletions

View File

@ -31,9 +31,16 @@ namespace birzha_contracts.Jobs{
var firstTimeDB = Convert.ToBoolean(ConfigManager.AppSetting["FirstTimeDB"]); var firstTimeDB = Convert.ToBoolean(ConfigManager.AppSetting["FirstTimeDB"]);
var dbContext = scope.ServiceProvider.GetService<MvcContractContext>(); var dbContext = scope.ServiceProvider.GetService<MvcContractContext>();
var contracts = new List<ContractResolution>(); var contracts = new List<ContractResolution>();
var minutesAgo = Convert.ToDouble(ConfigManager.AppSetting["DataMinutesAgo"]); if(firstTimeDB){
minutesAgo = minutesAgo * (-1); var dateFrom = Convert.ToDateTime(ConfigManager.AppSetting["FirstTimeDBFillDateFrom"]);
contracts = dbContext!.ContractResolution.Where(x => x.ModifiedDate > DateTime.Now.AddMinutes(minutesAgo)).OrderByDescending(d => d.ModifiedDate).ToList(); contracts = dbContext!.ContractResolution.OrderByDescending(x => x.ID).Take(1000).ToList();
}
else{
var minutesAgo = Convert.ToDouble(ConfigManager.AppSetting["DataMinutesAgo"]);
minutesAgo = minutesAgo * (-1);
contracts = dbContext!.ContractResolution.OrderByDescending(x => x.ID).Take(1000).ToList();
}
_logger.LogInformation("Sending request: Contract-Resolution"); _logger.LogInformation("Sending request: Contract-Resolution");
var data = JsonConvert.SerializeObject(contracts); var data = JsonConvert.SerializeObject(contracts);

View File

@ -13,7 +13,7 @@ public class ContractResolution
public long Resolution_ID { get; set; } public long Resolution_ID { get; set; }
public long ResolutionBasis { get; set; } public string? ResolutionBasis { get; set; }
public DateTime? ModifiedDate { get; set; } public DateTime? ModifiedDate { get; set; }
} }

View File

@ -8,7 +8,7 @@
"UpdateTime":"0 */3 * * * ?", "UpdateTime":"0 */3 * * * ?",
"Domain":"https://panel.exchange.gov.tm", "Domain":"https://panel.exchange.gov.tm",
"DataMinutesAgo":3, "DataMinutesAgo":3,
"FirstTimeDBFillDateFrom": "2022-10-01 00:00:10.183", "FirstTimeDBFillDateFrom": "2022-10-10 00:00:10.183",
"FirstTimeDB":false, "FirstTimeDB":false,
"API_contracts":"/api/contract/import", "API_contracts":"/api/contract/import",
"API_contract_resolution":"/api/contract/resolution-import", "API_contract_resolution":"/api/contract/resolution-import",

View File

@ -7,9 +7,9 @@
}, },
"UpdateTime":"0 */1 * * * ?", "UpdateTime":"0 */1 * * * ?",
"Domain":"https://panel.exchange.gov.tm", "Domain":"https://panel.exchange.gov.tm",
"DataMinutesAgo":30, "DataMinutesAgo":3,
"FirstTimeDBFillDateFrom": "2022-10-03 16:59:40.183", "FirstTimeDBFillDateFrom": "2022-10-10 00:00:10.183",
"FirstTimeDB":false, "FirstTimeDB":true,
"API_contracts":"/api/contract/import", "API_contracts":"/api/contract/import",
"API_contract_resolution":"/api/contract/resolution-import", "API_contract_resolution":"/api/contract/resolution-import",
"AllowedHosts": "*", "AllowedHosts": "*",

View File

@ -125,3 +125,14 @@
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