Only return borehole count

swisstopo · Aug 7, 2024 · 1f9124d · 1f9124d
1 parent 8179d8a
commit 1f9124d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/src/api/Controllers/WorkgroupController.cs b/src/api/Controllers/WorkgroupController.cs
@@ -36,14 +36,6 @@ public async Task<IEnumerable<Workgroup>> GetAll()
             .ToListAsync()
             .ConfigureAwait(false);
 
-        foreach (var workgroup in workgroups)
-        {
-            if (workgroup.Boreholes != null)
-            {
-                workgroup.Boreholes = workgroup.Boreholes.Select(b => new Borehole() { Id = b.Id }).ToList();
-            }
-        }
-
         return workgroups;
     }
 

diff --git a/src/api/Models/Workgroup.cs b/src/api/Models/Workgroup.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
 
 namespace BDMS.Models;
 
@@ -52,6 +53,7 @@ public class Workgroup : IIdentifyable
     /// <summary>
     /// Gets the boreholes for the workgroup.
     /// </summary>
+    [JsonIgnore]
     public ICollection<Borehole>? Boreholes { get; set; }
 
     /// <summary>

diff --git a/src/client/src/api/apiInterfaces.ts b/src/client/src/api/apiInterfaces.ts
@@ -14,7 +14,7 @@ export interface Workgroup {
   createdAt?: Date | string;
   settings?: string;
   isSupplier?: boolean;
-  boreholesCount: number;
+  boreholeCount: number;
 }
 
 export interface WorkgroupRole {

diff --git a/src/client/src/pages/settings/admin/adminSettings.jsx b/src/client/src/pages/settings/admin/adminSettings.jsx
@@ -779,7 +779,7 @@ class AdminSettings extends React.Component {
                           />
                         </p>
                       </Modal.Description>
-                    ) : this.state.deleteWorkgroup.boreholesCount === 0 ? (
+                    ) : this.state.deleteWorkgroup.boreholeCount === 0 ? (
                       <Modal.Description>
                         <p>
                           <TranslationText id="msgDeleteWorkgroup" />
@@ -906,7 +906,7 @@ class AdminSettings extends React.Component {
                       )}
                       {this.state.deleteWorkgroup !== null &&
                       this.state.deleteWorkgroup.disabled === null &&
-                      this.state.deleteWorkgroup.boreholesCount === 0 ? (
+                      this.state.deleteWorkgroup.boreholeCount === 0 ? (
                         <Button
                           color="red"
                           onClick={() => {
@@ -999,7 +999,7 @@ class AdminSettings extends React.Component {
                               {workgroup.name}{" "}
                               {workgroup.supplier === true ? <span style={{ color: "red" }}>(supplier)</span> : ""}
                             </Table.Cell>
-                            <Table.Cell>{workgroup.boreholesCount}</Table.Cell>
+                            <Table.Cell>{workgroup.boreholeCount}</Table.Cell>
                             <Table.Cell
                               style={{
                                 paddingTop: "20px",

diff --git a/tests/Controllers/WorkgroupControllerTest.cs b/tests/Controllers/WorkgroupControllerTest.cs
@@ -59,7 +59,7 @@ public async Task EditWorkgroup()
         var workgroupToEdit = await context.WorkgroupsWithIncludes.AsNoTracking().SingleOrDefaultAsync(u => u.Id == createdWorkgroup.Id);
         Assert.AreEqual("New Workgroup", workgroupToEdit.Name);
         Assert.IsFalse(workgroupToEdit.IsDisabled);
-        Assert.AreEqual(1, workgroupToEdit.Boreholes.Count);
+        Assert.AreEqual(1, workgroupToEdit.BoreholeCount);
 
         workgroupToEdit.Name = "Updated Workgroup";
         workgroupToEdit.DisabledAt = DateTime.UtcNow;
@@ -74,7 +74,7 @@ public async Task EditWorkgroup()
         Assert.AreEqual("Updated Workgroup", updatedWorkgroup.Name);
         Assert.IsTrue(updatedWorkgroup.IsDisabled);
         Assert.IsFalse(updatedWorkgroup.IsSupplier);
-        Assert.AreEqual(1, updatedWorkgroup.Boreholes.Count);
+        Assert.AreEqual(1, updatedWorkgroup.BoreholeCount);
     }
 
     [TestMethod]