caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

NSCv3: change error response processing

Browse source
This commit is contained in:
Milos Kozak 2023-01-23 11:26:37 +01:00
parent 4328597641
commit 97524c47a2
2 changed files with 74 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
View file

@ -173,18 +173,22 @@ class NSAndroidClientImpl(
// because utcOffset is mandatory and cannot be change, try 0 // because utcOffset is mandatory and cannot be change, try 0
nsSgvV3.utcOffset = 0 nsSgvV3.utcOffset = 0
return@callWrapper createSvg(nsSgvV3) return@callWrapper createSvg(nsSgvV3)
} else if (response.code() == 400 && errorResponse?.contains("Field utcOffset cannot be modified by the client") == true) { } else if (response.code() == 400 && errorResponse?.contains("cannot be modified by the client") == true) {
// there is different utcOffset than in AAPS and zero // there is different field to field in AAPS
// not possible to upload // not possible to upload
return@callWrapper CreateUpdateResponse( return@callWrapper CreateUpdateResponse(
response = response.code(), response = response.code(),
identifier = null, identifier = null,
errorResponse = errorResponse errorResponse = errorResponse
) )
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = errorResponse ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(errorResponse ?: response.message())
} }
override suspend fun updateSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun updateSvg(nsSgvV3: NSSgvV3): CreateUpdateResponse = callWrapper(dispatcher) {
@ -213,10 +217,14 @@ class NSAndroidClientImpl(
deduplicatedIdentifier = null, deduplicatedIdentifier = null,
lastModified = null lastModified = null
) )
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): NSAndroidClient.ReadResponse<List<NSTreatment>> = callWrapper(dispatcher) { override suspend fun getTreatmentsNewerThan(createdAt: String, limit: Long): NSAndroidClient.ReadResponse<List<NSTreatment>> = callWrapper(dispatcher) {
@ -280,10 +288,14 @@ class NSAndroidClientImpl(
lastModified = response.body()?.result?.lastModified lastModified = response.body()?.result?.lastModified
) )
} else throw UnknownResponseNightscoutException() } else throw UnknownResponseNightscoutException()
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) {
@ -311,18 +323,22 @@ class NSAndroidClientImpl(
// because utcOffset is mandatory and cannot be change, try 0 // because utcOffset is mandatory and cannot be change, try 0
nsTreatment.utcOffset = 0 nsTreatment.utcOffset = 0
return@callWrapper createTreatment(nsTreatment) return@callWrapper createTreatment(nsTreatment)
} else if (response.code() == 400 && errorResponse?.contains("Field utcOffset cannot be modified by the client") == true) { } else if (response.code() == 400 && errorResponse?.contains("cannot be modified by the client") == true) {
// there is different utcOffset than in AAPS and zero // there is different field to field in AAPS
// not possible to upload // not possible to upload
return@callWrapper CreateUpdateResponse( return@callWrapper CreateUpdateResponse(
response = response.code(), response = response.code(),
identifier = null, identifier = null,
errorResponse = errorResponse errorResponse = errorResponse
) )
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = errorResponse ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(errorResponse ?: response.message())
} }
override suspend fun updateTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun updateTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) {
@ -351,10 +367,14 @@ class NSAndroidClientImpl(
deduplicatedIdentifier = null, deduplicatedIdentifier = null,
lastModified = null lastModified = null
) )
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun getFoods(limit: Long): NSAndroidClient.ReadResponse<List<NSFood>> = callWrapper(dispatcher) { override suspend fun getFoods(limit: Long): NSAndroidClient.ReadResponse<List<NSFood>> = callWrapper(dispatcher) {
@ -404,9 +424,14 @@ class NSAndroidClientImpl(
lastModified = response.body()?.result?.lastModified lastModified = response.body()?.result?.lastModified
) )
} else throw UnsuccessfullNightscoutException() } else throw UnsuccessfullNightscoutException()
} else { } else if (response.code() in 400..499) {
throw UnsuccessfullNightscoutException() return@callWrapper CreateUpdateResponse(
} response = response.code(),
identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun updateFood(nsFood: NSFood): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun updateFood(nsFood: NSFood): CreateUpdateResponse = callWrapper(dispatcher) {
@ -432,10 +457,14 @@ class NSAndroidClientImpl(
deduplicatedIdentifier = null, deduplicatedIdentifier = null,
lastModified = null lastModified = null
) )
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun createProfileStore(remoteProfileStore: JSONObject): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun createProfileStore(remoteProfileStore: JSONObject): CreateUpdateResponse = callWrapper(dispatcher) {
@ -459,10 +488,14 @@ class NSAndroidClientImpl(
lastModified = response.body()?.result?.lastModified lastModified = response.body()?.result?.lastModified
) )
} else throw UnsuccessfullNightscoutException() } else throw UnsuccessfullNightscoutException()
} else if (response.code() in 400..499) } else if (response.code() in 400..499) {
throw InvalidParameterNightscoutException(response.errorBody()?.string() ?: response.message()) return@callWrapper CreateUpdateResponse(
else response = response.code(),
throw UnsuccessfullNightscoutException() identifier = null,
errorResponse = response.errorBody()?.string() ?: response.message()
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun getLastProfileStore(): NSAndroidClient.ReadResponse<List<JSONObject>> = callWrapper(dispatcher) { override suspend fun getLastProfileStore(): NSAndroidClient.ReadResponse<List<JSONObject>> = callWrapper(dispatcher) {

7
core/ns-sdk/src/main/java/info/nightscout/sdk/exceptions/UnsuccessfullNightscoutException.kt
View file

@ -1,3 +1,8 @@
package info.nightscout.sdk.exceptions package info.nightscout.sdk.exceptions
class UnsuccessfullNightscoutException : NightscoutException() class UnsuccessfullNightscoutException : NightscoutException {
constructor() : super()
constructor(message: String) : super(message)
constructor(message: String, cause: Throwable) : super(message, cause)
constructor(cause: Throwable?) : super(cause)
}