Skip to content

Commit 54d4bc9

Browse files
talipatpacetalipatpace
committed
Merge branch '315-fetch-api-specs-from-repo' into 'master'
Resolve "Fetch API specs from repo" Closes #315 See merge request pace/mobile/android/pace-cloud-sdk!345
2 parents ca68119 + e49a784 commit 54d4bc9

File tree

162 files changed

+974
-3219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+974
-3219
lines changed

‎docs/index.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ This framework combines multipe functionalities provided by PACE i.e. authorizin
2121
+ [18.x.x -> 19.x.x](#from-18xx-to-19xx)
2222
+ [19.x.x -> 20.x.x](#from-19xx-to-20xx)
2323
+ [20.x.x -> 21.x.x](#from-20xx-to-21xx)
24+
+ [21.x.x -> 22.x.x](#from-21xx-to-22xx)
2425

2526
## Documentation
2627
The full documentation and instructions on how to integrate PACE Cloud SDK can be found [here](https://docs.pace.cloud/en/integrating/mobile-app)
@@ -171,6 +172,9 @@ The `GasStations` properties `paymentMethods`, `amenities`, `foods`, `loyaltyPro
171172
- We have refactored our `Configuration` object that is used in the `PACECloudSDK.setup(...)` function: We have added `clientID` as property to `Configuration` and removed it from `CustomOIDConfiguration`.
172173
- We have raised the min sdk version to 26 (Android 8).
173174

175+
### From 21.x.x to 22.x.x
176+
- Updated Fueling, Pay, User and POI API
177+
174178
## SDK API Docs
175179

176180
Here is a complete list of all our SDK API documentations:

‎library/src/main/java/cloud/pace/sdk/api/fueling/FuelingAPI.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import cloud.pace.sdk.api.API
1212
/** Fueling API */
1313
object FuelingAPI {
1414

15-
const val VERSION = "2022-1"
15+
const val VERSION = "2024-2"
1616
internal val baseUrl = "${API.baseUrl}/fueling/$VERSION/"
1717

1818
class DiscountAPI

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/ApproachingResponseModel.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class ApproachingResponse : Resource() {
3030
private var transactions: HasMany<Transaction> = HasMany()
3131
fun getTransactions() = transactions.get(document)
3232

33+
private var unsupportedPaymentMethodKinds: HasMany<PaymentMethodKind> = HasMany()
34+
fun getUnsupportedPaymentMethodKinds() = unsupportedPaymentMethodKinds.get(document)
35+
3336
private var unsupportedPaymentMethods: HasMany<PaymentMethod> = HasMany()
3437
fun getUnsupportedPaymentMethods() = unsupportedPaymentMethods.get(document)
3538
}

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/FuelPriceModel.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ class FuelPrice : Resource() {
6666
@Json(name = "dieselGtl")
6767
DIESELGTL("dieselGtl"),
6868

69+
@SerializedName("dieselB0")
70+
@Json(name = "dieselB0")
71+
DIESELB0("dieselB0"),
72+
6973
@SerializedName("dieselB7")
7074
@Json(name = "dieselB7")
7175
DIESELB7("dieselB7"),
@@ -74,10 +78,30 @@ class FuelPrice : Resource() {
7478
@Json(name = "dieselB15")
7579
DIESELB15("dieselB15"),
7680

81+
@SerializedName("dieselB20")
82+
@Json(name = "dieselB20")
83+
DIESELB20("dieselB20"),
84+
85+
@SerializedName("dieselBMix")
86+
@Json(name = "dieselBMix")
87+
DIESELBMIX("dieselBMix"),
88+
7789
@SerializedName("dieselPremium")
7890
@Json(name = "dieselPremium")
7991
DIESELPREMIUM("dieselPremium"),
8092

93+
@SerializedName("dieselHvo")
94+
@Json(name = "dieselHvo")
95+
DIESELHVO("dieselHvo"),
96+
97+
@SerializedName("dieselRed")
98+
@Json(name = "dieselRed")
99+
DIESELRED("dieselRed"),
100+
101+
@SerializedName("dieselSynthetic")
102+
@Json(name = "dieselSynthetic")
103+
DIESELSYNTHETIC("dieselSynthetic"),
104+
81105
@SerializedName("lpg")
82106
@Json(name = "lpg")
83107
LPG("lpg"),

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/FuelPriceResponseModel.kt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ class FuelPriceResponse : Resource() {
6666
@Json(name = "dieselGtl")
6767
DIESELGTL("dieselGtl"),
6868

69+
@SerializedName("dieselB0")
70+
@Json(name = "dieselB0")
71+
DIESELB0("dieselB0"),
72+
6973
@SerializedName("dieselB7")
7074
@Json(name = "dieselB7")
7175
DIESELB7("dieselB7"),
@@ -74,10 +78,30 @@ class FuelPriceResponse : Resource() {
7478
@Json(name = "dieselB15")
7579
DIESELB15("dieselB15"),
7680

81+
@SerializedName("dieselB20")
82+
@Json(name = "dieselB20")
83+
DIESELB20("dieselB20"),
84+
85+
@SerializedName("dieselBMix")
86+
@Json(name = "dieselBMix")
87+
DIESELBMIX("dieselBMix"),
88+
7789
@SerializedName("dieselPremium")
7890
@Json(name = "dieselPremium")
7991
DIESELPREMIUM("dieselPremium"),
8092

93+
@SerializedName("dieselHvo")
94+
@Json(name = "dieselHvo")
95+
DIESELHVO("dieselHvo"),
96+
97+
@SerializedName("dieselRed")
98+
@Json(name = "dieselRed")
99+
DIESELRED("dieselRed"),
100+
101+
@SerializedName("dieselSynthetic")
102+
@Json(name = "dieselSynthetic")
103+
DIESELSYNTHETIC("dieselSynthetic"),
104+
81105
@SerializedName("lpg")
82106
@Json(name = "lpg")
83107
LPG("lpg"),

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/PaymentMethodKindModel.kt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,15 @@ This field is optional and if not present should be assumed to indicate `implici
4141
/* data privacy information */
4242
class DataPrivacy {
4343

44-
/* Localized hint that data privacy terms apply. The hint comes formatted in multiple ways, which are all equally valid if given. Additional formats might be added in the future. */
45-
var hint: Hint? = null
46-
4744
/* Localized data privacy terms. The terms come formatted in multiple ways, which are all equally valid if given. Additional formats might be added in the future. */
4845
var terms: Terms? = null
4946

50-
/* Localized hint that data privacy terms apply. The hint comes formatted in multiple ways, which are all equally valid if given. Additional formats might be added in the future. */
51-
class Hint {
52-
53-
/* Hint formatted as markdown. Contains only links to the reference <code>terms</code>. Does not contain other links. Other than that, only contains markdown syntax for <a href="https://daringfireball.net/projects/markdown/syntax#p">Paragraphs and Line Breaks</a> and <a href="https://daringfireball.net/projects/markdown/syntax#em">Emphasis</a>. */
54-
var markdown: String? = null
55-
}
56-
5747
/* Localized data privacy terms. The terms come formatted in multiple ways, which are all equally valid if given. Additional formats might be added in the future. */
5848
class Terms {
5949

50+
/* Terms formatted as markdown. Does not contain external resources like images. */
51+
var html: String? = null
52+
6053
/* Terms formatted as markdown. Does not contain external resources like images. */
6154
var markdown: String? = null
6255
}

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/ProcessPaymentResponseModel.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ class ProcessPaymentResponse : Resource() {
2020

2121
/* Amount that was discounted. Only if any discounts were applied earlier. */
2222
var discountAmount: Double? = null
23+
24+
/* Driver/vehicle identification */
25+
var driverVehicleID: String? = null
2326
var gasStationId: String? = null
2427

2528
/* Mileage in meters */

library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CategoriesModel.kt renamed to library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/ProductModel.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* https://github.com/pace/SwagGen
66
*/
77

8-
package cloud.pace.sdk.api.poi.generated.model
8+
package cloud.pace.sdk.api.fueling.generated.model
99

10-
typealias Categories = List<Category>
10+
class Product {
11+
12+
var name: String? = null
13+
}

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/PumpModel.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ class Pump : Resource() {
1717

1818
var vat: VAT? = null
1919

20+
/* Only if status is locked: available fuel products at the given pump */
21+
var availableProducts: List<Product>? = null
22+
2023
/* Currency as specified in ISO-4217. */
2124
var currency: String? = null
2225

‎library/src/main/java/cloud/pace/sdk/api/fueling/generated/model/PumpResponseModel.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ class PumpResponse : Resource() {
1717

1818
var vat: VAT? = null
1919

20+
/* Only if status is locked: available fuel products at the given pump */
21+
var availableProducts: List<Product>? = null
22+
2023
/* Currency as specified in ISO-4217. */
2124
var currency: String? = null
2225

0 commit comments

Comments
 (0)