Species Matching included VersionID handling #980

Author: FlatErikk

Components/DLM/BExIS.Dlm.Entities/SpeciesMatching/SpeciesMatchingResult.cs

@@ -8,16 +8,13 @@ namespace BExIS.Dlm.Entities.SpeciesMatching
     public class SpeciesMatchingResult : BaseEntity
     {
 
-        // original unchanged name submitted for matching
+        // original unchanged name (used for matching if EditedName is empty, and for display purposes)
         public virtual string OriginalName { get; set; }
 
-        // cleaned name after preprocessing (e.g. trimming, removing special characters, etc.)
-        public virtual string CleanedName { get; set; }
-
-        // edited name after manual corrections (if any)
+        // edited name after data cleaning + manual corrections (used for matching)
         public virtual string EditedName { get; set; }
 
-        // matched name from the external source
+        // matched name from the external source (the result)
         public virtual string MatchedName { get; set; }
 
         // taxonomic status of the matched name (e.g. accepted, synonym, etc.)
@@ -41,11 +38,7 @@ public class SpeciesMatchingResult : BaseEntity
         // reference to the dataset where the original name was taken from
         public virtual Dataset Dataset { get; set; }
 
-        // reference to the specific version of the dataset
-        // TODO: get this to work (maybe as a normal field instead of many-to-one relation)
-        //public virtual DatasetVersion DatasetVersion { get; set; }
-
-        // reference to the user who owns this matching result
-        public virtual User Creator { get; set; }
+        // VersionId + Dataset make the unique key for the matching result
+        public virtual long DatasetVersionId { get; set; }
     }
 }

Components/DLM/BExIS.Dlm.Orm.NH/Mappings/Default/SpeciesMatching/SpeciesMatchingResult.hbm.xml

@@ -8,8 +8,6 @@
 
 		<property name="OriginalName" column="original_name" type="string" not-null="false" />
 
-		<property name="CleanedName" column="cleaned_name" type="string" not-null="false" />
-
 		<property name="EditedName" column="edited_name" type="string" not-null="false" />
 
 		<property name="MatchedName" column="matched_name" type="string" not-null="false" />
@@ -28,12 +26,11 @@
 
 		<!-- Mapping entity associations -->
 
+		<property name="DatasetVersionId" column="dataset_version_id" type="Int64" not-null="false" />
+		
 		<!--Dataset-->
 		<many-to-one name="Dataset" class="BExIS.Dlm.Entities.Data.Dataset" not-null="false" column="DatasetRef" />
 
-		<!--Creator-->
-		<many-to-one name="Creator" class="BExIS.Security.Entities.Subjects.User" not-null="false" column="UserRef" />
-
 		<!--DatasetVersion (does not work this way ... Error: refers to unmapped ...-->
 		<!--
 		<many-to-one class="DatasetVersion" name="DatasetVersion" column="DatasetVersionRef">

Components/DLM/BExIS.Dlm.Services/SpeciesMatching/SpeciesMatchingResultManager.cs

@@ -51,7 +51,6 @@ protected virtual void Dispose(bool disposing)
         public SpeciesMatchingResult Create(SpeciesMatchingResult matchingResult)
         {
             if (matchingResult == null) throw new ArgumentNullException("Species matching result must not be null.");
-            if (matchingResult.Creator == null) throw new ArgumentNullException("Creator type must not be null.");
             if (matchingResult.Dataset == null) throw new ArgumentNullException("Dataset must not be null.");
             if (matchingResult.OriginalName == null) throw new ArgumentNullException("Dataset must not be null.");
 

Components/DLM/BExIS.Dlm.Tests/Services/SpeciesMatching/SpeciesMatchingResultManagerTest.cs

@@ -45,7 +45,6 @@ public void Create_Valid_EntityTemplate()
                 var dataset = datasetManager.DatasetRepo.Get().FirstOrDefault();
 
                 matchingResult.OriginalName = "Sunflower";
-                matchingResult.CleanedName = "";
                 matchingResult.EditedName = "";
                 matchingResult.MatchedName = "";
                 matchingResult.Status = "";
@@ -55,7 +54,7 @@ public void Create_Valid_EntityTemplate()
                 matchingResult.MatchSourceVersion = "";
                 matchingResult.ConfirmedByUser = false;
                 matchingResult.Dataset = dataset;
-                matchingResult.Creator = user;
+                matchingResult.DatasetVersionId = 1;
 
                 //Act
                 var created = speciesMatchingResultManager.Create(matchingResult);

Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/src/routes/species/+page.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { ErrorMessage, Page, pageContentLayoutType, positionType, Spinner } from "@bexis2/bexis2-core-ui";
-	import { load } from "./services";
 	import type { SpeciesModel } from "./types";
 	import { Table } from '@bexis2/bexis2-core-ui';
 	import type { TableConfig } from '@bexis2/bexis2-core-ui';

Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/src/routes/species/services.ts

@@ -1,16 +1,3 @@
 // Implementations for all the calls for the pokemon endpoints.
 //import Api from "./Api";
 import { Api } from '@bexis2/bexis2-core-ui';
-
-/****************/
-/* Create*/
-/****************/
-export const load = async () => {
-    try {
-        const response = await Api.get('/smm/species/load');
-        return response.data;
-    } catch (error) {
-        console.error(error);
-    }
-};
-

Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/BExIS.Modules.SMM.UI.csproj

@@ -121,6 +121,7 @@
   <ItemGroup>
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\SpeciesController.cs" />
+    <Compile Include="Helpers\ConversionHelper.cs" />
     <Compile Include="Helpers\MatchingResultHelper.cs" />
     <Compile Include="Helpers\ProgressHelper.cs" />
     <Compile Include="Helpers\SMMSeedDataGenerator.cs" />
@@ -249,6 +250,10 @@
       <Project>{252F7872-A69C-43A6-84B4-4D2ABDBDD9AB}</Project>
       <Name>BExIS.Xml.Helpers</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Modules\DIM\BExIS.Dim.Entities\BExIS.Dim.Entities.csproj">
+      <Project>{34CAD2A2-6928-458B-B8DC-AF71D55F20CC}</Project>
+      <Name>BExIS.Dim.Entities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\DIM\BExIS.Modules.Dim.UI\BExIS.Modules.Dim.UI.csproj">
       <Project>{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}</Project>
       <Name>BExIS.Modules.Dim.UI</Name>