Merge pull request #41 from andmos/feature/anm-GBFSVersion

Feature/anm gbfs version
andmos · Dec 29, 2019 · 4f8b002 · 4f8b002
2 parents 66f6620 + 092f6ae
commit 4f8b002
Show file tree

Hide file tree

Showing 22 changed files with 616 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -136,6 +136,7 @@ _TeamCity*
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
+*.opencover.xml
 
 # NCrunch
 _NCrunch_*

diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,6 @@ WORKDIR /app
 COPY src/BikeshareClient .
 RUN dotnet restore
 
-RUN dotnet test TestBikeshareClient/TestBikeshareClient.csproj /p:CollectCoverage=true /p:Threshold=80 /p:ThresholdType=line /p:CoverletOutputFormat=opencover
+RUN dotnet test TestBikeshareClient/TestBikeshareClient.csproj /p:CollectCoverage=true /p:Threshold=80 /p:ThresholdType=line /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=ExcludeFromCodeCoverageAttribute
 
 RUN dotnet pack -c Release -o output $VERSION_SUFFIX
diff --git a/src/BikeshareClient/BikeshareClient/BikeshareClient.csproj b/src/BikeshareClient/BikeshareClient/BikeshareClient.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <ReleaseVersion>3.1.0</ReleaseVersion>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <ReleaseVersion>3.2.0</ReleaseVersion>
+    <VersionPrefix>3.2.0</VersionPrefix>
     <Title>BikeshareClient</Title>
     <Authors>andmos</Authors>
     <Description>Dotnet client for bike share systems implementing the General Bikeshare Feed Specification (GBFS).</Description>

diff --git a/src/BikeshareClient/BikeshareClient/DTO/BikeStatusDTO.cs b/src/BikeshareClient/BikeshareClient/DTO/BikeStatusDTO.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using BikeshareClient.Helpers;
 using BikeshareClient.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -9,18 +11,24 @@ namespace BikeshareClient.DTO
 	internal readonly struct BikeStatusDTO
     {
 		[JsonConstructor]
-		public BikeStatusDTO([JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))]DateTime lastUpdate, 
-		                     [JsonProperty("ttl")] int timeToLive, 
-		                     [JsonProperty("data")] BikeStatusData bikeData)
+		public BikeStatusDTO(
+			[JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))]DateTime lastUpdate, 
+			[JsonProperty("ttl")] int timeToLive,
+			[JsonProperty("version"), JsonConverter(typeof(StringToSemanticVersionConverter))] SemanticVersion version, 
+			[JsonProperty("data")] BikeStatusData bikeData)
         {
 			LastUpdated = lastUpdate;
 			TimeToLive = timeToLive;
-			BikeStatusData = bikeData; 
+            Version = version ?? new SemanticVersion("1.0");
+            BikeStatusData = bikeData;
+
 		}
 
-        public DateTime LastUpdated { get; }
+		public DateTime LastUpdated { get; }
+
+		public int TimeToLive { get; }
 
-        public int TimeToLive { get; }
+		public SemanticVersion Version { get; }
 
 		public BikeStatusData BikeStatusData { get; }
 	}

diff --git a/src/BikeshareClient/BikeshareClient/DTO/GbfsDTO.cs b/src/BikeshareClient/BikeshareClient/DTO/GbfsDTO.cs
@@ -11,18 +11,23 @@ namespace BikeshareClient.DTO
 	internal readonly struct GbfsDTO
     {
         [JsonConstructor]
-        public GbfsDTO([JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastUpdated,
-                       [JsonProperty("ttl")] int timeToLive,
-                       [JsonProperty("data"), JsonConverter(typeof(FeedsConverter))] FeedsData[] feedsData)
+        public GbfsDTO(
+            [JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastUpdated,
+            [JsonProperty("ttl")] int timeToLive,
+            [JsonProperty("version"), JsonConverter(typeof(StringToSemanticVersionConverter))] SemanticVersion version,
+            [JsonProperty("data"), JsonConverter(typeof(FeedsConverter))] FeedsData[] feedsData)
         {
             LastUpdated = lastUpdated;
             TimeToLive = timeToLive;
+            Version = version ?? new SemanticVersion("1.0");
             FeedsData = feedsData;
         }
         public DateTime LastUpdated { get; }
 
         public int TimeToLive { get; }
 
+        public SemanticVersion Version { get; }
+
         public FeedsData[] FeedsData { get; }
 
     }

diff --git a/src/BikeshareClient/BikeshareClient/DTO/StationDTO.cs b/src/BikeshareClient/BikeshareClient/DTO/StationDTO.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using BikeshareClient.Helpers;
 using BikeshareClient.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -9,19 +10,24 @@ namespace BikeshareClient.DTO
     internal readonly struct StationDTO
     {
         [JsonConstructor]
-        public StationDTO([JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastUpdated,
-                          [JsonProperty("ttl")] int timeToLive,
-                          [JsonProperty("data")] StationData stationsData)
+        public StationDTO(
+            [JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastUpdated,
+            [JsonProperty("ttl")] int timeToLive,
+            [JsonProperty("version"), JsonConverter(typeof(StringToSemanticVersionConverter))] SemanticVersion version,
+            [JsonProperty("data")] StationData stationsData)
         {
             LastUpdated = lastUpdated;
             TimeToLive = timeToLive;
+            Version = version ?? new SemanticVersion("1.0");
             StationsData = stationsData;
         }
 
         public DateTime LastUpdated { get; }
 
         public int TimeToLive { get; }
 
+        public SemanticVersion Version { get; }
+
         public StationData StationsData { get; }
     }
 

diff --git a/src/BikeshareClient/BikeshareClient/DTO/StationStatusDTO.cs b/src/BikeshareClient/BikeshareClient/DTO/StationStatusDTO.cs
@@ -1,41 +1,45 @@
 using System;
 using System.Collections.Generic;
+using BikeshareClient.Helpers;
 using BikeshareClient.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
 namespace BikeshareClient.DTO
 {
-	internal readonly struct StationStatusDTO
+    internal readonly struct StationStatusDTO
     {
-		[JsonConstructor]
-		public StationStatusDTO([JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))]DateTime lastUpdated, 
-		                        [JsonProperty("ttl")] int timeToLive, 
-		                        [JsonProperty("data")]StationStatusData stationStatusData)
+        [JsonConstructor]
+        public StationStatusDTO(
+            [JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))]DateTime lastUpdated, 
+            [JsonProperty("ttl")] int timeToLive,
+            [JsonProperty("version"), JsonConverter(typeof(StringToSemanticVersionConverter))] SemanticVersion version,
+            [JsonProperty("data")]StationStatusData stationStatusData)
         {
             LastUpdated = lastUpdated;
             TimeToLive = timeToLive;
+            Version = version ?? new SemanticVersion("1.0");
             StationsStatusData = stationStatusData; 
         }
 
 
-		public DateTime LastUpdated { get; }
+        public DateTime LastUpdated { get; }
 
-
         public int TimeToLive { get; }
-
+
+        public SemanticVersion Version { get; }
 
         public StationStatusData StationsStatusData { get; }
 
     }
-	internal struct StationStatusData
+    internal struct StationStatusData
     {
-		[JsonConstructor]
-		public StationStatusData(IEnumerable<StationStatus> stations)
-		{
-			StationsStatus = stations;
-		}
+        [JsonConstructor]
+        public StationStatusData(IEnumerable<StationStatus> stations)
+        {
+            StationsStatus = stations;
+        }
 
-		public IEnumerable<StationStatus> StationsStatus { get; }
+        public IEnumerable<StationStatus> StationsStatus { get; }
     }
 }
diff --git a/src/BikeshareClient/BikeshareClient/DTO/SystemInformationDTO.cs b/src/BikeshareClient/BikeshareClient/DTO/SystemInformationDTO.cs
@@ -1,26 +1,32 @@
 using System;
+using BikeshareClient.Helpers;
 using BikeshareClient.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
 namespace BikeshareClient.DTO
 {
-	internal readonly struct SystemInformationDTO
+    internal readonly struct SystemInformationDTO
     {
-		public SystemInformationDTO([JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastupdated, 
-		                            [JsonProperty("ttl")] int timeToLive,
-		                            [JsonProperty("data")] SystemInformation systemInformation)
+        public SystemInformationDTO(
+            [JsonProperty("last_updated"), JsonConverter(typeof(UnixDateTimeConverter))] DateTime lastupdated, 
+            [JsonProperty("ttl")] int timeToLive,
+            [JsonProperty("version"), JsonConverter(typeof(StringToSemanticVersionConverter))] SemanticVersion version,
+            [JsonProperty("data")] SystemInformation systemInformation)
         {
-			LastUpdated = lastupdated;
-			TimeToLive = timeToLive;
-			SystemInformation = systemInformation;
-		}
+            LastUpdated = lastupdated;
+            TimeToLive = timeToLive;
+            Version = version ?? new SemanticVersion("1.0");
+            SystemInformation = systemInformation;
+        }
 
-		public DateTime LastUpdated { get; }
+        public DateTime LastUpdated { get; }
 
-		public int TimeToLive { get; }
+        public int TimeToLive { get; }
 
-		public SystemInformation SystemInformation { get; }
+        public SemanticVersion Version { get; }
+
+        public SystemInformation SystemInformation { get; }
 
     }
 }