diff --git a/Hcs.WebApp/BackgroundServices/CampaignManagers/ParseHousesDataManager_15_7_0_1.cs b/Hcs.WebApp/BackgroundServices/CampaignManagers/ParseHousesDataManager_15_7_0_1.cs index 3b1f976..56b7af0 100644 --- a/Hcs.WebApp/BackgroundServices/CampaignManagers/ParseHousesDataManager_15_7_0_1.cs +++ b/Hcs.WebApp/BackgroundServices/CampaignManagers/ParseHousesDataManager_15_7_0_1.cs @@ -58,7 +58,7 @@ namespace Hcs.WebApp.BackgroundServices.CampaignManagers var args = campaign.DeserializeArgs() as CampaignParseArgs; operations = await HeadquartersService.InitiateOperationsAsync(context, 1, campaign.Id, Operation.OperationType.ParseHousesData_15_7_0_1); - await FileToParseService.SetOperationToFileToParseAsync(context, args!.FileToParseId, operations.First()); + await FileToParseService.SetOperationToFileToParseAsync(context, args!.fileToParseId, operations.First()); await transaction.CommitAsync(); } diff --git a/Hcs.WebApp/Components/Shared/SyncedPageBase.cs b/Hcs.WebApp/Components/Shared/SyncedPageBase.cs index 6b10a08..a1a063b 100644 --- a/Hcs.WebApp/Components/Shared/SyncedPageBase.cs +++ b/Hcs.WebApp/Components/Shared/SyncedPageBase.cs @@ -117,7 +117,7 @@ namespace Hcs.WebApp.Components.Shared // TODO: Use user id var campaign = await HeadquartersService.InitiateCampaignAsync(CampaignType, "", new CampaignParseArgs() { - FileToParseId = (int)dialogResult + fileToParseId = (int)dialogResult }); CampaignManagementState.EnqueueCampaign(campaign); } diff --git a/Hcs.WebApp/Data/Hcs/Campaign.cs b/Hcs.WebApp/Data/Hcs/Campaign.cs index 9f45cdd..cf3bd47 100644 --- a/Hcs.WebApp/Data/Hcs/Campaign.cs +++ b/Hcs.WebApp/Data/Hcs/Campaign.cs @@ -46,17 +46,19 @@ namespace Hcs.WebApp.Data.Hcs public ICampaignArgs? DeserializeArgs() { - if (Args == null) return null; - - return JsonConvert.DeserializeObject(Args, new JsonSerializerSettings() + if (Args == null) + { + return null; + } + return JsonConvert.DeserializeObject(Args, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto - }); + }).args; } public void SerializeArgs(ICampaignArgs args) { - Args = JsonConvert.SerializeObject(args, Formatting.None, new JsonSerializerSettings() + Args = JsonConvert.SerializeObject(new CampaignArgsContainer(args), Formatting.None, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Auto }); diff --git a/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignArgsContainer.cs b/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignArgsContainer.cs new file mode 100644 index 0000000..e95fbea --- /dev/null +++ b/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignArgsContainer.cs @@ -0,0 +1,7 @@ +namespace Hcs.WebApp.Data.Hcs.CampaignArgs +{ + public class CampaignArgsContainer(ICampaignArgs args) + { + public ICampaignArgs args = args; + } +} diff --git a/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignParseArgs.cs b/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignParseArgs.cs index 59087d0..93bfbef 100644 --- a/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignParseArgs.cs +++ b/Hcs.WebApp/Data/Hcs/CampaignArgs/CampaignParseArgs.cs @@ -2,6 +2,6 @@ { public class CampaignParseArgs : ICampaignArgs { - public int FileToParseId; + public int fileToParseId; } }