Merge remote-tracking branch 'origin/main' into feature/get_email-from-gitconfig

# Conflicts:
#	pilot/utils/arguments.py

pilot/database/database.py

@@ -23,6 +23,7 @@ from database.models.environment_setup import EnvironmentSetup
 from database.models.development import Development
 from database.models.file_snapshot import FileSnapshot
 from database.models.command_runs import CommandRuns
+from database.models.user_apps import UserApps
 from database.models.user_inputs import UserInputs
 from database.models.files import File
 
@@ -84,6 +85,16 @@ def save_app(args):
     return app
 
 
+def save_user_app(user_id, app_id, workspace):
+    try:
+        user_app = UserApps.get((UserApps.user == user_id) & (UserApps.app == app_id))
+        user_app.workspace = workspace
+        user_app.save()
+    except DoesNotExist:
+        user_app = UserApps.create(user=user_id, app=app_id, workspace=workspace)
+
+    return user_app
+
 def save_progress(app_id, step, data):
     progress_table_map = {
         'project_description': ProjectDescription,
@@ -124,6 +135,14 @@ def get_app(app_id):
         raise ValueError(f"No app with id: {app_id}")
 
 
+def get_app_by_user_workspace(user_id, workspace):
+    try:
+        user_app = UserApps.get((UserApps.user == user_id) & (UserApps.workspace == workspace))
+        return user_app.app
+    except DoesNotExist:
+        return None
+
+
 def get_progress_steps(app_id, step=None):
     progress_table_map = {
         'project_description': ProjectDescription,
@@ -309,7 +328,7 @@ def get_all_connected_steps(step, previous_step_field_name):
 
 
 def delete_all_app_development_data(app):
-    models = [DevelopmentSteps, CommandRuns, UserInputs, File, FileSnapshot]
+    models = [DevelopmentSteps, CommandRuns, UserInputs, UserApps, File, FileSnapshot]
     for model in models:
         model.delete().where(model.app == app).execute()
 
@@ -354,6 +373,7 @@ def create_tables():
             Development,
             FileSnapshot,
             CommandRuns,
+            UserApps,
             UserInputs,
             File,
         ])
@@ -374,10 +394,11 @@ def drop_tables():
             Development,
             FileSnapshot,
             CommandRuns,
+            UserApps,
             UserInputs,
             File,
         ]:
-            if DATABASE_TYPE == "postgresql":
+            if DATABASE_TYPE == "postgres":
                 sql = f'DROP TABLE IF EXISTS "{table._meta.table_name}" CASCADE'
             elif DATABASE_TYPE == "sqlite":
                 sql = f'DROP TABLE IF EXISTS "{table._meta.table_name}"'
@@ -423,7 +444,7 @@ def create_database():
 
 def tables_exist():
     tables = [User, App, ProjectDescription, UserStories, UserTasks, Architecture, DevelopmentPlanning,
-              DevelopmentSteps, EnvironmentSetup, Development, FileSnapshot, CommandRuns, UserInputs, File]
+              DevelopmentSteps, EnvironmentSetup, Development, FileSnapshot, CommandRuns, UserApps, UserInputs, File]
 
     if DATABASE_TYPE == "postgres":
         for table in tables: