From 949fb44b162301be7c7dcea902b701fdebb1227c Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 11:02:54 +0200 Subject: [PATCH 01/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 14 ++++++++++++++ commons/active/bankingapp/event.avsc | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 commons/active/bankingapp/attempt.avsc create mode 100644 commons/active/bankingapp/event.avsc diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc new file mode 100644 index 00000000..f74e0be8 --- /dev/null +++ b/commons/active/bankingapp/attempt.avsc @@ -0,0 +1,14 @@ +{ + "namespace": "org.radarcns.active.bankingapp", + "type": "record", + "name": "BankingAppEvent", + "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", + "fields": [ + { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt"}, + { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, + { "name": "completion", "type": "enum", "symbols": ["Completed", "NotCompleted"], "doc": "Shows whether the attempt is completed or not completed" }, + { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"] "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended}, + ] +} \ No newline at end of file diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc new file mode 100644 index 00000000..45caa334 --- /dev/null +++ b/commons/active/bankingapp/event.avsc @@ -0,0 +1,16 @@ +{ + "namespace": "org.radarcns.active.bankingapp", + "type": "record", + "name": "BankingAppEvent", + "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", + "fields": [ + { "name": "uid", "type": "string", "doc": "Unique ID for an Event"}, + { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, + { "name": "correctness", "type": "enum", "symbols": ["Correct", "Wrong"], "doc": "The validity of the user's input submitted" }, + { "name": "input_type", "type": "enum", "symbols": ["Pin", "Amount", "Cancelled", "Confirmed"], "doc": "The type of submitted input."}, + { "name": "attempt_id", "type":"string", "doc": "The uid of attempt record that the event is related to."} + ] +} + From 02814ab5d23c4ba518175c8864fa090071701aa9 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 11:19:32 +0200 Subject: [PATCH 02/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index f74e0be8..32cbeb31 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -9,6 +9,6 @@ { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, { "name": "completion", "type": "enum", "symbols": ["Completed", "NotCompleted"], "doc": "Shows whether the attempt is completed or not completed" }, - { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"] "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended}, + { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"], "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended}, ] } \ No newline at end of file From 15258e2f86fd8c13080cefb4955e79432bcd4c83 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 11:28:00 +0200 Subject: [PATCH 03/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index 32cbeb31..d4f26572 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -9,6 +9,6 @@ { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, { "name": "completion", "type": "enum", "symbols": ["Completed", "NotCompleted"], "doc": "Shows whether the attempt is completed or not completed" }, - { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"], "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended}, + { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"], "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended"} ] } \ No newline at end of file From 1bb70af7a30d84b9a9f82cf41f8f2951ab492619 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 12:56:18 +0200 Subject: [PATCH 04/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 22 ++++++++++++++++++++-- commons/active/bankingapp/event.avsc | 20 ++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index d4f26572..31531f9f 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -8,7 +8,25 @@ { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, - { "name": "completion", "type": "enum", "symbols": ["Completed", "NotCompleted"], "doc": "Shows whether the attempt is completed or not completed" }, - { "name": "result", "type": "enum", "symbols": ["CorrectConfirmed", "CorrectCancelled", "WrongConfirmed", "WrongCancelled", "TimeOut", "End"], "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended"} + { "name": "completion", + "type": { + "name": "completionEnum", + "type": "enum", + "symbols":["Completed", "NotCompleted"] + }, + "doc": "Shows whether the attempt is completed or not completed" + }, + { "name": "result", "type": { + "name": "resultEnum", + "type": "enum", + "symbols": + ["CorrectConfirmed", + "CorrectCancelled", + "WrongConfirmed", + "WrongCancelled", + "TimeOut", + "End"] + }, + "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended"} ] } \ No newline at end of file diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc index 45caa334..281862b6 100644 --- a/commons/active/bankingapp/event.avsc +++ b/commons/active/bankingapp/event.avsc @@ -8,9 +8,21 @@ { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, - { "name": "correctness", "type": "enum", "symbols": ["Correct", "Wrong"], "doc": "The validity of the user's input submitted" }, - { "name": "input_type", "type": "enum", "symbols": ["Pin", "Amount", "Cancelled", "Confirmed"], "doc": "The type of submitted input."}, - { "name": "attempt_id", "type":"string", "doc": "The uid of attempt record that the event is related to."} + { "name": "attempt_id", "type":"string", "doc": "The uid of attempt record that the event is related to."}, + { "name": "correctness", + "type": { + "name" : "correctnessEnum", + "type": "enum", + "symbols": ["Correct", "Wrong"] + }, + "doc": "The validity of the user's input submitted" + }, + { "name": "input_type", + "type": { + "name": "input_typeEnum", + "type": "enum", + "symbols": ["Pin", "Amount", "Cancelled", "Confirmed"] + }, + "doc": "The type of submitted input."} ] } - From 375d09e4b64646c0ee14caec79d4595096ad4406 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 13:05:27 +0200 Subject: [PATCH 05/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index 31531f9f..5839c5ff 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -1,7 +1,7 @@ { "namespace": "org.radarcns.active.bankingapp", "type": "record", - "name": "BankingAppEvent", + "name": "BankingAppAttempt", "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", "fields": [ { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt"}, From 07a736aed489e9c8390f569d83a843d1afa9923f Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 14:47:41 +0200 Subject: [PATCH 06/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 30 +++++++++++++------------- commons/active/bankingapp/event.avsc | 22 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index 5839c5ff..48d8f412 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -1,32 +1,32 @@ { "namespace": "org.radarcns.active.bankingapp", "type": "record", - "name": "BankingAppAttempt", + "name": "Attempt", "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt"}, - { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt."}, + { "name": "startTime", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, { "name": "completion", "type": { - "name": "completionEnum", + "name": "CompletionEnum", "type": "enum", - "symbols":["Completed", "NotCompleted"] + "symbols":["COMPLETED", "NOTCOMPLETED"] }, - "doc": "Shows whether the attempt is completed or not completed" + "doc": "Shows whether the attempt is completed or not completed." }, { "name": "result", "type": { - "name": "resultEnum", + "name": "ResultEnum", "type": "enum", "symbols": - ["CorrectConfirmed", - "CorrectCancelled", - "WrongConfirmed", - "WrongCancelled", - "TimeOut", - "End"] + [ "CORRECTCONNFIRMED", + "CORRECTCANCELLED", + "WRONGCONFIRMED", + "WRONGCANCELLED", + "TIMEOUT", + "END"] }, - "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended"} + "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} ] } \ No newline at end of file diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc index 281862b6..db60c203 100644 --- a/commons/active/bankingapp/event.avsc +++ b/commons/active/bankingapp/event.avsc @@ -1,27 +1,27 @@ { "namespace": "org.radarcns.active.bankingapp", "type": "record", - "name": "BankingAppEvent", + "name": "Event", "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Event"}, - { "name": "startTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "endTime", "type": "string", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "uid", "type": "string", "doc": "Unique ID for an Event."}, + { "name": "startTime", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, - { "name": "attempt_id", "type":"string", "doc": "The uid of attempt record that the event is related to."}, + { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to."}, { "name": "correctness", "type": { - "name" : "correctnessEnum", + "name" : "CorrectnessEnum", "type": "enum", - "symbols": ["Correct", "Wrong"] + "symbols": ["CORRECT", "WRONG"] }, - "doc": "The validity of the user's input submitted" + "doc": "The validity of the user's input submitted." }, - { "name": "input_type", + { "name": "inputType", "type": { - "name": "input_typeEnum", + "name": "InputEnum", "type": "enum", - "symbols": ["Pin", "Amount", "Cancelled", "Confirmed"] + "symbols": ["PIN", "AMOUNT", "CANCELLED", "CONFIRMED"] }, "doc": "The type of submitted input."} ] From 5f83c5b1edcf47fbb84b765bc68e9582a3aba494 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 15:18:31 +0200 Subject: [PATCH 07/36] adds bankingapp schemas --- commons/active/bankingapp/attempt.avsc | 17 ++++++++++------- commons/active/bankingapp/event.avsc | 6 +++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index 48d8f412..88845181 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -5,19 +5,21 @@ "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", "fields": [ { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt."}, - { "name": "startTime", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "time", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, { "name": "completion", "type": { "name": "CompletionEnum", "type": "enum", - "symbols":["COMPLETED", "NOTCOMPLETED"] + "symbols":["COMPLETED", "NOTCOMPLETED"], + "doc": "Completion: completed or not completed." }, "doc": "Shows whether the attempt is completed or not completed." }, - { "name": "result", "type": { - "name": "ResultEnum", + { "name": "result", + "type": { + "name": "ResultEnum", "type": "enum", "symbols": [ "CORRECTCONNFIRMED", @@ -25,8 +27,9 @@ "WRONGCONFIRMED", "WRONGCANCELLED", "TIMEOUT", - "END"] - }, - "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} + "END"], + "doc": "Attempt: Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." + }, + "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} ] } \ No newline at end of file diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc index db60c203..b5a6ce42 100644 --- a/commons/active/bankingapp/event.avsc +++ b/commons/active/bankingapp/event.avsc @@ -5,12 +5,12 @@ "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ { "name": "uid", "type": "string", "doc": "Unique ID for an Event."}, - { "name": "startTime", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, + { "name": "time", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to."}, { "name": "correctness", - "type": { + "type": { "name" : "CorrectnessEnum", "type": "enum", "symbols": ["CORRECT", "WRONG"] @@ -18,7 +18,7 @@ "doc": "The validity of the user's input submitted." }, { "name": "inputType", - "type": { + "type": { "name": "InputEnum", "type": "enum", "symbols": ["PIN", "AMOUNT", "CANCELLED", "CONFIRMED"] From c838278435c96eca39a467a5172f95475c9990ee Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 18 Nov 2019 15:27:20 +0200 Subject: [PATCH 08/36] adds bankingapp schemas --- commons/active/bankingapp/event.avsc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc index b5a6ce42..9a6c8af9 100644 --- a/commons/active/bankingapp/event.avsc +++ b/commons/active/bankingapp/event.avsc @@ -13,7 +13,8 @@ "type": { "name" : "CorrectnessEnum", "type": "enum", - "symbols": ["CORRECT", "WRONG"] + "symbols": ["CORRECT", "WRONG"], + "doc": "The validity of input submitted." }, "doc": "The validity of the user's input submitted." }, @@ -21,7 +22,8 @@ "type": { "name": "InputEnum", "type": "enum", - "symbols": ["PIN", "AMOUNT", "CANCELLED", "CONFIRMED"] + "symbols": ["PIN", "AMOUNT", "CANCELLED", "CONFIRMED"], + "doc": "The type of submitted input." }, "doc": "The type of submitted input."} ] From a278d66fb6e5d7fa5add0768576bbfaea3de54e1 Mon Sep 17 00:00:00 2001 From: Lampros Date: Wed, 20 Nov 2019 11:53:50 +0200 Subject: [PATCH 09/36] variable name changes --- commons/active/bankingapp/attempt.avsc | 2 +- commons/active/bankingapp/event.avsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc index 88845181..c5775db0 100644 --- a/commons/active/bankingapp/attempt.avsc +++ b/commons/active/bankingapp/attempt.avsc @@ -27,7 +27,7 @@ "WRONGCONFIRMED", "WRONGCANCELLED", "TIMEOUT", - "END"], + "EXIT"], "doc": "Attempt: Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." }, "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc index 9a6c8af9..9cd9b203 100644 --- a/commons/active/bankingapp/event.avsc +++ b/commons/active/bankingapp/event.avsc @@ -22,7 +22,7 @@ "type": { "name": "InputEnum", "type": "enum", - "symbols": ["PIN", "AMOUNT", "CANCELLED", "CONFIRMED"], + "symbols": ["PIN", "AMOUNT", "CANCELLEDATTEMPT", "CONFIRMEDATTEMPT"], "doc": "The type of submitted input." }, "doc": "The type of submitted input."} From 0ca8c7e62ccd9c3a7f197101753d7ef5556619d6 Mon Sep 17 00:00:00 2001 From: Lampros Date: Fri, 22 Nov 2019 13:59:58 +0200 Subject: [PATCH 10/36] updated schemas --- commons/active/bankingapp/attempt.avsc | 35 ------------------- .../active/bankingapp/banking_attempt.avsc | 29 +++++++++++++++ commons/active/bankingapp/banking_event.avsc | 23 ++++++++++++ commons/active/bankingapp/event.avsc | 30 ---------------- 4 files changed, 52 insertions(+), 65 deletions(-) delete mode 100644 commons/active/bankingapp/attempt.avsc create mode 100644 commons/active/bankingapp/banking_attempt.avsc create mode 100644 commons/active/bankingapp/banking_event.avsc delete mode 100644 commons/active/bankingapp/event.avsc diff --git a/commons/active/bankingapp/attempt.avsc b/commons/active/bankingapp/attempt.avsc deleted file mode 100644 index c5775db0..00000000 --- a/commons/active/bankingapp/attempt.avsc +++ /dev/null @@ -1,35 +0,0 @@ -{ - "namespace": "org.radarcns.active.bankingapp", - "type": "record", - "name": "Attempt", - "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", - "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt."}, - { "name": "time", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, - { "name": "completion", - "type": { - "name": "CompletionEnum", - "type": "enum", - "symbols":["COMPLETED", "NOTCOMPLETED"], - "doc": "Completion: completed or not completed." - }, - "doc": "Shows whether the attempt is completed or not completed." - }, - { "name": "result", - "type": { - "name": "ResultEnum", - "type": "enum", - "symbols": - [ "CORRECTCONNFIRMED", - "CORRECTCANCELLED", - "WRONGCONFIRMED", - "WRONGCANCELLED", - "TIMEOUT", - "EXIT"], - "doc": "Attempt: Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." - }, - "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} - ] -} \ No newline at end of file diff --git a/commons/active/bankingapp/banking_attempt.avsc b/commons/active/bankingapp/banking_attempt.avsc new file mode 100644 index 00000000..a12fb418 --- /dev/null +++ b/commons/active/bankingapp/banking_attempt.avsc @@ -0,0 +1,29 @@ +{ + "namespace": "org.radarcns.active.banking", + "type": "record", + "name": "BankingAttempt", + "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", + "fields": [ + { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt."}, + { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, + { "name": "isComplete", "type":"boolean", "doc": "Describes if the Attempt was conpleted or not"}, + { "name": "result", + "type": { + "name": "AttemptResult", + "type": "enum", + "symbols": + [ "CORRECT_CONFIRMED", + "CORRECT_CANCELLED", + "WRONG_CONFIRMED", + "WRONG_CANCELLED", + "TIME_OUT", + "EXIT", + "UNKNOWN" ], + "default": "UNKNOWN", + "doc": "Attempt: Correct inputs (both pin & amount) Cancelled attempt, Correct inputs Cancelled attempt, Wrong input (at least one of two) Confirmed attempt, Wrong input Cancelled attempt, attempt timed Out, attempt Ended prematurely." + }, + "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} + ] +} \ No newline at end of file diff --git a/commons/active/bankingapp/banking_event.avsc b/commons/active/bankingapp/banking_event.avsc new file mode 100644 index 00000000..e6f81fa5 --- /dev/null +++ b/commons/active/bankingapp/banking_event.avsc @@ -0,0 +1,23 @@ +{ + "namespace": "org.radarcns.active.banking", + "type": "record", + "name": "BankingEvent", + "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", + "fields": [ + { "name": "uid", "type": "string", "doc": "Unique ID for an Event."}, + { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, + { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to."}, + { "name": "isCorrect", "type": "boolean", "doc": "Describes if the input Pin or Amount is correct."}, + { "name": "inputType", + "type": { + "name": "InputTypeValue", + "type": "enum", + "symbols": ["PIN", "AMOUNT", "CANCELLED_ATTEMPT", "CONFIRMED_ATTEMPT", "UNKNOWN"], + "doc": "PIN input, amount imput, cancelled attempt, confirmed attempt", + "default": "UNKNOWN" + }, + "doc": "The type of submitted input: PIN or Amount."} + ] +} diff --git a/commons/active/bankingapp/event.avsc b/commons/active/bankingapp/event.avsc deleted file mode 100644 index 9cd9b203..00000000 --- a/commons/active/bankingapp/event.avsc +++ /dev/null @@ -1,30 +0,0 @@ -{ - "namespace": "org.radarcns.active.bankingapp", - "type": "record", - "name": "Event", - "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", - "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Event."}, - { "name": "time", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "timeCompleted", "type": "double", "doc": "ISO 6801 formatted local date time of device (yyyy-MM-ddTHH:mm:ss)." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (ms)."}, - { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to."}, - { "name": "correctness", - "type": { - "name" : "CorrectnessEnum", - "type": "enum", - "symbols": ["CORRECT", "WRONG"], - "doc": "The validity of input submitted." - }, - "doc": "The validity of the user's input submitted." - }, - { "name": "inputType", - "type": { - "name": "InputEnum", - "type": "enum", - "symbols": ["PIN", "AMOUNT", "CANCELLEDATTEMPT", "CONFIRMEDATTEMPT"], - "doc": "The type of submitted input." - }, - "doc": "The type of submitted input."} - ] -} From ac56acb8ff5e0bdca8528d43409541f1790e5110 Mon Sep 17 00:00:00 2001 From: Lampros Date: Fri, 22 Nov 2019 14:29:20 +0200 Subject: [PATCH 11/36] updated schemas --- commons/active/{bankingapp => banking}/banking_attempt.avsc | 3 ++- commons/active/{bankingapp => banking}/banking_event.avsc | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename commons/active/{bankingapp => banking}/banking_attempt.avsc (95%) rename commons/active/{bankingapp => banking}/banking_event.avsc (91%) diff --git a/commons/active/bankingapp/banking_attempt.avsc b/commons/active/banking/banking_attempt.avsc similarity index 95% rename from commons/active/bankingapp/banking_attempt.avsc rename to commons/active/banking/banking_attempt.avsc index a12fb418..a8e532b4 100644 --- a/commons/active/bankingapp/banking_attempt.avsc +++ b/commons/active/banking/banking_attempt.avsc @@ -8,7 +8,7 @@ { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, - { "name": "isComplete", "type":"boolean", "doc": "Describes if the Attempt was conpleted or not"}, + { "name": "isComplete", "type":"boolean", "doc": "Describes if the Attempt was completed or not."}, { "name": "result", "type": { "name": "AttemptResult", @@ -24,6 +24,7 @@ "default": "UNKNOWN", "doc": "Attempt: Correct inputs (both pin & amount) Cancelled attempt, Correct inputs Cancelled attempt, Wrong input (at least one of two) Confirmed attempt, Wrong input Cancelled attempt, attempt timed Out, attempt Ended prematurely." }, + "default": "UNKNOWN", "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} ] } \ No newline at end of file diff --git a/commons/active/bankingapp/banking_event.avsc b/commons/active/banking/banking_event.avsc similarity index 91% rename from commons/active/bankingapp/banking_event.avsc rename to commons/active/banking/banking_event.avsc index e6f81fa5..ed00725b 100644 --- a/commons/active/bankingapp/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -15,9 +15,10 @@ "name": "InputTypeValue", "type": "enum", "symbols": ["PIN", "AMOUNT", "CANCELLED_ATTEMPT", "CONFIRMED_ATTEMPT", "UNKNOWN"], - "doc": "PIN input, amount imput, cancelled attempt, confirmed attempt", - "default": "UNKNOWN" + "doc": "PIN input, Amount imput, cancelled attempt, confirmed attempt." }, + "default": "UNKNOWN", "doc": "The type of submitted input: PIN or Amount."} + ] } From d97ec04a9b81da6d8da154ba8bd9e7ae698519e9 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 25 Nov 2019 16:07:19 +0200 Subject: [PATCH 12/36] updates schema --- commons/active/banking/banking_attempt.avsc | 2 +- commons/active/banking/banking_event.avsc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/commons/active/banking/banking_attempt.avsc b/commons/active/banking/banking_attempt.avsc index a8e532b4..80231df2 100644 --- a/commons/active/banking/banking_attempt.avsc +++ b/commons/active/banking/banking_attempt.avsc @@ -20,7 +20,7 @@ "WRONG_CANCELLED", "TIME_OUT", "EXIT", - "UNKNOWN" ], + "UNKNOWN"], "default": "UNKNOWN", "doc": "Attempt: Correct inputs (both pin & amount) Cancelled attempt, Correct inputs Cancelled attempt, Wrong input (at least one of two) Confirmed attempt, Wrong input Cancelled attempt, attempt timed Out, attempt Ended prematurely." }, diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index ed00725b..1d53e328 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -19,6 +19,5 @@ }, "default": "UNKNOWN", "doc": "The type of submitted input: PIN or Amount."} - ] } From dddf4328df4774a37d1d270a224c2310b5dab541 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 9 Dec 2019 15:42:22 +0100 Subject: [PATCH 13/36] Bump dev version --- java-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 245fe70c..83231a77 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -17,7 +17,7 @@ subprojects { apply plugin: 'idea' // Configuration - version = '0.5.5' + version = '0.5.6-SNAPSHOT' group = 'org.radarcns' ext.githubRepoName = 'RADAR-base/RADAR-Schemas' From d6734118e8b35dde7ff330b4794ca6eaf01aa3fd Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 12 Dec 2019 15:51:15 +0100 Subject: [PATCH 14/36] Update dependencies --- java-sdk/radar-schemas-tools/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java-sdk/radar-schemas-tools/build.gradle b/java-sdk/radar-schemas-tools/build.gradle index 68c07e40..da6c0bc2 100644 --- a/java-sdk/radar-schemas-tools/build.gradle +++ b/java-sdk/radar-schemas-tools/build.gradle @@ -31,14 +31,14 @@ ext { description = 'RADAR Schemas specification and validation tools.' argparseVersion = '0.8.1' - jacksonVersion = '2.9.9.1' - jacksonYamlVersion = '2.9.9' - jerseyVersion = '2.28' - jettyVersion = '9.4.17.v20190418' + jacksonVersion = '2.10.1' + jacksonYamlVersion = '2.10.1' + jerseyVersion = '2.29.1' + jettyVersion = '9.4.24.v20191120' junitVersion = '4.12' - confluentVersion = '5.3.0' + confluentVersion = '5.3.1' kafkaVersion = '2.3.0' - okHttpVersion = '4.0.0' + okHttpVersion = '4.2.2' radarCommonsVersion = '0.12.1' slf4jVersion = '1.7.26' } From c53fedcc9cbda75d36a563a974a00e5e076f27b6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 12 Dec 2019 16:44:12 +0100 Subject: [PATCH 15/36] Ensure that the schema registry compatibility is updated --- .../java/org/radarcns/schema/registration/SchemaRegistry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java index e3f42de6..83707405 100644 --- a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java +++ b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java @@ -172,7 +172,9 @@ public int execute(Namespace options, CommandLineApp app) { SchemaRegistry registration = new SchemaRegistry(url); boolean forced = options.getBoolean("force"); if (forced) { - forced = registration.putCompatibility(Compatibility.NONE); + if (!registration.putCompatibility(Compatibility.NONE)) { + return 1; + } } boolean result; Pattern pattern = matchTopic( From f5922727ad7613554391b4d4b66426eb60fa0023 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 16 Dec 2019 16:08:37 +0200 Subject: [PATCH 16/36] review first changes --- commons/active/banking/banking_attempt.avsc | 18 +++++++++--------- commons/active/banking/banking_event.avsc | 21 +++++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/commons/active/banking/banking_attempt.avsc b/commons/active/banking/banking_attempt.avsc index 80231df2..e6c42168 100644 --- a/commons/active/banking/banking_attempt.avsc +++ b/commons/active/banking/banking_attempt.avsc @@ -2,17 +2,18 @@ "namespace": "org.radarcns.active.banking", "type": "record", "name": "BankingAttempt", - "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end.", + "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end. A banking App Attempt can have a number of events", "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Attempt."}, + { "name": "attemptId", "type": "string", "doc": "Unique ID for an Attempt." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, - { "name": "isComplete", "type":"boolean", "doc": "Describes if the Attempt was completed or not."}, - { "name": "result", + { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, + { "name": "isComplete", "type":["null","boolean"], "doc": "Describes if the Attempt was completed or not, if not, that means the Attempt exited or was ended prematurely", "default": null }, + { "name": "attemptResult", "type": { "name": "AttemptResult", "type": "enum", + "default": "UNKNOWN", "symbols": [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", @@ -21,10 +22,9 @@ "TIME_OUT", "EXIT", "UNKNOWN"], - "default": "UNKNOWN", - "doc": "Attempt: Correct inputs (both pin & amount) Cancelled attempt, Correct inputs Cancelled attempt, Wrong input (at least one of two) Confirmed attempt, Wrong input Cancelled attempt, attempt timed Out, attempt Ended prematurely." + "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount) Confirmed attempt, CORRECT_CANCELLED: Correct inputs Cancelled attempt, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed attempt, WRONG_CANCELLED: Wrong input Cancelled attempt, TIME_OUT: attempt timed Out, EXIT: attempt Ended prematurely.", + "default": "UNKNOWN" }, - "default": "UNKNOWN", - "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended."} + "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." } ] } \ No newline at end of file diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index 1d53e328..a35725c2 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -4,20 +4,21 @@ "name": "BankingEvent", "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Event."}, + { "name": "uid", "type": "string", "doc": "Unique ID for an Event." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, - { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to."}, - { "name": "isCorrect", "type": "boolean", "doc": "Describes if the input Pin or Amount is correct."}, - { "name": "inputType", + { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to." }, + { "name": "isCorrect", "type": ["null","boolean"], "doc": "Describes if the input Pin or Amount is correct. Null if this event is a confirmation or cancellation.", "default": null }, + { "name": "eventType", "type": { - "name": "InputTypeValue", + "name": "EventType", "type": "enum", - "symbols": ["PIN", "AMOUNT", "CANCELLED_ATTEMPT", "CONFIRMED_ATTEMPT", "UNKNOWN"], - "doc": "PIN input, Amount imput, cancelled attempt, confirmed attempt." - }, - "default": "UNKNOWN", - "doc": "The type of submitted input: PIN or Amount."} + "symbols": ["PIN", "AMOUNT", "ATTEMPT_CANCELLED", "ATTEMPT_CONFIRMED", "UNKNOWN"], + "doc": "PIN: PIN input, AMOUNT: Amount input, ATTEMPT_CANCELLED: the attempt is canceled, ATTEMPT_CONFIRMED: the attempt is confirmed, UNKNOWN: for any other input type." + }, + "doc": "The type of submitted input: PIN or Amount.", + "default": "UNKNOWN" + } ] } From 950c24e2ef18eab864be3a03e42844a8e8a376b5 Mon Sep 17 00:00:00 2001 From: Lampros Date: Sat, 21 Dec 2019 15:56:37 +0200 Subject: [PATCH 17/36] corrections --- commons/active/banking/banking_attempt.avsc | 30 ------------------ commons/active/banking/banking_event.avsc | 12 +++---- .../active/banking/banking_transaction.avsc | 31 +++++++++++++++++++ 3 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 commons/active/banking/banking_attempt.avsc create mode 100644 commons/active/banking/banking_transaction.avsc diff --git a/commons/active/banking/banking_attempt.avsc b/commons/active/banking/banking_attempt.avsc deleted file mode 100644 index e6c42168..00000000 --- a/commons/active/banking/banking_attempt.avsc +++ /dev/null @@ -1,30 +0,0 @@ -{ - "namespace": "org.radarcns.active.banking", - "type": "record", - "name": "BankingAttempt", - "doc": "A Banking App Attempt to complete a transaction, which can contain a PIN, an Amount and a Confirm/Cancel Transaction event. It can also time out or end. A banking App Attempt can have a number of events", - "fields": [ - { "name": "attemptId", "type": "string", "doc": "Unique ID for an Attempt." }, - { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, - { "name": "isComplete", "type":["null","boolean"], "doc": "Describes if the Attempt was completed or not, if not, that means the Attempt exited or was ended prematurely", "default": null }, - { "name": "attemptResult", - "type": { - "name": "AttemptResult", - "type": "enum", - "default": "UNKNOWN", - "symbols": - [ "CORRECT_CONFIRMED", - "CORRECT_CANCELLED", - "WRONG_CONFIRMED", - "WRONG_CANCELLED", - "TIME_OUT", - "EXIT", - "UNKNOWN"], - "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount) Confirmed attempt, CORRECT_CANCELLED: Correct inputs Cancelled attempt, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed attempt, WRONG_CANCELLED: Wrong input Cancelled attempt, TIME_OUT: attempt timed Out, EXIT: attempt Ended prematurely.", - "default": "UNKNOWN" - }, - "doc": "Shows the result of the attempt which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." } - ] -} \ No newline at end of file diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index a35725c2..07c927c8 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -4,21 +4,21 @@ "name": "BankingEvent", "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ - { "name": "uid", "type": "string", "doc": "Unique ID for an Event." }, + { "name": "eventId", "type": "string", "doc": "Unique ID for an Event." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, - { "name": "attemptId", "type":"string", "doc": "The uid of attempt record that the event is related to." }, + { "name": "TransactionId", "type":"string", "doc": "The uid of Transaction record that the event is related to." }, { "name": "isCorrect", "type": ["null","boolean"], "doc": "Describes if the input Pin or Amount is correct. Null if this event is a confirmation or cancellation.", "default": null }, { "name": "eventType", "type": { "name": "EventType", "type": "enum", - "symbols": ["PIN", "AMOUNT", "ATTEMPT_CANCELLED", "ATTEMPT_CONFIRMED", "UNKNOWN"], - "doc": "PIN: PIN input, AMOUNT: Amount input, ATTEMPT_CANCELLED: the attempt is canceled, ATTEMPT_CONFIRMED: the attempt is confirmed, UNKNOWN: for any other input type." + "symbols": ["PIN", "AMOUNT", "Transaction_CANCELLED", "Transaction_CONFIRMED", "UNKNOWN"], + "doc": "PIN: PIN input, AMOUNT: Amount input, Transaction_CANCELLED: the Transaction is canceled, Transaction_CONFIRMED: the Transaction is confirmed, UNKNOWN: for any other input type." }, "doc": "The type of submitted input: PIN or Amount.", "default": "UNKNOWN" - } - ] + } + ] } diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc new file mode 100644 index 00000000..59a1e804 --- /dev/null +++ b/commons/active/banking/banking_transaction.avsc @@ -0,0 +1,31 @@ +{ + "namespace": "org.radarcns.active.banking", + "type": "record", + "name": "BankingTransaction", + "doc": "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", + "fields": [ + { "name": "TransactionId", "type": "string", "doc": "Unique ID for an Transaction." }, + { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, + { "name": "isComplete", "type":["null","boolean"], "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", "default": null }, + { "name": "TransactionResult", + "type": { + "name": "TransactionResult", + "type": "enum", + "default": "UNKNOWN", + "symbols": + [ "CORRECT_CONFIRMED", + "CORRECT_CANCELLED", + "WRONG_CONFIRMED", + "WRONG_CANCELLED", + "TIME_OUT", + "EXIT", + "UNKNOWN"], + "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", + "default": "UNKNOWN" + }, + "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." + } + ] +} \ No newline at end of file From 1ca97d2504f388466c6efac294b43b2c0447a51a Mon Sep 17 00:00:00 2001 From: Lampros Date: Sat, 21 Dec 2019 20:21:44 +0200 Subject: [PATCH 18/36] corrections --- commons/active/banking/banking_event.avsc | 1 - 1 file changed, 1 deletion(-) diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index 07c927c8..b7283561 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -4,7 +4,6 @@ "name": "BankingEvent", "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ - { "name": "eventId", "type": "string", "doc": "Unique ID for an Event." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, From 1b134c92d6633ab945b3077a81eb3434bd6153ab Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 23 Dec 2019 09:53:16 +0100 Subject: [PATCH 19/36] Fix code style error --- .../org/radarcns/schema/registration/SchemaRegistry.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java index 83707405..9a786ff7 100644 --- a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java +++ b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/registration/SchemaRegistry.java @@ -171,10 +171,8 @@ public int execute(Namespace options, CommandLineApp app) { try { SchemaRegistry registration = new SchemaRegistry(url); boolean forced = options.getBoolean("force"); - if (forced) { - if (!registration.putCompatibility(Compatibility.NONE)) { - return 1; - } + if (forced && !registration.putCompatibility(Compatibility.NONE)) { + return 1; } boolean result; Pattern pattern = matchTopic( From 3a281ddb391c4cc230d2805cc374c610ad2ae758 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 12:47:34 +0200 Subject: [PATCH 20/36] corrections --- commons/active/banking/banking_event.avsc | 8 ++++---- commons/active/banking/banking_transaction.avsc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index b7283561..3fa46525 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -4,10 +4,10 @@ "name": "BankingEvent", "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ - { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)."}, - { "name": "TransactionId", "type":"string", "doc": "The uid of Transaction record that the event is related to." }, + { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time an event has started." }, + { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time an event has been completed" }, + { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds), duration is essentially timeCompleted - time"}, + { "name": "transactionId", "type":"string", "doc": "The uid of Transaction record that the event is related to." }, { "name": "isCorrect", "type": ["null","boolean"], "doc": "Describes if the input Pin or Amount is correct. Null if this event is a confirmation or cancellation.", "default": null }, { "name": "eventType", "type": { diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index 59a1e804..d7083977 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -4,12 +4,12 @@ "name": "BankingTransaction", "doc": "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", "fields": [ - { "name": "TransactionId", "type": "string", "doc": "Unique ID for an Transaction." }, - { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, - { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds)." }, + { "name": "transactionId", "type": "string", "doc": "Unique ID for an Transaction." }, + { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time a transaction has started." }, + { "name": "timeCompleted", "type": "double", time stores the time a transaction has been completed." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, { "name": "isComplete", "type":["null","boolean"], "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", "default": null }, - { "name": "TransactionResult", + { "name": "transactionResult", "type": { "name": "TransactionResult", "type": "enum", From ce18625052d8fb0c00a8f2288be70e3b13492082 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 12:50:42 +0200 Subject: [PATCH 21/36] corrections --- commons/active/banking/banking_transaction.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index d7083977..450ce4ae 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -6,7 +6,7 @@ "fields": [ { "name": "transactionId", "type": "string", "doc": "Unique ID for an Transaction." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time a transaction has started." }, - { "name": "timeCompleted", "type": "double", time stores the time a transaction has been completed." }, + { "name": "timeCompleted", "type": "double", "doc": "time stores the time a transaction has been completed." }, { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, { "name": "isComplete", "type":["null","boolean"], "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", "default": null }, { "name": "transactionResult", From a429ae553b22b04e4607ce810c54ff0e38879a49 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 13:20:11 +0200 Subject: [PATCH 22/36] corrections --- commons/active/banking/banking_event.avsc | 8 ++++---- commons/active/banking/banking_transaction.avsc | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/banking_event.avsc index 3fa46525..0dc5a978 100644 --- a/commons/active/banking/banking_event.avsc +++ b/commons/active/banking/banking_event.avsc @@ -5,16 +5,16 @@ "doc": "A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc.", "fields": [ { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time an event has started." }, - { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time an event has been completed" }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds), duration is essentially timeCompleted - time"}, + { "name": "timeCompleted", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time an event has been completed." }, + { "name": "duration", "type": "double", "doc": "Duration of the event (seconds), duration is essentially timeCompleted - time."}, { "name": "transactionId", "type":"string", "doc": "The uid of Transaction record that the event is related to." }, { "name": "isCorrect", "type": ["null","boolean"], "doc": "Describes if the input Pin or Amount is correct. Null if this event is a confirmation or cancellation.", "default": null }, { "name": "eventType", "type": { "name": "EventType", "type": "enum", - "symbols": ["PIN", "AMOUNT", "Transaction_CANCELLED", "Transaction_CONFIRMED", "UNKNOWN"], - "doc": "PIN: PIN input, AMOUNT: Amount input, Transaction_CANCELLED: the Transaction is canceled, Transaction_CONFIRMED: the Transaction is confirmed, UNKNOWN: for any other input type." + "symbols": ["PIN", "AMOUNT", "TRANSACTION_CANCELLED", "TRANSACTION_CONFIRMED", "UNKNOWN"], + "doc": "PIN: PIN input, AMOUNT: Amount input, TRANSACTION_CANCELLED: the Transaction is canceled, TRANSACTION_CONFIRMED: the Transaction is confirmed, UNKNOWN: for any other input type." }, "doc": "The type of submitted input: PIN or Amount.", "default": "UNKNOWN" diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index 450ce4ae..79b0342a 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -6,8 +6,8 @@ "fields": [ { "name": "transactionId", "type": "string", "doc": "Unique ID for an Transaction." }, { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time a transaction has started." }, - { "name": "timeCompleted", "type": "double", "doc": "time stores the time a transaction has been completed." }, - { "name": "duration", "type": "double", "doc": "Duration of the activity (seconds)." }, + { "name": "timeCompleted", "type": "double", "doc": "Time stores the time a transaction has been completed." }, + { "name": "duration", "type": "double", "doc": "Duration of the transaction (seconds), duration is essentially timeCompleted - time." }, { "name": "isComplete", "type":["null","boolean"], "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", "default": null }, { "name": "transactionResult", "type": { @@ -25,7 +25,8 @@ "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", "default": "UNKNOWN" }, - "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended." + "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", + "default": "UNKNOWN" } ] } \ No newline at end of file From d7fec3f0106ad33c860244a252832740f0110dcc Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 23 Dec 2019 12:52:20 +0100 Subject: [PATCH 23/36] More explicit avro data message. --- .../radarcns/schema/validation/rules/RadarSchemaRules.java | 5 ++++- .../java/org/radarcns/schema/validation/rules/Validator.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/RadarSchemaRules.java b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/RadarSchemaRules.java index c37f1e2b..75a94fa0 100644 --- a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/RadarSchemaRules.java +++ b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/RadarSchemaRules.java @@ -222,7 +222,10 @@ public Validator validateAvroData() { org.apache.kafka.connect.data.Schema connectSchema = encoder .toConnectSchema(schema); Schema originalSchema = decoder.fromConnectSchema(connectSchema); - return check(schema.equals(originalSchema), "Schema changed by validation"); + return check(schema.equals(originalSchema), + () -> "Schema changed by validation: " + + schema.toString(true) + " is not equal to " + + originalSchema.toString(true)); } catch (Exception ex) { return raise("Failed to convert schema back to itself"); } diff --git a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/Validator.java b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/Validator.java index 8c57da85..ab94075e 100644 --- a/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/Validator.java +++ b/java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/rules/Validator.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.function.Function; import java.util.function.Predicate; +import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Stream; import org.radarcns.schema.validation.ValidationException; @@ -32,6 +33,10 @@ static Stream check(boolean test, String message) { return test ? valid() : raise(message); } + static Stream check(boolean test, Supplier message) { + return test ? valid() : raise(message.get()); + } + /** * TODO. * @param predicate TODO From 631d1ad567b50fcc2fb310e64f673fe6798f9a6d Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 14:05:08 +0200 Subject: [PATCH 24/36] corrections --- commons/active/banking/banking_transaction.avsc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index 79b0342a..d747c14d 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -22,8 +22,7 @@ "TIME_OUT", "EXIT", "UNKNOWN"], - "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", - "default": "UNKNOWN" + "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely." }, "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", "default": "UNKNOWN" From 5a744a89d5105574341390d049b8afdfe5be3413 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 15:47:35 +0200 Subject: [PATCH 25/36] corrections --- .../active/banking/banking_transaction.avsc | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index d747c14d..c30fc7b1 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -1,31 +1,39 @@ { - "namespace": "org.radarcns.active.banking", - "type": "record", - "name": "BankingTransaction", - "doc": "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", - "fields": [ - { "name": "transactionId", "type": "string", "doc": "Unique ID for an Transaction." }, - { "name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), time stores the time a transaction has started." }, - { "name": "timeCompleted", "type": "double", "doc": "Time stores the time a transaction has been completed." }, - { "name": "duration", "type": "double", "doc": "Duration of the transaction (seconds), duration is essentially timeCompleted - time." }, - { "name": "isComplete", "type":["null","boolean"], "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", "default": null }, - { "name": "transactionResult", - "type": { - "name": "TransactionResult", - "type": "enum", - "default": "UNKNOWN", - "symbols": - [ "CORRECT_CONFIRMED", - "CORRECT_CANCELLED", - "WRONG_CONFIRMED", - "WRONG_CANCELLED", - "TIME_OUT", - "EXIT", - "UNKNOWN"], - "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely." - }, - "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", - "default": "UNKNOWN" - } - ] + "type" : "record", + "name" : "BankingTransaction", + "namespace" : "org.radarcns.active.banking", + "doc" : "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", + "fields" : [ { + "name" : "transactionId", + "type" : "string", + "doc" : "Unique ID for an Transaction." + }, { + "name" : "time", + "type" : "double", + "doc" : "Time since the Unix Epoch (seconds), time stores the time a transaction has started." + }, { + "name" : "timeCompleted", + "type" : "double", + "doc" : "Time stores the time a transaction has been completed." + }, { + "name" : "duration", + "type" : "double", + "doc" : "Duration of the transaction (seconds), duration is essentially timeCompleted - time." + }, { + "name" : "isComplete", + "type" : [ "null", "boolean" ], + "doc" : "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", + "default" : null + }, { + "name" : "transactionResult", + "type" : { + "type" : "enum", + "name" : "TransactionResult", + "doc" : "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", + "symbols" : [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", "WRONG_CONFIRMED", "WRONG_CANCELLED", "TIME_OUT", "EXIT", "UNKNOWN" ], + "default" : "UNKNOWN" + }, + "doc" : "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", + "default" : "UNKNOWN" + } ] } \ No newline at end of file From fa828b53e40739ae0b22dbd88d2ce1a10d1375ad Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 16:54:43 +0200 Subject: [PATCH 26/36] corrections --- .../active/banking/banking_transaction.avsc | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/banking_transaction.avsc index c30fc7b1..99d50ae3 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/banking_transaction.avsc @@ -1,39 +1,38 @@ { - "type" : "record", - "name" : "BankingTransaction", - "namespace" : "org.radarcns.active.banking", - "doc" : "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", - "fields" : [ { - "name" : "transactionId", - "type" : "string", - "doc" : "Unique ID for an Transaction." + "namespace": "org.radarcns.active.banking", + "type": "record", + "name": "BankingTransaction", + "doc": "Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. A transaction may also time out or end prematurely.", + "fields": [ { + "name": "transactionId", + "type": "string", + "doc": "Unique ID for an Transaction." }, { - "name" : "time", - "type" : "double", - "doc" : "Time since the Unix Epoch (seconds), time stores the time a transaction has started." + "name": "time", + "type": "double", + "doc": "Time since the Unix Epoch (seconds), time stores the time a transaction has started." }, { - "name" : "timeCompleted", - "type" : "double", - "doc" : "Time stores the time a transaction has been completed." + "name": "timeCompleted", + "type": "double", + "doc": "Time stores the time a transaction has been completed." }, { - "name" : "duration", - "type" : "double", - "doc" : "Duration of the transaction (seconds), duration is essentially timeCompleted - time." + "name": "duration", + "type": "double", + "doc": "Duration of the transaction (seconds), duration is essentially timeCompleted - time." }, { - "name" : "isComplete", - "type" : [ "null", "boolean" ], - "doc" : "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", - "default" : null + "name": "isComplete", + "type": [ "null", "boolean" ], + "doc": "True if the result is CORRECT_CONFIRMED, WRONG_CONFIRMED, CORRECT_CANCELLED or WRONG_CANCELLED. False if TIME_OUT or EXIT.", + "default": null }, { - "name" : "transactionResult", - "type" : { - "type" : "enum", - "name" : "TransactionResult", - "doc" : "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", - "symbols" : [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", "WRONG_CONFIRMED", "WRONG_CANCELLED", "TIME_OUT", "EXIT", "UNKNOWN" ], - "default" : "UNKNOWN" + "name": "transactionResult", + "type": { + "type": "enum", + "name": "TransactionResult", + "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", + "symbols" : [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", "WRONG_CONFIRMED", "WRONG_CANCELLED", "TIME_OUT", "EXIT", "UNKNOWN" ] }, - "doc" : "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", - "default" : "UNKNOWN" + "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", + "default": "UNKNOWN" } ] } \ No newline at end of file From 742964057a2047c1f03ed6c8c2d612627f832d08 Mon Sep 17 00:00:00 2001 From: Lampros Date: Mon, 23 Dec 2019 20:01:40 +0200 Subject: [PATCH 27/36] schemas names correction --- .../active/banking/{banking_event.avsc => BankingEvent.avsc} | 0 .../{banking_transaction.avsc => BankingTransaction.avsc} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename commons/active/banking/{banking_event.avsc => BankingEvent.avsc} (100%) rename commons/active/banking/{banking_transaction.avsc => BankingTransaction.avsc} (80%) diff --git a/commons/active/banking/banking_event.avsc b/commons/active/banking/BankingEvent.avsc similarity index 100% rename from commons/active/banking/banking_event.avsc rename to commons/active/banking/BankingEvent.avsc diff --git a/commons/active/banking/banking_transaction.avsc b/commons/active/banking/BankingTransaction.avsc similarity index 80% rename from commons/active/banking/banking_transaction.avsc rename to commons/active/banking/BankingTransaction.avsc index 99d50ae3..5eb230dc 100644 --- a/commons/active/banking/banking_transaction.avsc +++ b/commons/active/banking/BankingTransaction.avsc @@ -29,8 +29,8 @@ "type": { "type": "enum", "name": "TransactionResult", - "doc": "CORRECT_CONFIRMED: Correct inputs (both pin & amount), Confirmed Transaction, CORRECT_CANCELLED: Correct inputs Cancelled Transaction, WRONG_CONFIRMED: Wrong input (at least one of two) Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", - "symbols" : [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", "WRONG_CONFIRMED", "WRONG_CANCELLED", "TIME_OUT", "EXIT", "UNKNOWN" ] + "doc": "CORRECT_CONFIRMED: both inputs Correct- Confirmed Transaction, CORRECT_CANCELLED: Correct inputs - Cancelled Transaction, WRONG_CONFIRMED: (at least one of two inputs Wrong) - Confirmed Transaction, WRONG_CANCELLED: Wrong input Cancelled Transaction, TIME_OUT: Transaction timed Out, EXIT: Transaction Ended prematurely.", + "symbols" : [ "CORRECT_CONFIRMED", "CORRECT_CANCELLED", "WRONG_CONFIRMED", "WRONG_CANCELLED", "TIME_OUT", "EXIT", "UNKNOWN"] }, "doc": "Shows the result of the Transaction which can be Correct Cancelled, Correct Cancelled, Wrong Confirmed, Wrong Cancelled, Timed Out, Ended.", "default": "UNKNOWN" From 3a9d9a1bcc9e8f57e55d22792cdf0b19727ae790 Mon Sep 17 00:00:00 2001 From: nivethika Date: Thu, 2 Jan 2020 12:33:14 +0100 Subject: [PATCH 28/36] add additional topics to axivity spec --- specifications/connector/radar-axivity-connector.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specifications/connector/radar-axivity-connector.yml b/specifications/connector/radar-axivity-connector.yml index 5a4a18b6..67a0cd93 100644 --- a/specifications/connector/radar-axivity-connector.yml +++ b/specifications/connector/radar-axivity-connector.yml @@ -9,6 +9,18 @@ data: topic: connect_upload_axivity_acceleration value_schema: .connector.upload.axivity.AxivityAcceleration + - doc: Battery level information of axivity device extracted from from CWA binary file. + topic: connect_upload_axivity_battery + value_schema: .connector.upload.axivity.AxivityBattery + + - doc: Ambient light data extracted from from CWA binary file. + topic: connect_upload_axivity_light + value_schema: .connector.upload.axivity.AxivityLight + + - doc: Temperature data extracted from from CWA binary file. + topic: connect_upload_axivity_temperature + value_schema: .connector.upload.axivity.AxivityLight + # meta-data - doc: Data that contains additional meta-data of the recording. Data extracted from the header of CWA binary file. topic: connect_upload_axivity_metadata From ad4138a943be3018b40a56f3bc6135531d83c68a Mon Sep 17 00:00:00 2001 From: nivethika Date: Thu, 2 Jan 2020 13:07:31 +0100 Subject: [PATCH 29/36] add axivity event schema and correct metadata correct specification accordingly --- ...ty_battery.avsc => axivity_battery_level.avsc} | 2 +- .../connector/upload/axivity/axivity_event.avsc | 15 +++++++++++++++ .../upload/axivity/axivity_metadata.avsc | 6 ++---- .../connector/radar-axivity-connector.yml | 14 +++++++++----- 4 files changed, 27 insertions(+), 10 deletions(-) rename commons/connector/upload/axivity/{axivity_battery.avsc => axivity_battery_level.avsc} (93%) create mode 100644 commons/connector/upload/axivity/axivity_event.avsc diff --git a/commons/connector/upload/axivity/axivity_battery.avsc b/commons/connector/upload/axivity/axivity_battery_level.avsc similarity index 93% rename from commons/connector/upload/axivity/axivity_battery.avsc rename to commons/connector/upload/axivity/axivity_battery_level.avsc index 35af9153..90878ac1 100644 --- a/commons/connector/upload/axivity/axivity_battery.avsc +++ b/commons/connector/upload/axivity/axivity_battery_level.avsc @@ -1,7 +1,7 @@ { "namespace": "org.radarcns.connector.upload.axivity", "type": "record", - "name": "AxivityBattery", + "name": "AxivityBatteryLevel", "doc": "Battery level data from Axivity device.", "fields": [ {"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."}, diff --git a/commons/connector/upload/axivity/axivity_event.avsc b/commons/connector/upload/axivity/axivity_event.avsc new file mode 100644 index 00000000..dfd72729 --- /dev/null +++ b/commons/connector/upload/axivity/axivity_event.avsc @@ -0,0 +1,15 @@ +{ + "namespace": "org.radarcns.connector.upload.axivity", + "type": "record", + "name": "AxivityEvent", + "doc": "Event data available in a CWA block.", + "fields": [ + {"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."}, + {"name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from upload."}, + {"name": "event", "type": { + "name": "AxivityEventType", + "type": "enum", + "doc": "Event types recorded from the axivity device.", + "symbols": ["RESUME", "SINGLE_TAP", "DOUBLE_TAP", "FIFO_OVERFLOW", "BUFFER_OVERFLOW", "UNHANDLED_INTERRUPT", "UNKNOWN"]}, "doc": "Event of the block.", "default": "UNKNOWN"}, + ] +} diff --git a/commons/connector/upload/axivity/axivity_metadata.avsc b/commons/connector/upload/axivity/axivity_metadata.avsc index b12a895a..2721203a 100644 --- a/commons/connector/upload/axivity/axivity_metadata.avsc +++ b/commons/connector/upload/axivity/axivity_metadata.avsc @@ -6,9 +6,7 @@ "fields": [ {"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."}, {"name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from upload."}, - {"name": "deviceId", "type": "string", "doc": "Version number."}, - {"name": "exerciseCode", "type": "string", "doc": "Exercise code from axivity."}, - {"name": "bodyLocation", "type": "int", "doc": "Body location recorded on the axivity device."}, - {"name": "studyCode", "type": "string", "doc": "Study code recorded on the axivity device."} + {"name": "annotationName", "type": "string", "doc": "Name of the annotation from cwa metadata."}, + {"name": "annotationValue", "type": "string", "doc": "Value available for this annotation in the scwa metadata."} ] } diff --git a/specifications/connector/radar-axivity-connector.yml b/specifications/connector/radar-axivity-connector.yml index 67a0cd93..b82f0869 100644 --- a/specifications/connector/radar-axivity-connector.yml +++ b/specifications/connector/radar-axivity-connector.yml @@ -9,18 +9,22 @@ data: topic: connect_upload_axivity_acceleration value_schema: .connector.upload.axivity.AxivityAcceleration - - doc: Battery level information of axivity device extracted from from CWA binary file. - topic: connect_upload_axivity_battery - value_schema: .connector.upload.axivity.AxivityBattery + - doc: Battery level information of axivity device extracted from CWA Block. + topic: connect_upload_axivity_battery_level + value_schema: .connector.upload.axivity.AxivityBatteryLevel - - doc: Ambient light data extracted from from CWA binary file. + - doc: Ambient light data extracted from a CWA Block. topic: connect_upload_axivity_light value_schema: .connector.upload.axivity.AxivityLight - - doc: Temperature data extracted from from CWA binary file. + - doc: Temperature data extracted from CWA Block. topic: connect_upload_axivity_temperature value_schema: .connector.upload.axivity.AxivityLight + - doc: Event data extracted from from a CWA Block. + topic: connect_upload_axivity_event + value_schema: .connector.upload.axivity.AxivityEvent + # meta-data - doc: Data that contains additional meta-data of the recording. Data extracted from the header of CWA binary file. topic: connect_upload_axivity_metadata From ba3d7031454f5bff61e3c7b84b779f57ba345eb6 Mon Sep 17 00:00:00 2001 From: nivethika Date: Thu, 2 Jan 2020 14:24:12 +0100 Subject: [PATCH 30/36] fix test failures --- commons/connector/upload/axivity/axivity_event.avsc | 2 +- commons/connector/upload/axivity/axivity_metadata.avsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/connector/upload/axivity/axivity_event.avsc b/commons/connector/upload/axivity/axivity_event.avsc index dfd72729..d4837138 100644 --- a/commons/connector/upload/axivity/axivity_event.avsc +++ b/commons/connector/upload/axivity/axivity_event.avsc @@ -10,6 +10,6 @@ "name": "AxivityEventType", "type": "enum", "doc": "Event types recorded from the axivity device.", - "symbols": ["RESUME", "SINGLE_TAP", "DOUBLE_TAP", "FIFO_OVERFLOW", "BUFFER_OVERFLOW", "UNHANDLED_INTERRUPT", "UNKNOWN"]}, "doc": "Event of the block.", "default": "UNKNOWN"}, + "symbols": ["RESUME", "SINGLE_TAP", "DOUBLE_TAP", "FIFO_OVERFLOW", "BUFFER_OVERFLOW", "UNHANDLED_INTERRUPT", "UNKNOWN"]}, "doc": "Event of the block.", "default": "UNKNOWN"} ] } diff --git a/commons/connector/upload/axivity/axivity_metadata.avsc b/commons/connector/upload/axivity/axivity_metadata.avsc index 2721203a..4c929609 100644 --- a/commons/connector/upload/axivity/axivity_metadata.avsc +++ b/commons/connector/upload/axivity/axivity_metadata.avsc @@ -7,6 +7,6 @@ {"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."}, {"name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from upload."}, {"name": "annotationName", "type": "string", "doc": "Name of the annotation from cwa metadata."}, - {"name": "annotationValue", "type": "string", "doc": "Value available for this annotation in the scwa metadata."} + {"name": "annotationData", "type": "string", "doc": "Value available for this annotation in the cwa metadata."} ] } From 3e7d8acfab170fde88a3be33f85ce140a6894228 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 2 Jan 2020 14:41:27 +0100 Subject: [PATCH 31/36] Add link to docs --- specifications/connector/radar-axivity-connector.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifications/connector/radar-axivity-connector.yml b/specifications/connector/radar-axivity-connector.yml index b82f0869..b3906924 100644 --- a/specifications/connector/radar-axivity-connector.yml +++ b/specifications/connector/radar-axivity-connector.yml @@ -3,7 +3,7 @@ name: RADAR-AXIVITY-CONNECTOR vendor: Axivity model: Axivity.device version: 1.0.0 -doc: Spec for RADAR-base Axivity data upload connector. Schemas should be registered in the connector. +doc: Spec for RADAR-base Axivity data upload connector. Schemas should be registered in the connector. Information on the raw data can be found at https://github.com/digitalinteraction/openmovement/tree/master/Docs/ax3. data: - doc: Data from 3-axis accelerometer sensor with gravitational constant g as unit. Data extracted from CWA binary file. topic: connect_upload_axivity_acceleration From cb4949edaacf6c31074c8fc3a7194dda70d58c83 Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Tue, 14 Jan 2020 10:47:03 +0000 Subject: [PATCH 32/36] Add recording events to app interaction event schema --- .../questionnaire_application_interaction_event.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/monitor/questionnaire/questionnaire_application_interaction_event.avsc b/commons/monitor/questionnaire/questionnaire_application_interaction_event.avsc index bcab70e9..fa7088a3 100644 --- a/commons/monitor/questionnaire/questionnaire_application_interaction_event.avsc +++ b/commons/monitor/questionnaire/questionnaire_application_interaction_event.avsc @@ -9,7 +9,7 @@ "name": "InteractionEventType", "doc": "NOTIFICATION_OPEN = When a user presses the notification to open the app, APP_OPEN = When a user opens the app directly, QUESTIONNAIRE_STARTED = When a user starts a questionnaire, QUESTIONNAIRE_FINISHED = When a user completes a questionnaire, QUESTIONNAIRE_CANCELLED = When a user closes a questionnaire without completing it.", "type": "enum", - "symbols": ["NOTIFICATION_OPEN", "APP_OPEN", "QUESTIONNAIRE_STARTED", "QUESTIONNAIRE_FINISHED", "QUESTIONNAIRE_CANCELLED", "OTHER", "UNKNOWN"] + "symbols": ["NOTIFICATION_OPEN", "APP_OPEN", "QUESTIONNAIRE_STARTED", "QUESTIONNAIRE_FINISHED", "QUESTIONNAIRE_CANCELLED", "OTHER", "UNKNOWN", "RECORDING_STARTED", "RECORDING_STOPPED"] }, "doc": "Questionnaire app activity usage event type.", "default": "UNKNOWN" From 15db4f0e59f844ac920cbdb2c0f1ba0d1a6e483c Mon Sep 17 00:00:00 2001 From: mpgxvii Date: Fri, 17 Jan 2020 14:47:09 +0000 Subject: [PATCH 33/36] Modify aRMT ESM topic name --- specifications/active/aRMT-1.5.1.yml | 118 +++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 specifications/active/aRMT-1.5.1.yml diff --git a/specifications/active/aRMT-1.5.1.yml b/specifications/active/aRMT-1.5.1.yml new file mode 100644 index 00000000..e85a9b1d --- /dev/null +++ b/specifications/active/aRMT-1.5.1.yml @@ -0,0 +1,118 @@ +name: aRMT +vendor: RADAR +model: aRMT-App +version: 1.5.1 +assessment_type: QUESTIONNAIRE +doc: aRMT Questionnaires definition. Includes Personal Health Questionnaire Depression Scale (PHQ-8), Experience sampling method (ESM) and RSES and other data. +data: + - type: THINC_IT + topic: notification_thinc_it + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/thinc_it/thinc_it_armt.json + - type: ROMBERG_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_romberg_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/romberg_test/romberg_test_armt.json + - type: 2MW_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_2MW_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/2MW_test/2MW_test_armt.json + - type: TANDEM_WALKING_TEST + doc: The value of the task is in milliseconds (ms). + topic: task_tandem_walking_test + value_schema: .active.task.Task + questionnaire_definition_url: https://github.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/blob/master/questionnaires/tandem_walking_test/tandem_walking_test_armt.json + - type: PHQ8 + topic: questionnaire_phq8 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/phq8/phq8_armt.json + - type: ESM + topic: questionnaire_esm + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm/esm_armt.json + - type: AUDIO + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio/audio_armt.json + - type: AUDIO_2 + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_2/audio_2_armt.json + - type: AUDIO_3 + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_3/audio_3_armt.json + - type: AUDIO_4 + topic: questionnaire_audio + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/audio_4/audio_4_armt.json + - type: RSES + topic: questionnaire_rses + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/rses/rses_armt.json + - type: PERCEIVED_DEFICITS_QUESTIONNAIRE + topic: questionnaire_perceived_deficits_questionnaire + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/perceived_deficits_questionnaire/perceived_deficits_questionnaire_armt.json + - type: PATIENT_DETERMINED_DISEASE_STEP + topic: questionnaire_patient_determined_disease_step + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/patient_determined_disease_step/patient_determined_disease_step_armt.json + - type: ESM28Q + topic: questionnaire_esm28q + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm28q/esm28q_armt.json + - type: BIPQ + topic: questionnaire_bipq + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/bipq/bipq_armt.json + - type: ESM_EPI_MOD_1 + topic: questionnaire_esm_epi_mod_1 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/esm_epi_mod_1/esm_epi_mod_1_armt.json + - type: EVENING_ASSESSMENT + topic: questionnaire_evening_assessment + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/evening_assessment/evening_assessment_armt.json + - type: MORNING_ASSESSMENT + topic: questionnaire_morning_assessment + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/morning_assessment/morning_assessment_armt.json + - type: TAM + topic: questionnaire_tam + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/tam/tam_armt.json + - type: BAARS_IV + topic: questionnaire_baars_iv + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/baars_iv/baars_iv_armt.json + - type: ARI_SELF + topic: questionnaire_ari_self + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/ari_self/ari_self_armt.json + - type: GAD7 + topic: questionnaire_gad7 + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/gad7/gad7_armt.json + - type: RPQ + topic: questionnaire_rpq + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/rpq/rpq_armt.json + - type: ART_COGNITIVE_TEST + topic: questionnaire_art_cognitive_test + value_schema: .active.questionnaire.Questionnaire + questionnaire_definition_url: https://raw.githubusercontent.com/RADAR-base/RADAR-REDCap-aRMT-Definitions/master/questionnaires/art_cognitive_test/art_cognitive_test_armt.json + - type: COMPLETION_LOG + doc: Information about the completeness of each questionnaire. + topic: questionnaire_completion_log + value_schema: .monitor.questionnaire.QuestionnaireCompletionLog + - type: TIMEZONE + doc: Timezone information sent along with each questionnaire. + topic: questionnaire_timezone + value_schema: .monitor.application.ApplicationTimeZone + - type: APP_EVENT + doc: Questionnaire application interaction event. + topic: questionnaire_app_event + value_schema: .monitor.questionnaire.QuestionnaireApplicationInteractionEvent From 1d351c9b2defdf91b9a3354fcd8ffa103539f1bd Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 17 Jan 2020 16:07:43 +0100 Subject: [PATCH 34/36] add specification for banking app schema --- specifications/active/banking-app-1.0.0.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 specifications/active/banking-app-1.0.0.yml diff --git a/specifications/active/banking-app-1.0.0.yml b/specifications/active/banking-app-1.0.0.yml new file mode 100644 index 00000000..4e3e205f --- /dev/null +++ b/specifications/active/banking-app-1.0.0.yml @@ -0,0 +1,17 @@ +#==================== BankingApp Specification ======================# +name: BankingApp +vendor: CERTH +model: BankingApp +version: 1.0.0 +assessment_type: APP +doc: Banking App schemas and topics +data: + - type: APP_EVENT + doc: A Banking App Event, which is either a correct or wrong submission of a PIN number, an amount to withdraw, a cancelled or confirmed transaction. Notably, this allows us to distinguish between a wrong confirmed transaction or a correct cancelled transaction etc. + topic: certh_banking_app_event + value_schema: .active.banking.BankingEvent + - type: TRANSACTION + doc: Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. + topic: certh_banking_app_transaction + value_schema: .active.banking.BankingTransaction + From 2dd7c0b2289b11283dc57063d32919e43e2b9e30 Mon Sep 17 00:00:00 2001 From: nivethika Date: Fri, 17 Jan 2020 17:45:48 +0100 Subject: [PATCH 35/36] remove : from doc --- specifications/active/banking-app-1.0.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifications/active/banking-app-1.0.0.yml b/specifications/active/banking-app-1.0.0.yml index 4e3e205f..8ef7e787 100644 --- a/specifications/active/banking-app-1.0.0.yml +++ b/specifications/active/banking-app-1.0.0.yml @@ -11,7 +11,7 @@ data: topic: certh_banking_app_event value_schema: .active.banking.BankingEvent - type: TRANSACTION - doc: Transaction in Banking App. This captures a full transaction: inputting a PIN number, then an amount and then a confirmation or cancellation. + doc: Transaction in Banking App. This captures a full transaction inputting a PIN number, then an amount and then a confirmation or cancellation. topic: certh_banking_app_transaction value_schema: .active.banking.BankingTransaction From a957bda2e96c61b0f2ff59f5d586f3b628326471 Mon Sep 17 00:00:00 2001 From: nivethika Date: Tue, 21 Jan 2020 11:36:47 +0100 Subject: [PATCH 36/36] prepare release --- java-sdk/README.md | 4 ++-- java-sdk/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-sdk/README.md b/java-sdk/README.md index 748487be..123750cd 100644 --- a/java-sdk/README.md +++ b/java-sdk/README.md @@ -9,10 +9,10 @@ repositories { dependencies { // Commons schemas (backend, passive remote monitoring app) - compile 'org.radarcns:radar-schemas-commons:0.5.5' + compile 'org.radarcns:radar-schemas-commons:0.5.6' // Questionnaire schemas (active remote monitoring app) - compile 'org.radarcns:radar-schemas-tools:0.5.5' + compile 'org.radarcns:radar-schemas-tools:0.5.6' } ``` Usually, you only need to include the schemas you actually need in your dependencies. diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 83231a77..a83d499d 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -17,7 +17,7 @@ subprojects { apply plugin: 'idea' // Configuration - version = '0.5.6-SNAPSHOT' + version = '0.5.6' group = 'org.radarcns' ext.githubRepoName = 'RADAR-base/RADAR-Schemas'