Merge pull request #347 from MerginMaps/fix_alembic_deleted_projects

MarcelGeo · web-flow · commit 141baa273ac0 · 2024-12-16T16:22:56.000+01:00
Fix db migration not to include deleted projects
diff --git a/server/migrations/community/d02961c7416c_add_project_member_table.py b/server/migrations/community/d02961c7416c_add_project_member_table.py
@@ -176,7 +176,10 @@ def data_upgrade():
             SELECT m.workspace_id, m.user_id, m.role::workspace_role
             FROM members m
             LEFT OUTER JOIN "user" u on u.id = m.user_id
-            WHERE u.username !~ 'deleted_\d{13}$';
+            LEFT OUTER JOIN project p ON p.id = m.project_id
+            WHERE
+                u.username !~ 'deleted_\d{13}$' AND
+                p.removed_at IS NULL;
         """
         )
     )

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,10 @@ def data_upgrade():`
`176`	`176`	`SELECT m.workspace_id, m.user_id, m.role::workspace_role`
`177`	`177`	`FROM members m`
`178`	`178`	`LEFT OUTER JOIN "user" u on u.id = m.user_id`
`179`		`- WHERE u.username !~ 'deleted_\d{13}$';`
	`179`	`+ LEFT OUTER JOIN project p ON p.id = m.project_id`
	`180`	`+ WHERE`
	`181`	`+ u.username !~ 'deleted_\d{13}$' AND`
	`182`	`+ p.removed_at IS NULL;`
`180`	`183`	`"""`
`181`	`184`	`)`
`182`	`185`	`)`