7 files changed, 16 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 42d88df..5d34e01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ tmp
 
 # The development sqlite file
 database/development.sqlite
+database/adonis.sqlite
diff --git a/app/Controllers/Http/ServiceController.js b/app/Controllers/Http/ServiceController.js
index 47a8a6f..0fcbec0 100644
--- a/app/Controllers/Http/ServiceController.js
+++ b/app/Controllers/Http/ServiceController.js
@@ -2,6 +2,7 @@
 
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
+const uuid = require('uuid/v4');
 
 class ServiceController {
   // Create a new service for user
@@ -18,8 +19,15 @@ class ServiceController {
 
     const data = request.all();
 
+    // Get new, unused uuid
+    let serviceId;
+    do {
+      serviceId = uuid();
+    } while((await Service.all()).rows.length > 0)
+
     const service = await Service.create({
       userId: auth.user.id,
+      serviceId,
       name: data.name,
       recipeId: data.recipeId,
       settings: JSON.stringify(data)
@@ -28,7 +36,7 @@ class ServiceController {
     return response.send({
       "data": {
         userId: auth.user.id,
-        id: service.id,
+        id: serviceId,
         "isEnabled": true,
         "isNotificationEnabled": true,
         "isBadgeEnabled": true,
@@ -74,7 +82,7 @@ class ServiceController {
         "workspaces": [],
         "iconUrl": null,
         ...JSON.parse(service.settings),
-        "id": service.id,
+        "id": service.serviceId,
         "name": service.name,
         "recipeId": service.recipeId,
         "userId": auth.user.id,
diff --git a/database/adonis.sqlite b/database/adonis.sqlite
deleted file mode 100644
index 9042fc9..0000000
--- a/database/adonis.sqlite
+++ /dev/null
diff --git a/database/migrations/1566385379883_service_schema.js b/database/migrations/1566385379883_service_schema.js
index bdc066e..a725699 100644
--- a/database/migrations/1566385379883_service_schema.js
+++ b/database/migrations/1566385379883_service_schema.js
@@ -8,6 +8,7 @@ class ServiceSchema extends Schema {
     this.create('services', (table) => {
       table.increments()
       table.string('userId', 80).notNullable()
+      table.string('serviceId', 80).notNullable()
       table.string('name', 80).notNullable()
       table.string('recipeId', 254).notNullable()
       table.json('settings')
diff --git a/package.json b/package.json
index 6dcffd6..2c8179f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "@adonisjs/lucid": "^6.1.3",
     "atob": "^2.1.2",
     "pg": "^7.12.1",
-    "sqlite3": "^4.1.0"
+    "sqlite3": "^4.1.0",
+    "uuid": "^3.3.3"
   },
   "devDependencies": {},
   "autoload": {
diff --git a/start/routes.js b/start/routes.js
index 3aca58e..ef688c8 100644
--- a/start/routes.js
+++ b/start/routes.js
@@ -42,7 +42,7 @@ Route.group(() => {
   Route.get('payment/plans', 'StaticController.plans')
   Route.get('recipes/popular', 'StaticController.popularRecipes')
   Route.get('recipes/update', 'StaticController.emptyArray')
-  Route.get('announcements/:version', 'StaticController.announcement')
+  // Route.get('announcements/:version', 'StaticController.announcement')
 }).prefix('v1')
 
 Route.get('/', () => {
diff --git a/yarn.lock b/yarn.lock
index 6443b7b..d9558e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3573,7 +3573,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-uuid@^3.3.2:
+uuid@^3.3.2, uuid@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==