Move models in separate projects

api/Clients/Api/Contracts/ICvMatcherApi.cs

@@ -1,5 +1,5 @@
 using Refit;
-using Api.Models.Requests;
+using Models.Requests;
 
 namespace Api.Clients.Api.Contracts;
 

api/Controllers/CaptchaController.cs

@@ -1,9 +1,9 @@
 using Api.Services.Contracts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Api.Models.Settings;
+using Models.Settings;
 using Swashbuckle.AspNetCore.Annotations;
-using Api.Models.Requests;
+using Models.Requests;
 
 namespace Api.Controllers
 {

api/Controllers/ContactController.cs

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.Extensions.Options;
-using Api.Models.Settings;
-using Api.Models.Requests;
+using Models.Settings;
+using Models.Requests;
 
 namespace Api.Controllers
 {

api/Controllers/CvMatcherController.cs

@@ -1,5 +1,5 @@
 using Api.Clients.Api.Contracts;
-using Api.Models.Requests;
+using Models.Requests;
 using Api.Services.Contracts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;

api/Controllers/FileDownloadController.cs

@@ -1,4 +1,4 @@
-using Api.Models.Settings;
+using Models.Settings;
 using Api.Services.Contracts;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;

api/Controllers/GoogleController.cs

@@ -1,4 +1,4 @@
-using Api.Models.Settings;
+using Models.Settings;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

api/Models/Requests/CaptchaVerifyRequest.cs

@@ -1,9 +0,0 @@
-namespace Api.Models.Requests
-{
-    public class CaptchaVerifyRequest
-    {
-        public string? Token { get; set; }
-        public string? ExpectedAction { get; set; }
-
-    }
-}

api/Models/Requests/ContactRequest.cs

@@ -1,23 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Api.Models.Requests
-{
-    public sealed class ContactRequest
-    {
-        [Required, StringLength(100)]
-        public string Name { get; set; } = "";
-
-        [Required, EmailAddress, StringLength(200)]
-        public string Email { get; set; } = "";
-
-        [Required, StringLength(200)]
-        public string Subject { get; set; } = "";
-
-        [Required, StringLength(5000)]
-        public string Message { get; set; } = "";
-
-        // Token returned by the captcha widget
-        [Required]
-        public string CaptchaToken { get; set; } = "";
-    }
-}

api/Models/Requests/JobMatchRequest.cs

@@ -1,10 +0,0 @@
-namespace Api.Models.Requests;
-
-public sealed class JobMatchRequest
-{
-    public string? CvDocumentId { get; set; }
-    public string? JobUrl { get; set; }
-    public string? JobDescription { get; set; }
-    public bool GdprConsent { get; set; }
-    public string? CaptchaToken { get; set; }
-}

api/Models/Requests/SubscribeRequest.cs

@@ -1,15 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Api.Models.Requests
-{
-    public sealed class SubscribeRequest
-    {
-
-        [Required, EmailAddress, StringLength(200)]
-        public string Email { get; set; } = "";
-
-        // Token returned by the captcha widget
-        [Required]
-        public string CaptchaToken { get; set; } = "";
-    }
-}

api/Models/Requests/UploadCvRequest.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Api.Models.Requests
-{
-    public sealed class UploadCvRequest
-    {
-        [Required]
-        public IFormFile Cv { get; set; } = default!;
-
-        public bool GdprConsent { get; set; }
-        public string? CaptchaToken { get; set; }
-    }
-}

api/Models/Settings/CaptchaSettings.cs

@@ -1,17 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class CaptchaSettings
-    {
-        // "Recaptcha" for now (easy to extend later)
-        public string Provider { get; set; } = "Recaptcha";
-
-        public string SecretKey { get; set; } = "";
-        public string PublicKey { get; set; } = "";
-        // Only relevant for reCAPTCHA v3 (score-based)
-        public double MinimumScore { get; set; } = 0.5;
-
-        // Optional but recommended for v3: enforce expected action and/or hostname
-        public string? ExpectedAction { get; set; }
-        public string? ExpectedHostname { get; set; }
-    }
-}

api/Models/Settings/ContactSettings.cs

@@ -1,8 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class ContactSettings
-    {
-        public string ToEmail { get; set; } = "";
-        public string SubjectPrefix { get; set; } = "[Contact]";
-    }
-}

api/Models/Settings/FileStorageSettings.cs

@@ -1,10 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class FileStorageSettings
-    {
-        public string Path { get; set; } = "Files";
-        public string DefaultFileName { get; set; } = "";
-        public string ToEmail { get; set; } = "";
-        public string SubjectPrefix { get; set; } = "[File Download]";
-    }
-}

api/Models/Settings/GoogleSettings.cs

@@ -1,8 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class GoogleSettings
-    {
-        public string TagManagerId { get; set; } = "";
-        public string MapKey { get; set; } = "";
-    }
-}

api/Models/Settings/KeyVaultSettings.cs

@@ -1,8 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class KeyVaultSettings
-    {
-        public string VaultUri { get; set; } = "";
-        public bool Enabled { get; set; } = false;
-    }
-}

api/Models/Settings/SmtpSettings.cs

@@ -1,11 +0,0 @@
-namespace Api.Models.Settings
-{
-    public class SmtpSettings
-    {
-        public string Host { get; set; } = "";
-        public int Port { get; set; } = 587;
-        public string Username { get; set; } = "";
-        public string Password { get; set; } = "";
-        public bool UseStartTls { get; set; } = true;
-    }
-}

api/Models/Settings/SubscribeSettings.cs

@@ -1,8 +0,0 @@
-namespace Api.Models.Settings
-{
-    public sealed class SubscribeSettings
-    {
-        public string ToEmail { get; set; } = "";
-        public string SubjectPrefix { get; set; } = "[Subscribe]";
-    }
-}

api/Program.cs

@@ -1,4 +1,4 @@
-using Api.Models.Settings;
+using Models.Settings;
 using Api.Services;
 using Api.Services.Contracts;
 using Azure.Identity;

api/Services/Contracts/IEmailSender.cs

@@ -1,4 +1,4 @@
-using Api.Models.Requests;
+using Models.Requests;
 
 namespace Api.Services.Contracts
 {

api/Services/RecaptchaVerifier.cs

@@ -1,7 +1,7 @@
 using Api.Services.Contracts.Models;
 using Api.Services.Contracts;
 using Microsoft.Extensions.Options;
-using Api.Models.Settings;
+using Models.Settings;
 
 namespace Api.Services
 {

api/Services/SmtpEmailSender.cs

@@ -3,8 +3,8 @@ using Microsoft.Extensions.Options;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using MimeKit;
-using Api.Models.Settings;
-using Api.Models.Requests;
+using Models.Settings;
+using Models.Requests;
 
 namespace Api.Services
 {

api/api.csproj

@@ -34,4 +34,8 @@
     <Folder Include="logs\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\api-models\api-models.csproj" />
+  </ItemGroup>
+
 </Project>