bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tibor' into 'master'

Browse Source 
API 1.0.24 Tracking.eventValue String

See merge request bossanyit/aitrainer_server!38
This commit is contained in:
Bossányi Tibor 2021-02-07 12:10:02 +00:00
commit ed9f165bed
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/db/install.sql
View File

@ -924,7 +924,7 @@ CREATE TABLE `tracking` (
`customer_id` INT(20) NOT NULL DEFAULT '0', `customer_id` INT(20) NOT NULL DEFAULT '0',
`date_add` DATETIME NOT NULL, `date_add` DATETIME NOT NULL,
`event` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `event` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`event_value` DOUBLE NULL DEFAULT NULL, `event_value` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`area` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `area` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`platform` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `platform` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`version` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `version` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',

2
data/db/update_1_0_24.sql
View File

@ -5,7 +5,7 @@ CREATE TABLE `tracking` (
`customer_id` INT(20) NOT NULL DEFAULT '0', `customer_id` INT(20) NOT NULL DEFAULT '0',
`date_add` DATETIME NOT NULL, `date_add` DATETIME NOT NULL,
`event` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `event` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`event_value` DOUBLE NULL DEFAULT NULL, `event_value` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`area` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `area` CHAR(100) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`platform` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `platform` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',
`version` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci', `version` CHAR(20) NULL DEFAULT NULL COLLATE 'utf8_hungarian_ci',

2
src/main/kotlin/com/aitrainer/api/model/Tracking.kt
View File

@ -12,7 +12,7 @@ data class Tracking (
@get: NonNull var customerId: Long = 0, @get: NonNull var customerId: Long = 0,
@get: NonNull var dateAdd: String? = null, @get: NonNull var dateAdd: String? = null,
@get: NonNull var event: String = "", @get: NonNull var event: String = "",
var eventValue: Double? = null, var eventValue: String? = null,
var area: String = "", var area: String = "",
var platform: String = "", var platform: String = "",
var version: String = "" var version: String = ""

2
src/test/kotlin/com/aitrainer/api/test/TrackingTest.kt
View File

@ -36,6 +36,7 @@ class TrackingTest {
customerId = 90, customerId = 90,
dateAdd = "2021-02-04 23:42:00", dateAdd = "2021-02-04 23:42:00",
event = "SalesPage", event = "SalesPage",
eventValue = 12.0.toString(),
platform = "iOS", platform = "iOS",
version = "1.1.5" version = "1.1.5"
) )
@ -46,6 +47,7 @@ class TrackingTest {
assertTrue(response.body is Tracking ) assertTrue(response.body is Tracking )
val trackingResponse = response.body val trackingResponse = response.body
assertEquals(trackingResponse!!.event, "SalesPage") assertEquals(trackingResponse!!.event, "SalesPage")
assertEquals(trackingResponse.eventValue, "12.0")
assertEquals(trackingResponse.version, "1.1.5") assertEquals(trackingResponse.version, "1.1.5")
trackingRepository.delete(trackingResponse) trackingRepository.delete(trackingResponse)
} }