Merge pull request #7228 from FlowFuse/auto-update-stack-to-latest

Ensure auto updating stacks jump to latest version

Author: knolleary

forge/db/models/ProjectStack.js

@@ -108,6 +108,13 @@ module.exports = {
             instance: {
                 projectCount: async function () {
                     return await M.Project.count({ where: { ProjectStackId: this.id } })
+                },
+                findLatestStack: async function () {
+                    if (this.replacedBy) {
+                        return (await M.ProjectStack.byId(this.replacedBy)).findLatestStack()
+                    } else {
+                        return this
+                    }
                 }
             }
         }

forge/ee/lib/autoUpdateStacks/tasks/upgrade-stack.js

@@ -25,7 +25,7 @@ module.exports = {
                         if (project.Project.ProjectStack.replacedBy) {
                             // need to add audit logging
                             try {
-                                const newStack = await app.db.models.ProjectStack.byId(project.Project.ProjectStack.replacedBy)
+                                const newStack = await project.Project.ProjectStack.findLatestStack()
                                 app.log.info(`Updating project ${project.Project.id} to stack: '${newStack.hashid}'`)
 
                                 const suspendOptions = {