Skip to content

Fix deserialization of enums #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alexis2004 merged 2 commits into from
Mar 13, 2023
Merged

Fix deserialization of enums #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd8a70
Fix deserialization of enums
Mar 12, 2023
546f57a
Rename names of the enums to avoid using @SerializedName
Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ComparePeriod.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.ecwid.apiclient.v3.dto.report.enums

enum class ComparePeriod(val alias: String) {
PREVIOUS_PERIOD("previousPeriod"),
SIMILAR_PERIOD_IN_PREVIOUS_WEEK("similarPeriodInPreviousWeek"),
SIMILAR_PERIOD_IN_PREVIOUS_MONTH("similarPeriodInPreviousMonth"),
SIMILAR_PERIOD_IN_PREVIOUS_YEAR("similarPeriodInPreviousYear"),
NO_COMPARE_PERIOD("noComparePeriod");
enum class ComparePeriod {
previousPeriod,
similarPeriodInPreviousWeek,
similarPeriodInPreviousMonth,
similarPeriodInPreviousYear,
noComparePeriod;
}
6 changes: 3 additions & 3 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/FirstDayOfWeek.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.ecwid.apiclient.v3.dto.report.enums

enum class FirstDayOfWeek(val alias: String) {
MONDAY("monday"),
SUNDAY("sunday");
enum class FirstDayOfWeek {
monday,
sunday;
}
6 changes: 3 additions & 3 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.ecwid.apiclient.v3.dto.report.enums

enum class ReportType(val alias: String) {
ALL_TRAFFIC("allTraffic"),
NEW_VS_RETURNING_VISITORS("newVsReturningVisitors"),
enum class ReportType {
allTraffic,
newVsReturningVisitors,
}
12 changes: 6 additions & 6 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/TimeScaleValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.ecwid.apiclient.v3.dto.report.enums

enum class TimeScaleValue(val alias: String) {
HOUR("hour"),
DAY("day"),
WEEK("week"),
MONTH("month"),
YEAR("year");
enum class TimeScaleValue {
hour,
day,
week,
month,
year;
}
10 changes: 5 additions & 5 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/report/request/ReportRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.ecwid.apiclient.v3.dto.report.enums.TimeScaleValue
import com.ecwid.apiclient.v3.impl.RequestInfo

data class ReportRequest(
val reportType: ReportType = ReportType.ALL_TRAFFIC,
val reportType: ReportType = ReportType.allTraffic,
val startedFrom: Long? = null,
val endedAt: Long? = null,
val timeScaleValue: TimeScaleValue? = null,
Expand All @@ -19,7 +19,7 @@ data class ReportRequest(
override fun toRequestInfo() = RequestInfo.createGetRequest(
pathSegments = listOf(
"reports",
reportType.alias,
reportType.toString(),
),
params = toParams()
)
Expand All @@ -28,9 +28,9 @@ data class ReportRequest(
return mutableMapOf<String, String>().apply {
startedFrom?.let { put("startedFrom", it.toString()) }
endedAt?.let { put("endedAt", it.toString()) }
timeScaleValue?.let { put("timeScaleValue", it.alias) }
comparePeriod?.let { put("comparePeriod", it.alias) }
firstDayOfWeek?.let { put("firstDayOfWeek", it.alias) }
timeScaleValue?.let { put("timeScaleValue", it.toString()) }
comparePeriod?.let { put("comparePeriod", it.toString()) }
firstDayOfWeek?.let { put("firstDayOfWeek", it.toString()) }
}.toMap()
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/report/result/FetchedReportResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.ecwid.apiclient.v3.dto.report.enums.ReportType
import com.ecwid.apiclient.v3.dto.report.enums.TimeScaleValue

data class FetchedReportResponse(
val reportType: ReportType = ReportType.ALL_TRAFFIC,
val reportType: ReportType = ReportType.allTraffic,
val startedFrom: Long = 0,
val endedAt: Long = 0,
val timeScaleValue: TimeScaleValue? = null,
Expand Down