Use .NET API for adding bedrock layer to a stratigraphy (#927)

src/api-legacy/__init__.py

@@ -34,9 +34,6 @@
 from bms.v1.borehole.identifier import IdentifierAdminHandler
 from bms.v1.borehole.identifier import IdentifierViewerHandler
 
-# Stratigraphy's ACTION Handlers
-from bms.v1.borehole.stratigraphy.producer import StratigraphyProducerHandler
-
 # Profiles's ACTION Handlers
 from bms.v1.borehole.profile.viewer import ProfileViewerHandler
 from bms.v1.borehole.profile.producer import ProfileProducerHandler

src/api-legacy/main.py

@@ -140,9 +140,6 @@ async def close(application):
         IdentifierProducerHandler,
         IdentifierViewerHandler,
 
-        # Stratigraphy handlers
-        StratigraphyProducerHandler,
-
         # Layer handlers
         LayerViewerHandler,
         LayerProducerHandler,
@@ -218,9 +215,6 @@ async def close(application):
         # FEEDBACK handlers
         (r'/api/v1/feedback', FeedbackHandler),
 
-        # Stratigraphy handlers (will be deprecated)
-        (r'/api/v1/borehole/stratigraphy/edit', StratigraphyProducerHandler),
-
         # Layer handlers (will be deprecated)
         (r'/api/v1/borehole/stratigraphy/layer', LayerViewerHandler),
         (r'/api/v1/borehole/stratigraphy/layer/edit', LayerProducerHandler),

src/api-legacy/v1/borehole/profile/producer.py

@@ -1,15 +1,13 @@
 # -*- coding: utf-8 -*-
 from bms.v1.borehole.profile.patch import PatchProfile
 from bms.v1.handlers import Producer
-from bms.v1.borehole.stratigraphy import AddBedrock
 
 
 class ProfileProducerHandler(Producer):
     async def execute(self, request):
         action = request.pop('action', None)
 
         if action in [
-            'ADDBEDROCK',
             'PATCH'
         ]:
 
@@ -20,7 +18,6 @@ async def execute(self, request):
                 id_bho = None
 
                 if action in [
-                    'ADDBEDROCK',
                     'PATCH',
                 ]:
                     # Get Borehole id
@@ -38,11 +35,7 @@ async def execute(self, request):
                         id_bho, self.user, conn
                     )
 
-                if action == 'ADDBEDROCK':
-                    exe = AddBedrock(conn)
-                    request['user_id'] = self.user['id']
-
-                elif action == 'PATCH':
+                if action == 'PATCH':
                     exe = PatchProfile(conn)
                     request['user_id'] = self.user['id']
 

src/api/Controllers/StratigraphyController.cs

@@ -188,4 +188,62 @@ public override async Task<ActionResult<Stratigraphy>> CreateAsync(Stratigraphy
 
         return await base.CreateAsync(entity).ConfigureAwait(false);
     }
+
+    /// <summary>
+    /// Asynchronously adds a bedrock <see cref="Layer"/> to a <see cref="Stratigraphy"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Stratigraphy"/> id.</param>
+    /// <returns>The id of the created bedrock <see cref="Layer"/>.</returns>
+    [HttpPost("addbedrock")]
+    [Authorize(Policy = PolicyNames.Viewer)]
+    public async Task<ActionResult<int>> AddBedrockLayerAsync([Required] int id)
+    {
+        var stratigraphy = await Context.Stratigraphies.FindAsync(id).ConfigureAwait(false);
+        if (stratigraphy == null)
+        {
+            return NotFound();
+        }
+
+        try
+        {
+            // Check if associated borehole is locked
+            var userName = HttpContext.User.FindFirst(ClaimTypes.Name)?.Value;
+            if (await boreholeLockService.IsBoreholeLockedAsync(stratigraphy.BoreholeId, userName).ConfigureAwait(false))
+            {
+                return Problem("The borehole is locked by another user.");
+            }
+        }
+        catch (UnauthorizedAccessException)
+        {
+            return Unauthorized("You are not authorized to add a bedrock layer to this stratigraphy.");
+        }
+        catch (Exception ex)
+        {
+            var message = "An error ocurred while adding a bedrock layer to the stratigraphy.";
+            Logger.LogError(ex, message);
+            return Problem(message);
+        }
+
+        // Check if associated borehole has a TopBedrock value
+        var borehole = await Context.Boreholes.FindAsync(stratigraphy.BoreholeId).ConfigureAwait(false);
+        if (!borehole.TopBedrock.HasValue)
+        {
+            return Problem("Bedrock not yet defined.");
+        }
+
+        // Add bedrock layer
+        var bedrockLayer = new Layer
+        {
+            StratigraphyId = stratigraphy.Id,
+            FromDepth = borehole.TopBedrock.Value,
+            LithologyTopBedrockId = borehole.LithologyTopBedrockId,
+            LithostratigraphyId = borehole.LithostratigraphyId,
+            IsLast = false,
+        };
+
+        await Context.Layers.AddAsync(bedrockLayer).ConfigureAwait(false);
+        await Context.UpdateChangeInformationAndSaveChangesAsync(HttpContext).ConfigureAwait(false);
+
+        return Ok(bedrockLayer.Id);
+    }
 }

src/client/src/api-lib/actions/stratigraphy.js

@@ -1,13 +1,5 @@
 import { fetch } from "./index";
 
-// Create a new stratigraphy for the given borehole id
-export function addBedrock(id) {
-  return fetch("/borehole/stratigraphy/edit", {
-    action: "ADDBEDROCK",
-    id: id,
-  });
-}
-
 export function getLayers(id) {
   return fetch("/borehole/stratigraphy/layer", {
     action: "LIST",

src/client/src/api-lib/index.js

@@ -76,7 +76,6 @@ import {
 } from "./actions/workflow";
 
 import {
-  addBedrock,
   createLayer,
   createInstrument,
   deleteLayer,
@@ -162,7 +161,6 @@ export {
   submitWorkflow,
   rejectWorkflow,
   resetWorkflow,
-  addBedrock,
   createLayer,
   createInstrument,
   deleteLayer,

src/client/src/api/fetchApiV2.js

@@ -186,6 +186,10 @@ export const createStratigraphy = async (boreholeId, kindId) => {
   });
 };
 
+export const addBedrock = async id => {
+  return await fetchApiV2(`stratigraphy/addbedrock?id=${id}`, "POST");
+};
+
 // Enable using react-query outputs across the application.
 
 // eslint-disable-next-line react-hooks/rules-of-hooks

src/client/src/commons/form/profile/components/profileLayers/components/profileLayersError/profileLayersError.js

@@ -2,12 +2,11 @@ import React, { useState, useEffect, useContext } from "react";
 import * as Styled from "./styles";
 import { Icon, Radio } from "semantic-ui-react";
 import TranslationText from "../../../../../translationText";
+import { gapLayer, deleteLayer } from "../../../../../../../api-lib/index";
 import {
-  gapLayer,
+  fetchLayerById,
   addBedrock,
-  deleteLayer,
-} from "../../../../../../../api-lib/index";
-import { fetchLayerById } from "../../../../../../../api/fetchApiV2";
+} from "../../../../../../../api/fetchApiV2";
 import ErrorTypes from "./errorTypes";
 import { AlertContext } from "../../../../../../alert/alertContext";
 
@@ -109,10 +108,8 @@ const ProfileLayersError = props => {
     } else if (title === "missingBedrock") {
       addBedrock(id)
         .then(response => {
-          if (response.data.success) {
+          if (response) {
             onUpdated("fixErrors");
-          } else {
-            alertContext.error(response.data.message);
           }
         })
         .catch(error => {

tests/ActionResultAssert.cs

@@ -58,6 +58,21 @@ internal static void IsNotFound(IActionResult? actionResult)
     internal static void IsInternalServerError(IActionResult? actionResult)
         => AssertActionResult(actionResult, StatusCodes.Status500InternalServerError);
 
+    /// <summary>
+    /// Asserts that the <see cref="IActionResult"/> is InternalServerError (500).
+    /// </summary>
+    internal static void IsInternalServerError(IActionResult? actionResult, string expectedErrorMessageSubstring)
+    {
+        AssertActionResult(actionResult, StatusCodes.Status500InternalServerError);
+
+        var problemDetails = (ProblemDetails)((ObjectResult)actionResult!).Value!;
+        StringAssert.Contains(
+            problemDetails.Detail,
+            expectedErrorMessageSubstring,
+            $"The error message does not contain the expected message '{expectedErrorMessageSubstring}'.",
+            StringComparison.OrdinalIgnoreCase);
+    }
+
     private static void AssertActionResult(IActionResult? currentActionResult, int expectedStatusCode)
     {
         var statusCodeResult = currentActionResult as IStatusCodeActionResult;