Prosp advance setting and auto selected assets (#799)

* Prosp advance setting and auto selected assets
equinor · Oct 24, 2022 · 3f106ab · 3f106ab
1 parent 77749b6
commit 3f106ab
Show file tree

Hide file tree

Showing 18 changed files with 2,033 additions and 139 deletions.
diff --git a/backend/api/Adapters/CaseAdapter.cs b/backend/api/Adapters/CaseAdapter.cs
@@ -40,7 +40,8 @@ public static Case Convert(CaseDto caseDto)
             WaterInjectorCount = caseDto.WaterInjectorCount,
             FacilitiesAvailability = caseDto.FacilitiesAvailability,
             SharepointFileId = caseDto.SharepointFileId,
-            SharepointFileName = caseDto.SharepointFileName
+            SharepointFileName = caseDto.SharepointFileName,
+            SharepointFileUrl = caseDto.SharepointFileUrl,
         };
     }
 

diff --git a/backend/api/Adapters/CaseDtoAdapter.cs b/backend/api/Adapters/CaseDtoAdapter.cs
@@ -41,6 +41,7 @@ public static CaseDto Convert(Case case_)
             FacilitiesAvailability = case_.FacilitiesAvailability,
             SharepointFileId = case_.SharepointFileId,
             SharepointFileName = case_.SharepointFileName,
+            SharepointFileUrl = case_.SharepointFileUrl,
         };
 
         return caseDto;
@@ -52,6 +53,7 @@ public static CessationCostDto Convert(CessationCost? opexCost)
         {
             return null!;
         }
+
         return new CessationCostDto
         {
             Id = opexCost.Id,
@@ -68,6 +70,7 @@ public static OpexCostProfileDto Convert(OpexCostProfile? opexCost)
         {
             return null!;
         }
+
         return new OpexCostProfileDto
         {
             Id = opexCost.Id,
@@ -84,6 +87,7 @@ public static StudyCostProfileDto Convert(StudyCostProfile? studyCost)
         {
             return null!;
         }
+
         return new StudyCostProfileDto
         {
             Id = studyCost.Id,

diff --git a/backend/api/Controllers/PROSPController.cs b/backend/api/Controllers/PROSPController.cs
@@ -1,5 +1,4 @@
 using api.Dtos;
-using api.Models;
 using api.Services;
 
 using Api.Authorization;
@@ -14,11 +13,10 @@ namespace api.Controllers;
 [ApiController]
 [Authorize]
 [RequiresApplicationRoles(
-        ApplicationRole.Admin,
-        ApplicationRole.ReadOnly,
-        ApplicationRole.User
-
-    )]
+    ApplicationRole.Admin,
+    ApplicationRole.ReadOnly,
+    ApplicationRole.User
+)]
 public class PROSPController : ControllerBase
 {
     private const string isCheckedAsset = "true";
@@ -74,45 +72,6 @@ public List<DriveItemDto> GetSharePointFileNamesAndId([FromBody] urlDto dto)
         }
     }
 
-    [HttpPost("local", Name = "Upload")]
-    [DisableRequestSizeLimit]
-    public async Task<ProjectDto?> Upload([FromQuery] Guid projectId, [FromQuery] Guid sourceCaseId)
-    {
-        try
-        {
-            var formCollection = await Request.ReadFormAsync();
-            var file = formCollection.Files.First();
-            var assets = new Dictionary<string, bool>
-            {
-                { nameof(Surf), false },
-                { nameof(Topside), false },
-                { nameof(Substructure), false },
-                { nameof(Transport), false }
-            };
-
-            if (file.Length > 0)
-            {
-                foreach (var item in assets)
-                {
-                    if (formCollection.TryGetValue(nameof(item.Key), out var asset) && asset == isCheckedAsset)
-                    {
-                        assets[nameof(asset)] = true;
-                    }
-                }
-
-                var dto = _prospExcelImportService.ImportProsp(file, sourceCaseId, projectId, assets);
-                return dto;
-            }
-
-            return null;
-        }
-        catch (Exception e)
-        {
-            _logger.LogError(e.Message);
-            return _projectService.GetProjectDto(projectId);
-        }
-    }
-
     public class urlDto
     {
         public string? url { get; set; }

diff --git a/backend/api/Dtos/CaseDto.cs b/backend/api/Dtos/CaseDto.cs
@@ -39,11 +39,20 @@ public class CaseDto
     public CessationCostDto? CessationCost { get; set; }
     public string? SharepointFileId { get; set; }
     public string? SharepointFileName { get; set; }
+    public string? SharepointFileUrl { get; set; }
 }
 
-public class CessationCostDto : TimeSeriesCostDto { }
-public class OpexCostProfileDto : TimeSeriesCostDto { }
-public class StudyCostProfileDto : TimeSeriesCostDto { }
+public class CessationCostDto : TimeSeriesCostDto
+{
+}
+
+public class OpexCostProfileDto : TimeSeriesCostDto
+{
+}
+
+public class StudyCostProfileDto : TimeSeriesCostDto
+{
+}
 
 public class CapexYear
 {

diff --git a/backend/api/Dtos/DriveItemDto.cs b/backend/api/Dtos/DriveItemDto.cs
@@ -8,7 +8,7 @@ public class DriveItemDto
 {
     public string? Name { get; set; }
     public string? Id { get; set; }
-    public string? WebUrl { get; set; }
+    public string? SharepointFileUrl { get; set; }
     public DateTimeOffset? CreatedDateTime { get; set; }
     public Stream? Content { get; set; }
     public Int64? Size { get; set; }

diff --git a/backend/api/Dtos/SharePointImportDto.cs b/backend/api/Dtos/SharePointImportDto.cs
@@ -7,7 +7,6 @@ public class SharePointImportDto
     public bool Substructure { get; set; }
     public bool Topside { get; set; }
     public bool Transport { get; set; }
-    public string SharePointFileName { get; set; } = null!;
     public string SharePointFileId { get; set; } = null!;
     public string? SharePointSiteUrl { get; set; }
 }