Merge pull request #2325 from flowforge/fix-failed-setup

Use findOrCreate to handle retrying failed setup
FlowFuse · Jun 22, 2023 · eb12d8d · eb12d8d
2 parents e54906c + 40d30b2
commit eb12d8d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/forge/db/controllers/ProjectStack.js b/forge/db/controllers/ProjectStack.js
@@ -7,13 +7,17 @@ module.exports = {
             label = `Node-RED ${properties.nodered}`
             name = label.toLowerCase().replace(/[ .]/g, '-')
         }
-        const stack = await app.db.models.ProjectStack.create({
-            name,
-            label,
-            active: true,
-            order: 1,
-            description: '',
-            properties
+        const [stack] = await app.db.models.ProjectStack.findOrCreate({
+            where: {
+                name,
+                active: true
+            },
+            defaults: {
+                label,
+                order: 1,
+                description: '',
+                properties
+            }
         })
         await stack.setProjectType(projectType)
         return stack

diff --git a/forge/db/controllers/ProjectTemplate.js b/forge/db/controllers/ProjectTemplate.js
@@ -226,11 +226,16 @@ module.exports = {
             setTemplateValue(settings, name, defaultTemplateValues[name])
             setTemplateValue(policy, name, defaultTemplatePolicy[name])
         })
-        const template = await app.db.models.ProjectTemplate.create({
-            name: 'Default',
-            active: true,
-            settings,
-            policy
+        const [template] = await app.db.models.ProjectTemplate.findOrCreate({
+            where: {
+                name: 'Default',
+                active: true,
+                ownerId: user.id
+            },
+            defaults: {
+                settings,
+                policy
+            }
         })
         await template.setOwner(user)
         return template

diff --git a/forge/db/controllers/ProjectType.js b/forge/db/controllers/ProjectType.js
@@ -1,11 +1,18 @@
 module.exports = {
     createDefaultProjectType: async function (app) {
-        return await app.db.models.ProjectType.create({
-            name: 'Default',
-            active: true,
-            order: 1,
-            description: '',
-            properties: {}
+        const [projectType] = await app.db.models.ProjectType.findOrCreate({
+            where: {
+                name: 'Default',
+                active: true
+            },
+            defaults: {
+                active: true,
+                order: 1,
+                description: '',
+                properties: {}
+            }
         })
+
+        return projectType
     }
 }