From 44ea55b833e702123468cfbaf3793b1f5ca6f814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20E=2E=20Bermonti-P=C3=A9rez?= Date: Sun, 5 May 2024 11:24:10 -0400 Subject: [PATCH 1/3] Improve: Rename cognitive_tasks path --- lib/databases/firebase_db/firebase_db.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/databases/firebase_db/firebase_db.dart b/lib/databases/firebase_db/firebase_db.dart index 3b3548c..aec2056 100644 --- a/lib/databases/firebase_db/firebase_db.dart +++ b/lib/databases/firebase_db/firebase_db.dart @@ -28,7 +28,7 @@ class FirebaseDB implements DB { final Map deviceData = device.toJson(); final CollectionReference deviceRef = db.collection( - 'participants/$participantID/cognitive_tasks/$taskName/sessions/$sessionID/deviceMetadata'); + 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/deviceMetadata'); await deviceRef.doc('deviceMetadata').set(deviceData); } @@ -42,7 +42,7 @@ class FirebaseDB implements DB { final Map sessionData = session.toJson(); final CollectionReference sessionRef = db.collection( - 'participants/$participantID/cognitive_tasks/$taskName/sessions/$sessionID/sessionMetadata'); + 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/sessionMetadata'); await sessionRef.doc('sessionMetadata').set(sessionData); } @@ -55,7 +55,7 @@ class FirebaseDB implements DB { final Map trialMap = trial.toJson(); final CollectionReference trialsRef = db.collection( - 'participants/$participantID/cognitive_tasks/$taskName/sessions/$sessionID/trials'); + 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/trials'); await trialsRef.add(trialMap); } @@ -66,7 +66,7 @@ class FirebaseDB implements DB { @override Future addTrials({required List trials}) async { final CollectionReference trialsRef = db.collection( - 'participants/$participantID/cognitive_tasks/$taskName/sessions/$sessionID/trials'); + 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/trials'); final WriteBatch batch = db.batch(); From 52dc3c64891e82332dc3be9a6dcdb9a033a1ced3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20E=2E=20Bermonti-P=C3=A9rez?= Date: Sun, 5 May 2024 11:33:24 -0400 Subject: [PATCH 2/3] improve(firebase): Restructure data This structure prioritizes cognitive task and not the participant. It aligns better with the traditional structure of data from cognitive measures, where there is a table for each task with the data from all participants. --- lib/databases/firebase_db/firebase_db.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/databases/firebase_db/firebase_db.dart b/lib/databases/firebase_db/firebase_db.dart index aec2056..1a8d697 100644 --- a/lib/databases/firebase_db/firebase_db.dart +++ b/lib/databases/firebase_db/firebase_db.dart @@ -28,7 +28,7 @@ class FirebaseDB implements DB { final Map deviceData = device.toJson(); final CollectionReference deviceRef = db.collection( - 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/deviceMetadata'); + 'cognitive_measures/$taskName/participants/$participantID/sessions/$sessionID/deviceMetadata'); await deviceRef.doc('deviceMetadata').set(deviceData); } @@ -42,7 +42,7 @@ class FirebaseDB implements DB { final Map sessionData = session.toJson(); final CollectionReference sessionRef = db.collection( - 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/sessionMetadata'); + 'cognitive_measures/$taskName/participants/$participantID/sessions/$sessionID/sessionMetadata'); await sessionRef.doc('sessionMetadata').set(sessionData); } @@ -55,7 +55,7 @@ class FirebaseDB implements DB { final Map trialMap = trial.toJson(); final CollectionReference trialsRef = db.collection( - 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/trials'); + 'cognitive_measures/$taskName/participants/$participantID/sessions/$sessionID/trials'); await trialsRef.add(trialMap); } @@ -66,7 +66,7 @@ class FirebaseDB implements DB { @override Future addTrials({required List trials}) async { final CollectionReference trialsRef = db.collection( - 'participants/$participantID/cognitive_measures/$taskName/sessions/$sessionID/trials'); + 'cognitive_measures/$taskName/participants/$participantID/sessions/$sessionID/trials'); final WriteBatch batch = db.batch(); From 257da995288028a71c02e129b3306bcc282a0cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20E=2E=20Bermonti-P=C3=A9rez?= Date: Sun, 5 May 2024 12:55:34 -0400 Subject: [PATCH 3/3] test(firebase): Fix the sessions collection path --- test/databases/firebase_db/firebase_db_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/databases/firebase_db/firebase_db_test.dart b/test/databases/firebase_db/firebase_db_test.dart index 439d47f..407719d 100644 --- a/test/databases/firebase_db/firebase_db_test.dart +++ b/test/databases/firebase_db/firebase_db_test.dart @@ -19,7 +19,7 @@ void main() { taskName: 'dsb', ); currentSessionPath = - 'participants/${db.participantID}/cognitive_tasks/${db.taskName}/sessions/${db.sessionID}'; + 'cognitive_measures/${db.taskName}/participants/${db.participantID}/sessions/${db.sessionID}'; }); test(