From 7258c456ff433240af849c768e1f8d7355a13e83 Mon Sep 17 00:00:00 2001
From: mborzyszkowski <maciej.borzyszkowski@gmail.com>
Date: Mon, 17 Aug 2020 20:23:37 +0200
Subject: [PATCH] Move validator

---
 .../Controllers/DocumentsController.cs            |  4 +---
 .../Queries/DocumentPublishRequest.cs             | 12 +++++++++++-
 .../Validators/DocumentPublishRequestValidator.cs | 15 ---------------
 .../InternshipSystem.Core.csproj                  |  4 ----
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 src/InternshipSystem.Api/Validators/DocumentPublishRequestValidator.cs

diff --git a/src/InternshipSystem.Api/Controllers/DocumentsController.cs b/src/InternshipSystem.Api/Controllers/DocumentsController.cs
index b601bc6..938bbe6 100644
--- a/src/InternshipSystem.Api/Controllers/DocumentsController.cs
+++ b/src/InternshipSystem.Api/Controllers/DocumentsController.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using InternshipSystem.Api.Queries;
-using InternshipSystem.Api.Validators;
 using InternshipSystem.Core;
 using InternshipSystem.Repository;
 using Microsoft.AspNetCore.Http;
@@ -41,7 +39,7 @@ namespace InternshipSystem.Api.Controllers
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         public async Task<ActionResult> AddDocumentToInternship([FromBody] DocumentPublishRequest documentRequest)
         {
-            var validator = new DocumentPublishRequestValidator();
+            var validator = new DocumentPublishRequest.Validator();
             var validationResult = await validator.ValidateAsync(documentRequest);
             
             if (!validationResult.IsValid)
diff --git a/src/InternshipSystem.Api/Queries/DocumentPublishRequest.cs b/src/InternshipSystem.Api/Queries/DocumentPublishRequest.cs
index c57bdfe..975b704 100644
--- a/src/InternshipSystem.Api/Queries/DocumentPublishRequest.cs
+++ b/src/InternshipSystem.Api/Queries/DocumentPublishRequest.cs
@@ -1,4 +1,5 @@
-using InternshipSystem.Core.ValueObject;
+using FluentValidation;
+using InternshipSystem.Core.ValueObject;
 
 namespace InternshipSystem.Api.Queries
 {
@@ -8,5 +9,14 @@ namespace InternshipSystem.Api.Queries
         public string Description { get; set; }
         public byte[] Scan { get; set; }
         public DocumentType Type { get; set; }
+        
+        public class Validator : AbstractValidator<DocumentPublishRequest>
+        {
+            public Validator()
+            {
+                RuleFor(document => document.Scan).NotEmpty();
+                RuleFor(document => document.Type).NotEmpty();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/InternshipSystem.Api/Validators/DocumentPublishRequestValidator.cs b/src/InternshipSystem.Api/Validators/DocumentPublishRequestValidator.cs
deleted file mode 100644
index 1d1b270..0000000
--- a/src/InternshipSystem.Api/Validators/DocumentPublishRequestValidator.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using FluentValidation;
-using InternshipSystem.Api.Queries;
-using InternshipSystem.Core;
-
-namespace InternshipSystem.Api.Validators
-{
-    public class DocumentPublishRequestValidator : AbstractValidator<DocumentPublishRequest>
-    {
-        public DocumentPublishRequestValidator()
-        {
-            RuleFor(document => document.Scan).NotEmpty();
-            RuleFor(document => document.Type).NotEmpty();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/InternshipSystem.Core.csproj b/src/InternshipSystem.Core/InternshipSystem.Core.csproj
index bd77dfa..6de04cb 100644
--- a/src/InternshipSystem.Core/InternshipSystem.Core.csproj
+++ b/src/InternshipSystem.Core/InternshipSystem.Core.csproj
@@ -5,8 +5,4 @@
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="AutoMapper" Version="10.0.0" />
-    </ItemGroup>
-
 </Project>