using datamodel library

noi-techpark · Oct 10, 2024 · f34f70c · f34f70c
1 parent 7e9e187
commit f34f70c
Show file tree

Hide file tree

Showing 28 changed files with 27 additions and 1,641 deletions.
diff --git a/ContentApiCore/Controllers/api/ExampleApiController.cs b/ContentApiCore/Controllers/api/ExampleApiController.cs
@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ContentApiModels;
 
 namespace ContentApiCore.Controllers.api
 {

diff --git a/ContentApiCore/Controllers/other/JsonLDController.cs b/ContentApiCore/Controllers/other/JsonLDController.cs
@@ -17,6 +17,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using OdhNotifier;
+using ContentApiModels;
 
 namespace ContentApiCore.Controllers.api
 {

diff --git a/ContentApiCore/Formatters/JsonLdOutputFormatter.cs b/ContentApiCore/Formatters/JsonLdOutputFormatter.cs
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using ContentApiModels;
 using DataModel;
 using Helper.JsonHelpers;
 using Microsoft.AspNetCore.Http;

diff --git a/ContentApiCoreTests/IntegrationTests/ExampleApiControllerTests.cs b/ContentApiCoreTests/IntegrationTests/ExampleApiControllerTests.cs
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using ContentApiModels;
 using DataModel;
 using Helper;
 using Microsoft.AspNetCore.Mvc.Testing;

diff --git a/DataModel/DataModel.csproj → ContentApiModels/ContentApiModels.csproj b/DataModel/DataModel.csproj → ContentApiModels/ContentApiModels.csproj
@@ -8,10 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
+    <PackageReference Include="opendatahub-datamodel-tourism" Version="1.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.2.3" />
   </ItemGroup>
 

diff --git a/DataModel/entities/Example.cs → ContentApiModels/Example.cs b/DataModel/entities/Example.cs → ContentApiModels/Example.cs
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using DataModel;
 using DataModel.Annotations;
 using Swashbuckle.AspNetCore.Annotations;
 using System;
@@ -10,7 +11,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DataModel
+namespace ContentApiModels
+
 {
     public class Example : IIdentifiable, IImportDateassigneable, IMappingAware, IHasLanguage, ISource, IActivateable, IMetaData, IPublishedOn, IDetailInfosAware, IGPSInfoAware, IImageGalleryAware, IShortName, IContactInfosAware, ILicenseInfo, IGPSPointsAware
     {