From 42d62f16d0ffe468cf2eb051ab00464e58f191e7 Mon Sep 17 00:00:00 2001
From: junos <junos.lukan@ijs.si>
Date: Wed, 9 Mar 2022 17:31:37 +0100
Subject: [PATCH 1/3] Add RAPIDS mandatory columns for ESM.

---
 src/data/streams/rapids_columns.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/data/streams/rapids_columns.yaml b/src/data/streams/rapids_columns.yaml
index 06dc8f99..8929520b 100644
--- a/src/data/streams/rapids_columns.yaml
+++ b/src/data/streams/rapids_columns.yaml
@@ -67,6 +67,19 @@ PHONE_CONVERSATION:
   - DOUBLE_CONVO_START
   - DOUBLE_CONVO_END
 
+PHONE_ESM:
+  - TIMESTAMP
+  - DEVICE_ID
+  - ESM_STATUS
+  - ESM_USER_ANSWER
+  - ESM_NOTIFICATION_TIMEOUT
+  - ESM_JSON
+  - DOUBLE_ESM_USER_ANSWER_TIMESTAMP
+  - ESM_TRIGGER
+  - ESM_SESSION
+  - ESM_NOTIFICATION_ID
+  - ESM_EXPIRATION_THRESHOLD
+
 PHONE_KEYBOARD:
   - TIMESTAMP
   - DEVICE_ID

From 085a6d144bc461ed09907e807e4138a3b201eac9 Mon Sep 17 00:00:00 2001
From: junos <junos.lukan@ijs.si>
Date: Wed, 9 Mar 2022 17:32:02 +0100
Subject: [PATCH 2/3] Add files to compute and create an empty script.

---
 Snakefile                            | 4 ++++
 config.yaml                          | 6 +++---
 src/features/phone_esm/straw/main.py | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 src/features/phone_esm/straw/main.py

diff --git a/Snakefile b/Snakefile
index 4ea33827..95cfbc95 100644
--- a/Snakefile
+++ b/Snakefile
@@ -164,6 +164,10 @@ for provider in config["PHONE_CONVERSATION"]["PROVIDERS"].keys():
         files_to_compute.extend(expand("data/processed/features/{pid}/all_sensor_features.csv", pid=config["PIDS"]))
         files_to_compute.append("data/processed/features/all_participants/all_sensor_features.csv")
 
+for provider in config["PHONE_ESM"]["PROVIDERS"].keys():
+    if config["PHONE_ESM"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/phone_esm_raw.csv",pid=config["PIDS"]))
+
 # We can delete these if's as soon as we add feature PROVIDERS to any of these sensors
 if isinstance(config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"], dict):
     for provider in config["PHONE_APPLICATIONS_CRASHES"]["PROVIDERS"].keys():
diff --git a/config.yaml b/config.yaml
index 18fb0bad..92578437 100644
--- a/config.yaml
+++ b/config.yaml
@@ -237,10 +237,10 @@ PHONE_DATA_YIELD:
 PHONE_ESM:
   CONTAINER: esm
   PROVIDERS:
-    RAPIDS:
-      COMPUTE: False
+    STRAW:
+      COMPUTE: True
       FEATURES:
-      SRC_SCRIPT: src/features/phone_keyboard/rapids/main.py
+      SRC_SCRIPT: src/features/phone_esm/rapids/main.py
 
 # See https://www.rapids.science/latest/features/phone-keyboard/
 PHONE_KEYBOARD:
diff --git a/src/features/phone_esm/straw/main.py b/src/features/phone_esm/straw/main.py
new file mode 100644
index 00000000..e69de29b

From d4a4bbbff0104f73a090b9aab51787432010d81c Mon Sep 17 00:00:00 2001
From: junos <junos.lukan@ijs.si>
Date: Wed, 9 Mar 2022 17:58:36 +0100
Subject: [PATCH 3/3] Remove unused columns.

---
 src/data/streams/aware_postgresql/format.yaml | 5 +----
 src/data/streams/rapids_columns.yaml          | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/data/streams/aware_postgresql/format.yaml b/src/data/streams/aware_postgresql/format.yaml
index ecdf16fa..f4cf20cd 100644
--- a/src/data/streams/aware_postgresql/format.yaml
+++ b/src/data/streams/aware_postgresql/format.yaml
@@ -186,17 +186,14 @@ PHONE_CONVERSATION:
 PHONE_ESM:
   ANDROID:
     RAPIDS_COLUMN_MAPPINGS:
-      TIMESTAMP: timestamp
+      TIMESTAMP: double_esm_user_answer_timestamp
       DEVICE_ID: device_id
       ESM_STATUS: esm_status
       ESM_USER_ANSWER: esm_user_answer
-      ESM_NOTIFICATION_TIMEOUT: esm_notification_timeout
       ESM_JSON: esm_json
-      DOUBLE_ESM_USER_ANSWER_TIMESTAMP: double_esm_user_answer_timestamp
       ESM_TRIGGER: esm_trigger
       ESM_SESSION: esm_session
       ESM_NOTIFICATION_ID: esm_notification_id
-      ESM_EXPIRATION_THRESHOLD: esm_expiration_threshold
     MUTATION:
       COLUMN_MAPPINGS:
       SCRIPTS:
diff --git a/src/data/streams/rapids_columns.yaml b/src/data/streams/rapids_columns.yaml
index 8929520b..09b67566 100644
--- a/src/data/streams/rapids_columns.yaml
+++ b/src/data/streams/rapids_columns.yaml
@@ -72,13 +72,10 @@ PHONE_ESM:
   - DEVICE_ID
   - ESM_STATUS
   - ESM_USER_ANSWER
-  - ESM_NOTIFICATION_TIMEOUT
   - ESM_JSON
-  - DOUBLE_ESM_USER_ANSWER_TIMESTAMP
   - ESM_TRIGGER
   - ESM_SESSION
   - ESM_NOTIFICATION_ID
-  - ESM_EXPIRATION_THRESHOLD
 
 PHONE_KEYBOARD:
   - TIMESTAMP