From 3eab3e2fb69d827d299bec288c1aa5c433077a88 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 15 Mar 2024 09:55:14 -0700 Subject: [PATCH] Add ioevent logging for events. --- client/src/firebase/firebase.utils.js | 14 ++++++ hasura/metadata/tables.yaml | 2 +- .../down.sql | 4 ++ .../up.sql | 2 + .../down.sql | 4 ++ .../up.sql | 2 + .../down.sql | 1 + .../up.sql | 1 + .../down.sql | 4 ++ .../up.sql | 2 + .../down.sql | 1 + .../up.sql | 2 + .../down.sql | 1 + .../up.sql | 5 ++ .../down.sql | 1 + .../up.sql | 5 ++ server/ioevent/ioevent.js | 47 ++++++++++++------- 17 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql create mode 100644 hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql create mode 100644 hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql create mode 100644 hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql create mode 100644 hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql create mode 100644 hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql create mode 100644 hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql create mode 100644 hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql create mode 100644 hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql create mode 100644 hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql create mode 100644 hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql create mode 100644 hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql create mode 100644 hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql create mode 100644 hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql diff --git a/client/src/firebase/firebase.utils.js b/client/src/firebase/firebase.utils.js index 7a65be083..9632ce148 100644 --- a/client/src/firebase/firebase.utils.js +++ b/client/src/firebase/firebase.utils.js @@ -4,6 +4,8 @@ import { getAuth, updatePassword, updateProfile } from "firebase/auth"; import { getFirestore } from "firebase/firestore"; import { getMessaging, getToken, onMessage } from "firebase/messaging"; import { store } from "../redux/store"; +import axios from "axios"; +import { checkBeta } from "../utils/handleBeta"; const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG); initializeApp(config); @@ -86,6 +88,18 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => { null, ...additionalParams, }; + axios.post("/ioevent", { + useremail: + (state.user && state.user.currentUser && state.user.currentUser.email) || + null, + bodyshopid: + (state.user && state.user.bodyshop && state.user.bodyshop.id) || null, + operationName: eventName, + variables: additionalParams, + dbevent: false, + env: checkBeta() ? "beta" : "master", + }); + // console.log( // "%c[Analytics]", // "background-color: green ;font-weight:bold;", diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 587fa8ac3..0467fae39 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -4200,7 +4200,7 @@ interval_sec: 10 num_retries: 0 timeout_sec: 60 - webhook_from_env: HASURA_API_URL + webhook: https://worktest.home.irony.online headers: - name: event-secret value_from_env: EVENT_SECRET diff --git a/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql b/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql new file mode 100644 index 000000000..c15a1de62 --- /dev/null +++ b/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."ioevents" add column "useremail" text +-- not null; diff --git a/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql b/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql new file mode 100644 index 000000000..3996327c6 --- /dev/null +++ b/hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql @@ -0,0 +1,2 @@ +alter table "public"."ioevents" add column "useremail" text + not null; diff --git a/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql b/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql new file mode 100644 index 000000000..ce3de08a7 --- /dev/null +++ b/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."ioevents" add column "bodyshopid" uuid +-- null; diff --git a/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql b/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql new file mode 100644 index 000000000..ac3ff14ab --- /dev/null +++ b/hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql @@ -0,0 +1,2 @@ +alter table "public"."ioevents" add column "bodyshopid" uuid + null; diff --git a/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql b/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql new file mode 100644 index 000000000..5c6a0fcaf --- /dev/null +++ b/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql @@ -0,0 +1 @@ +alter table "public"."ioevents" alter column "useremail" set not null; diff --git a/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql b/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql new file mode 100644 index 000000000..12a8aaaab --- /dev/null +++ b/hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql @@ -0,0 +1 @@ +alter table "public"."ioevents" alter column "useremail" drop not null; diff --git a/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql b/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql new file mode 100644 index 000000000..a70c9031c --- /dev/null +++ b/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."ioevents" add column "env" text +-- null; diff --git a/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql b/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql new file mode 100644 index 000000000..21077366d --- /dev/null +++ b/hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql @@ -0,0 +1,2 @@ +alter table "public"."ioevents" add column "env" text + null; diff --git a/hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql b/hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql new file mode 100644 index 000000000..413d340c9 --- /dev/null +++ b/hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."ioevents_useremail"; diff --git a/hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql b/hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql new file mode 100644 index 000000000..d9a5a1a2c --- /dev/null +++ b/hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "ioevents_useremail" on + "public"."ioevents" using btree ("useremail"); diff --git a/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql b/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql new file mode 100644 index 000000000..33632f335 --- /dev/null +++ b/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql @@ -0,0 +1 @@ +alter table "public"."ioevents" drop constraint "ioevents_useremail_fkey"; diff --git a/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql b/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql new file mode 100644 index 000000000..47ac7307c --- /dev/null +++ b/hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql @@ -0,0 +1,5 @@ +alter table "public"."ioevents" + add constraint "ioevents_useremail_fkey" + foreign key ("useremail") + references "public"."users" + ("email") on update set null on delete set null; diff --git a/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql b/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql new file mode 100644 index 000000000..aa868e98e --- /dev/null +++ b/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql @@ -0,0 +1 @@ +alter table "public"."ioevents" drop constraint "ioevents_bodyshopid_fkey"; diff --git a/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql b/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql new file mode 100644 index 000000000..e11c5e9b9 --- /dev/null +++ b/hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql @@ -0,0 +1,5 @@ +alter table "public"."ioevents" + add constraint "ioevents_bodyshopid_fkey" + foreign key ("bodyshopid") + references "public"."bodyshops" + ("id") on update set null on delete set null; diff --git a/server/ioevent/ioevent.js b/server/ioevent/ioevent.js index 4ad524eb8..967e1c7ad 100644 --- a/server/ioevent/ioevent.js +++ b/server/ioevent/ioevent.js @@ -11,27 +11,40 @@ require("dotenv").config({ }); exports.default = async (req, res) => { - const { operationName, time, dbevent, user, imexshopid } = req.body; + const { + useremail, + bodyshopid, + operationName, + variables, + env, + time, + dbevent, + user, + } = req.body; try { - // await client.request(queries.INSERT_IOEVENT, { - // event: { - // operationname: operationName, - // time, - // dbevent, - // }, - // }); - console.log("IOEVENT", operationName, time, dbevent, user, imexshopid); - logger.log("ioevent", "trace", user, null, { - imexshopid, - operationName, - time, - dbevent, + await client.request(queries.INSERT_IOEVENT, { + event: { + operationname: operationName, + time, + dbevent, + env, + variables, + bodyshopid, + useremail, + }, }); - res.sendStatus(200); } catch (error) { - console.log("error", error); - res.status(400).send(error); + logger.log("ioevent-error", "trace", user, null, { + operationname: operationName, + time, + dbevent, + env, + variables, + bodyshopid, + useremail, + }); + res.sendStatus(200); } };