Merge pull request #1557 from ssc-sp/ep/poc-merge_20250210

Merging develop into POC to add API updates for GC Hosting team
ssc-sp · Feb 10, 2025 · 0886d0e · 0886d0e
2 parents 91e4579 + 47d0886
commit 0886d0e
Show file tree

Hide file tree

Showing 48 changed files with 9,528 additions and 370 deletions.
diff --git a/Portal/src/Datahub.Application/Services/IProjectDeletionService.cs b/Portal/src/Datahub.Application/Services/IProjectDeletionService.cs
@@ -1,8 +1,10 @@
 
+using Datahub.Core.Model.Projects;
+
 namespace Datahub.Application.Services
 {
     public interface IProjectDeletionService
     {
-        public Task<bool> DeleteWorkspace(string acronym);
+        public Task<bool> DeleteWorkspace(string acronym, Project_Delete_Questionnaire questionnaire);
     }
 }
diff --git a/Portal/src/Datahub.Core/Data/EFTools.cs b/Portal/src/Datahub.Core/Data/EFTools.cs
@@ -25,6 +25,7 @@ public static void InitializeDatabase<T>(ILogger logger, IConfiguration configur
         where T : DbContext
     {
         using var context = factory.CreateDbContext();
+        logger.LogInformation($"Initializing database {GetInfo(context.Database)}-{typeof(T).Name} - reset:{resetDB} - migrate:{migrate}");
         try
         {
             if (resetDB)
@@ -37,6 +38,16 @@ public static void InitializeDatabase<T>(ILogger logger, IConfiguration configur
             {
                 if (migrate)
                 {
+                    var pendingMigrations = context.Database.GetPendingMigrations();
+                    if (pendingMigrations.Any())
+                    {
+                        logger.LogInformation("Pending migrations: {Migrations}", string.Join(", ", pendingMigrations));
+                    }
+                    else
+                    {
+                        logger.LogInformation("No pending migrations.");
+                    }
+
                     context.Database.Migrate();
                     //TODO:
                     //GetMigrations()

diff --git a/Portal/src/Datahub.Core/Migrations/20250127193221_DeletedQuestionnaireTable.cs b/Portal/src/Datahub.Core/Migrations/20250127193221_DeletedQuestionnaireTable.cs
@@ -10,13 +10,7 @@ public partial class DeletedQuestionnaireTable : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsDataSteward",
-                table: "Project_Users",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
+        {            
 
             migrationBuilder.CreateTable(
                 name: "Project_Delete_Questionnaires",
@@ -47,35 +41,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                         principalTable: "Projects",
                         principalColumn: "Project_ID");
                 });
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 1,
-                column: "Description",
-                value: "Revoke the user's access to the workspace");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 2,
-                column: "Description",
-                value: "Head of the workspace and bears business responsibility for success of the workspace");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 3,
-                column: "Description",
-                value: "Management authority within the workspace with direct supervision over the cloud resourcing and users");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 4,
-                column: "Description",
-                value: "Responsible for contributing to the overall workspace objectives and deliverables");
-
+
             migrationBuilder.CreateIndex(
                 name: "IX_Project_Delete_Questionnaires_DeletedById",
                 table: "Project_Delete_Questionnaires",
@@ -92,38 +58,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
                 name: "Project_Delete_Questionnaires");
-
-            migrationBuilder.DropColumn(
-                name: "IsDataSteward",
-                table: "Project_Users");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 1,
-                column: "Description",
-                value: "Revoke the user's access to the project's private resources");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 2,
-                column: "Description",
-                value: "Head of the business unit and bears business responsibility for successful implementation and availability");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 3,
-                column: "Description",
-                value: "Management authority within the project with direct supervision over the project resources and deliverables");
-
-            migrationBuilder.UpdateData(
-                table: "Project_Roles",
-                keyColumn: "Id",
-                keyValue: 4,
-                column: "Description",
-                value: "Responsible for contributing to the overall project objectives and deliverables to ensure success");
+
         }
     }
 }