From a3b01c2dd24ccf1d2a4fa8c89df7c4c861fc52ac Mon Sep 17 00:00:00 2001
From: 0xCmdrKeen <98132670+0xCmdrKeen@users.noreply.github.com>
Date: Tue, 17 Oct 2023 11:58:51 -0700
Subject: Fix bugs in data import from Ferdium app (#82)

* Fixed misspelled field names

* Fixed broken tests

* Ensure service.settings and workspace.data are not JSON encoded twice

* Accept both snake_case and camelCase input files

* More tests for JSON fields

* Add filename to assertion messages
---
 .../import-stubs/services-only.ferdium-data        | 24 ++++++++---------
 .../dashboard/import-stubs/services-only.json      |  6 ++---
 .../import-stubs/services-workspaces.ferdium-data  | 30 +++++++++++-----------
 .../import-stubs/services-workspaces.json          |  6 ++---
 .../import-stubs/workspaces-only.ferdium-data      |  6 ++---
 5 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'tests/functional/dashboard/import-stubs')

diff --git a/tests/functional/dashboard/import-stubs/services-only.ferdium-data b/tests/functional/dashboard/import-stubs/services-only.ferdium-data
index d95f3ef..cd3f381 100644
--- a/tests/functional/dashboard/import-stubs/services-only.ferdium-data
+++ b/tests/functional/dashboard/import-stubs/services-only.ferdium-data
@@ -5,31 +5,31 @@
   "services": [
     {
       "id": 5641,
-      "userId": "1234",
-      "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
+      "user_id": "1234",
+      "service_id": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
-      "recipeId": "random-service-1",
-      "settings": "{}",
+      "recipe_id": "random-service-1",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
     {
       "id": 2134,
-      "userId": "1234",
-      "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
+      "user_id": "1234",
+      "service_id": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
-      "recipeId": "random-service-1",
-      "settings": "{}",
+      "recipe_id": "random-service-1",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
     {
       "id": 5343,
-      "userId": "1234",
-      "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
+      "user_id": "1234",
+      "service_id": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
-      "recipeId": "random-service-1",
-      "settings": "{}",
+      "recipe_id": "random-service-1",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     }
diff --git a/tests/functional/dashboard/import-stubs/services-only.json b/tests/functional/dashboard/import-stubs/services-only.json
index d95f3ef..c4a9147 100644
--- a/tests/functional/dashboard/import-stubs/services-only.json
+++ b/tests/functional/dashboard/import-stubs/services-only.json
@@ -9,7 +9,7 @@
       "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
       "recipeId": "random-service-1",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
@@ -19,7 +19,7 @@
       "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
       "recipeId": "random-service-1",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
@@ -29,7 +29,7 @@
       "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
       "recipeId": "random-service-1",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     }
diff --git a/tests/functional/dashboard/import-stubs/services-workspaces.ferdium-data b/tests/functional/dashboard/import-stubs/services-workspaces.ferdium-data
index e999c0d..1d90f4a 100644
--- a/tests/functional/dashboard/import-stubs/services-workspaces.ferdium-data
+++ b/tests/functional/dashboard/import-stubs/services-workspaces.ferdium-data
@@ -5,31 +5,31 @@
   "services": [
     {
       "id": 5641,
-      "userId": "1234",
-      "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
+      "user_id": "1234",
+      "service_id": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
-      "recipeId": "random-service-1",
-      "settings": "{}",
+      "recipe_id": "random-service-1",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
     {
       "id": 2134,
-      "userId": "1234",
-      "serviceId": "79769de5-a998-4af1-b7d0-89956a15b0ed",
+      "user_id": "1234",
+      "service_id": "79769de5-a998-4af1-b7d0-89956a15b0ed",
       "name": "random-service-2",
-      "recipeId": "random-service-2",
-      "settings": "{}",
+      "recipe_id": "random-service-2",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
     {
       "id": 5343,
-      "userId": "1234",
-      "serviceId": "0ac973f8-40dc-4760-b2c2-55e1d2943747",
+      "user_id": "1234",
+      "service_id": "0ac973f8-40dc-4760-b2c2-55e1d2943747",
       "name": "random-service-3",
-      "recipeId": "random-service-2",
-      "settings": "{}",
+      "recipe_id": "random-service-2",
+      "settings": {"isEnabled": true},
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     }
@@ -39,13 +39,13 @@
       "name": "workspace1",
       "order": 0,
       "services": [],
-      "data": "{\"name\":\"workspace1\"}"
+      "data": {"name":"workspace1"}
     },
     {
       "name": "workspace2",
       "order": 0,
       "services": ["d6901fff-ec44-4251-93de-d7103ed9c44b", "79769de5-a998-4af1-b7d0-89956a15b0ed"],
-      "data": "{\"name\":\"workspace2\"}"
+      "data": {"name":"workspace2"}
     },
     {
       "name": "workspace3",
@@ -55,7 +55,7 @@
         "79769de5-a998-4af1-b7d0-89956a15b0ed",
         "0ac973f8-40dc-4760-b2c2-55e1d2943747"
       ],
-      "data": "{\"name\":\"workspace3\"}"
+      "data": {"name":"workspace3"}
     }
   ]
 }
diff --git a/tests/functional/dashboard/import-stubs/services-workspaces.json b/tests/functional/dashboard/import-stubs/services-workspaces.json
index 54c6889..139b32c 100644
--- a/tests/functional/dashboard/import-stubs/services-workspaces.json
+++ b/tests/functional/dashboard/import-stubs/services-workspaces.json
@@ -9,7 +9,7 @@
       "serviceId": "d6901fff-ec44-4251-93de-d7103ed9c44b",
       "name": "random-service-1",
       "recipeId": "random-service-1",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
@@ -19,7 +19,7 @@
       "serviceId": "79769de5-a998-4af1-b7d0-89956a15b0ed",
       "name": "random-service-2",
       "recipeId": "random-service-2",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     },
@@ -29,7 +29,7 @@
       "serviceId": "0ac973f8-40dc-4760-b2c2-55e1d2943747",
       "name": "random-service-3",
       "recipeId": "random-service-3",
-      "settings": "{}",
+      "settings": "{\"isEnabled\":true}",
       "created_at": "2022-06-21 08:29:13",
       "updated_at": "2022-07-19 15:47:16"
     }
diff --git a/tests/functional/dashboard/import-stubs/workspaces-only.ferdium-data b/tests/functional/dashboard/import-stubs/workspaces-only.ferdium-data
index 13ea9c6..cf0fca0 100644
--- a/tests/functional/dashboard/import-stubs/workspaces-only.ferdium-data
+++ b/tests/functional/dashboard/import-stubs/workspaces-only.ferdium-data
@@ -8,19 +8,19 @@
       "name": "workspace1",
       "order": 0,
       "services": [],
-      "data": "{\"name\":\"workspace1\"}"
+      "data": {"name":"workspace1"}
     },
     {
       "name": "workspace2",
       "order": 0,
       "services": [],
-      "data": "{\"name\":\"workspace2\"}"
+      "data": {"name":"workspace2"}
     },
     {
       "name": "workspace3",
       "order": 0,
       "services": [],
-      "data": "{\"name\":\"workspace3\"}"
+      "data": {"name":"workspace3"}
     }
   ]
 }
-- 
cgit v1.2.3-70-g09d2