Fixed incorrect property name of WinRiskType, PlaceBet now working. M…

…oved data types and enums into folders.
sth2258 · Mar 29, 2015 · d11a9e3 · d11a9e3
1 parent 569c771
commit d11a9e3
Show file tree

Hide file tree

Showing 39 changed files with 106 additions and 97 deletions.
diff --git a/Bet.cs → Data/Bet.cs b/Bet.cs → Data/Bet.cs
@@ -1,7 +1,8 @@
 using System;
 using Newtonsoft.Json;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class Bet
     {

diff --git a/BetAmount.cs → Data/BetAmount.cs b/BetAmount.cs → Data/BetAmount.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     public class BetAmount

diff --git a/ClientBalance.cs → Data/ClientBalance.cs b/ClientBalance.cs → Data/ClientBalance.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class ClientBalance
     {

diff --git a/CurrenciesResponse.cs → Data/CurrenciesResponse.cs b/CurrenciesResponse.cs → Data/CurrenciesResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("rsp")]

diff --git a/Currency.cs → Data/Currency.cs b/Currency.cs → Data/Currency.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("currency")]

diff --git a/Event.cs → Data/Event.cs b/Event.cs → Data/Event.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("event")]

diff --git a/FeedResponse.cs → Data/FeedResponse.cs b/FeedResponse.cs → Data/FeedResponse.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("rsp")]

diff --git a/FeedSport.cs → Data/FeedSport.cs b/FeedSport.cs → Data/FeedSport.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("sport")]

diff --git a/GetBetsResponse.cs → Data/GetBetsResponse.cs b/GetBetsResponse.cs → Data/GetBetsResponse.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class GetBetsResponse
     {

diff --git a/GetInRunningResponse.cs → Data/GetInRunningResponse.cs b/GetInRunningResponse.cs → Data/GetInRunningResponse.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class GetInRunningResponse
     {

diff --git a/GetLineResponse.cs → Data/GetLineResponse.cs b/GetLineResponse.cs → Data/GetLineResponse.cs
@@ -1,7 +1,8 @@
 using System;
 using Newtonsoft.Json;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class GetLineResponse
     {

diff --git a/League.cs → Data/League.cs b/League.cs → Data/League.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("league")]

diff --git a/LeaguesResponse.cs → Data/LeaguesResponse.cs b/LeaguesResponse.cs → Data/LeaguesResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("rsp")]

diff --git a/MoneyLine.cs → Data/MoneyLine.cs b/MoneyLine.cs → Data/MoneyLine.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("moneyLine")]

diff --git a/Period.cs → Data/Period.cs b/Period.cs → Data/Period.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("period")]

diff --git a/PlaceBetRequest.cs → Data/PlaceBetRequest.cs b/PlaceBetRequest.cs → Data/PlaceBetRequest.cs
@@ -1,7 +1,8 @@
 using System;
 using Newtonsoft.Json;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class PlaceBetRequest
     {
@@ -14,7 +15,7 @@ public class PlaceBetRequest
         [JsonProperty(PropertyName = "customerReference")]    // not required
         public string CustomerReference;
 
-        [JsonProperty(PropertyName = "ODDS_FORMAT")]
+        [JsonProperty(PropertyName = "oddsFormat")]
         public OddsFormat OddsFormat;
 
         [JsonProperty(PropertyName = "stake")]

diff --git a/PlaceBetResponse.cs → Data/PlaceBetResponse.cs b/PlaceBetResponse.cs → Data/PlaceBetResponse.cs
@@ -1,15 +1,16 @@
 using System;
 using Newtonsoft.Json;
+using PinnacleWrapper.Enums;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     public class PlaceBetResponse
     {
         [JsonProperty(PropertyName = "status")]
         public PlaceBetResponseStatus Status;
 
         [JsonProperty(PropertyName = "errorCode")]              // If Status is PROCESSED_WITH_ERROR, errorCode will be in the response.
-        public PlaceBetErrorCode ErrorCode;
+        public PlaceBetErrorCode? ErrorCode;
 
         [JsonProperty(PropertyName = "betId")]                  // The bet ID of the new bet. May be empty on failure.
         public int? BetId;

diff --git a/ResponseError.cs → Data/ResponseError.cs b/ResponseError.cs → Data/ResponseError.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("err")]

diff --git a/Sport.cs → Data/Sport.cs b/Sport.cs → Data/Sport.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("sport")]

diff --git a/SportsResponse.cs → Data/SportsResponse.cs b/SportsResponse.cs → Data/SportsResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("rsp")]

diff --git a/Spread.cs → Data/Spread.cs b/Spread.cs → Data/Spread.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("spread")]

diff --git a/Team.cs → Data/Team.cs b/Team.cs → Data/Team.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     public class Team

diff --git a/XmlResponse.cs → Data/XmlResponse.cs b/XmlResponse.cs → Data/XmlResponse.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Data
 {
     [Serializable]
     [XmlRoot("rsp")]

diff --git a/BetListType.cs → Enums/BetListType.cs b/BetListType.cs → Enums/BetListType.cs
@@ -1,4 +1,4 @@
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     public enum BetListType
     {

diff --git a/BetStatus.cs → Enums/BetStatus.cs b/BetStatus.cs → Enums/BetStatus.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum BetStatus

diff --git a/BetType.cs → Enums/BetType.cs b/BetType.cs → Enums/BetType.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum BetType

diff --git a/GetLineResponseStatus.cs → Enums/GetLineResponseStatus.cs b/GetLineResponseStatus.cs → Enums/GetLineResponseStatus.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum GetLineResponseStatus

diff --git a/InRunningState.cs → Enums/InRunningState.cs b/InRunningState.cs → Enums/InRunningState.cs
@@ -1,4 +1,4 @@
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     public enum InRunningState
     {

diff --git a/OddsFormat.cs → Enums/OddsFormat.cs b/OddsFormat.cs → Enums/OddsFormat.cs
@@ -1,16 +1,16 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum OddsFormat
     {
-        American,
-        Decimal,
-        HongKong,
-        Indonesian,
-        Malay,
+        AMERICAN,
+        DECIMAL,
+        HONGKONG,
+        INDONESIAN,
+        MALAY,
         Fraction
     }
 }
diff --git a/PlaceBetErrorCode.cs → Enums/PlaceBetErrorCode.cs b/PlaceBetErrorCode.cs → Enums/PlaceBetErrorCode.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum PlaceBetErrorCode

diff --git a/PlaceBetResponseStatus.cs → Enums/PlaceBetResponseStatus.cs b/PlaceBetResponseStatus.cs → Enums/PlaceBetResponseStatus.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum PlaceBetResponseStatus

diff --git a/SideType.cs → Enums/SideType.cs b/SideType.cs → Enums/SideType.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum SideType

diff --git a/Status.cs → Enums/Status.cs b/Status.cs → Enums/Status.cs
@@ -1,4 +1,4 @@
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     public enum Status
     {

diff --git a/TeamType.cs → Enums/TeamType.cs b/TeamType.cs → Enums/TeamType.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum TeamType

diff --git a/WinRiskType.cs → Enums/WinRiskType.cs b/WinRiskType.cs → Enums/WinRiskType.cs
@@ -1,12 +1,12 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PinnacleWrapper
+namespace PinnacleWrapper.Enums
 {
     [JsonConverter(typeof(StringEnumConverter))]
     public enum WinRiskType
     {
-        Win,
-        Risk
+        Risk,
+        Win
     }
 }
diff --git a/Feed.cs b/Feed.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using PinnacleWrapper.Data;
 
 namespace PinnacleWrapper
 {

diff --git a/FeedLeague.cs b/FeedLeague.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using PinnacleWrapper.Data;
 
 namespace PinnacleWrapper
 {