Skip to content

Commit 69bfac8

Browse files
authored
Merge pull request #309 from sebader/dev
Updates and fix null in data from api
2 parents fa8dc81 + b43df8f commit 69bfac8

File tree

5 files changed

+274
-175
lines changed

5 files changed

+274
-175
lines changed

FetchDataFunctions/FetchDataFunctions.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
<PackageReference Include="Azure.Maps.Search" Version="2.0.0-beta.4" />
2020
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid" Version="3.1.0" />
2121
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" />
23-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.2.3" />
22+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.4" />
23+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.4.0" />
2424
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.SendGrid" Version="3.1.0" />
25-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Sql" Version="3.1.376" />
26-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="6.6.1" />
25+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Sql" Version="3.1.512" />
26+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="6.7.0" />
2727
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
28-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
28+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
2929
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask.Netherite" Version="3.1.0" />
3030
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
32-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.3" />
34-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.3" />
32+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
34+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.6" />
3535

3636
<PackageReference Include="Contrib.Grpc.Core.M1" Version="2.41.0"/>
3737
</ItemGroup>

FetchDataFunctions/Models/AvailabilityData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ namespace FetchDataFunctions.Models;
66
public class AvailabilityData
77
{
88
public Dictionary<string, int> freeBedsPerCategory { get; set; }
9-
public int freeBeds { get; set; }
9+
public int? freeBeds { get; set; }
1010
public string hutStatus { get; set; }
1111
public DateTime date { get; set; }
1212
public string dateFormatted { get; set; }
13-
public int totalSleepingPlaces { get; set; }
13+
public int? totalSleepingPlaces { get; set; }
1414
public string percentage { get; set; }
1515

1616
/// <summary>

WebsiteBackendFunctions/WebsiteBackendFunctions.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
<ItemGroup>
88
<FrameworkReference Include="Microsoft.AspNetCore.App" />
99
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
10-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.1" />
11-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Sql" Version="3.1.376" />
12-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
10+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.4" />
11+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Sql" Version="3.1.512" />
12+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
1313
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
1414
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.6" />
16+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.6" />
17+
<PackageReference Include="System.Runtime.Caching" Version="9.0.6" />
1518
</ItemGroup>
1619
<ItemGroup>
1720
<None Update="host.json">

0 commit comments

Comments
 (0)