Revert "Semantic domain model/type update (#1718)" (#1732)

This reverts commit 991a877.
That commit was not compatible with the data in the database.

Backend.Tests/Controllers/ProjectControllerTests.cs

@@ -4,6 +4,7 @@
 using BackendFramework.Controllers;
 using BackendFramework.Interfaces;
 using BackendFramework.Models;
+using BackendFramework.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using NUnit.Framework;
@@ -16,6 +17,7 @@ public class ProjectControllerTests
         private IUserRepository _userRepo = null!;
         private UserRoleRepositoryMock _userRoleRepo = null!;
         private IPermissionService _permissionService = null!;
+        private ISemanticDomainService _semDomService = null!;
         private ProjectController _projController = null!;
 
         private User _jwtAuthenticatedUser = null!;
@@ -27,7 +29,9 @@ public void Setup()
             _userRepo = new UserRepositoryMock();
             _userRoleRepo = new UserRoleRepositoryMock();
             _permissionService = new PermissionServiceMock(_userRepo);
-            _projController = new ProjectController(_projRepo, _userRoleRepo, _userRepo, _permissionService)
+            _semDomService = new SemanticDomainService();
+            _projController = new ProjectController(_projRepo, _semDomService, _userRoleRepo,
+                _userRepo, _permissionService)
             {
                 // Mock the Http Context because this isn't an actual call avatar controller
                 ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext() }
@@ -111,6 +115,17 @@ public void TestDeleteAllProjects()
             Assert.That(_projRepo.GetAllProjects().Result, Has.Count.EqualTo(0));
         }
 
+        [Test]
+        public void TestParseSemanticDomains()
+        {
+            var project = _projRepo.Create(Util.RandomProject()).Result;
+            var sdList = (List<SemanticDomainWithSubdomains>)(
+                (ObjectResult)_projController.GetSemDoms(project!.Id).Result).Value!;
+            Assert.That(sdList, Has.Count.EqualTo(3));
+            Assert.That(sdList[0].Subdomains, Has.Count.EqualTo(3));
+            Assert.That(sdList[0].Subdomains[0].Subdomains, Has.Count.EqualTo(3));
+        }
+
         [Test]
         public void TestProjectDuplicateCheck()
         {

Backend.Tests/Models/ProjectTests.cs

@@ -88,7 +88,7 @@ public void TestClone()
         {
             var system = new WritingSystem { Name = "WritingSystemName", Bcp47 = "en", Font = "calibri" };
             var project = new Project { Name = "ProjectName", VernacularWritingSystem = system };
-            var domain = new SemanticDomain { Name = "SemanticDomainName", Id = "1" };
+            var domain = new SemanticDomain { Name = "SemanticDomainName", Id = "1", Description = "text" };
             project.SemanticDomains.Add(domain);
 
             var customField = new CustomField { Name = "CustomFieldName", Type = "type" };

Backend.Tests/Models/WordTests.cs

@@ -433,4 +433,23 @@ public void TestHashCode()
             );
         }
     }
+
+    public class SemanticDomainTests
+    {
+        private const string Name = "Home";
+
+        [Test]
+        public void TestEquals()
+        {
+            var domain = new SemanticDomain { Name = Name };
+            Assert.That(domain.Equals(new SemanticDomain { Name = Name }));
+        }
+
+        [Test]
+        public void TestEqualsNull()
+        {
+            var domain = new SemanticDomain { Name = Name };
+            Assert.IsFalse(domain.Equals(null));
+        }
+    }
 }

Backend.Tests/Util.cs

@@ -99,6 +99,7 @@ public static SemanticDomain RandomSemanticDomain(string? id = null)
             {
                 Name = RandString(),
                 Id = id ?? RandString(),
+                Description = RandString()
             };
         }
 

Backend/Controllers/ProjectController.cs

@@ -19,14 +19,16 @@ public class ProjectController : Controller
         private readonly IUserRepository _userRepo;
         private readonly IUserRoleRepository _userRoleRepo;
         private readonly IPermissionService _permissionService;
+        private readonly ISemanticDomainService _semDomService;
 
-        public ProjectController(IProjectRepository projRepo, IUserRoleRepository userRoleRepo,
-            IUserRepository userRepo, IPermissionService permissionService)
+        public ProjectController(IProjectRepository projRepo, ISemanticDomainService semDomService,
+            IUserRoleRepository userRoleRepo, IUserRepository userRepo, IPermissionService permissionService)
         {
             _projRepo = projRepo;
             _userRepo = userRepo;
             _userRoleRepo = userRoleRepo;
             _permissionService = permissionService;
+            _semDomService = semDomService;
         }
 
         /// <summary> Returns all <see cref="Project"/>s </summary>
@@ -206,6 +208,28 @@ public async Task<IActionResult> DeleteProject(string projectId)
             return NotFound();
         }
 
+        /// <summary>
+        /// UNUSED: Returns tree of <see cref="SemanticDomainWithSubdomains"/> for specified <see cref="Project"/>
+        /// </summary>
+        [AllowAnonymous]
+        [HttpGet("{projectId}/semanticdomains", Name = "GetSemDoms")]
+        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(List<SemanticDomainWithSubdomains>))]
+        public async Task<IActionResult> GetSemDoms(string projectId)
+        {
+            if (!await _permissionService.HasProjectPermission(HttpContext, Permission.WordEntry))
+            {
+                return Forbid();
+            }
+
+            var proj = await _projRepo.GetProject(projectId);
+            if (proj is null)
+            {
+                return NotFound(projectId);
+            }
+            var result = _semDomService.ParseSemanticDomains(proj);
+            return Ok(result);
+        }
+
         [HttpGet("duplicate/{projectName}", Name = "ProjectDuplicateCheck")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(bool))]
         public async Task<IActionResult> ProjectDuplicateCheck(string projectName)