Merge pull request #268 from Ecwid/report_api

Fix deserialization of enums

Author: Alexis2004

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ComparePeriod.kt

@@ -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;
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/FirstDayOfWeek.kt

@@ -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;
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt

@@ -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,
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/TimeScaleValue.kt

@@ -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;
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/request/ReportRequest.kt

@@ -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,
@@ -19,7 +19,7 @@ data class ReportRequest(
 	override fun toRequestInfo() = RequestInfo.createGetRequest(
 		pathSegments = listOf(
 			"reports",
-			reportType.alias,
+			reportType.toString(),
 		),
 		params = toParams()
 	)
@@ -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()
 	}
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/result/FetchedReportResponse.kt

@@ -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,