diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 2eb4be4..505fb4f 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -1,9 +1,6 @@ -using DbContextLib; -using Dto; +using Dto; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Model.Business; using Services; namespace API.Controllers diff --git a/API_SQLuedo/API_SQLuedo.sln b/API_SQLuedo/API_SQLuedo.sln index a02afdd..85e6314 100644 --- a/API_SQLuedo/API_SQLuedo.sln +++ b/API_SQLuedo/API_SQLuedo.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "API\API.csproj", "{6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entities", "EntityFramework\Entities.csproj", "{6D079CDA-C000-4833-98A0-D07D153EA264}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{ADCC427D-A3CD-431C-A90B-F9369C4584E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelToEntities", "ModelToEntities\ModelToEntities.csproj", "{ADCC427D-A3CD-431C-A90B-F9369C4584E8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAPI", "TestAPI\TestAPI.csproj", "{17025B90-8B2A-49E9-97D3-1A84A208DF50}" EndProject @@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StubbedContextLib", "Stubbe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dto", "Dto\Dto.csproj", "{9682CA6B-2380-463B-B6BC-17C3B9E992C8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{EDDA59D4-BD38-46BF-8292-26A47187B76F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -69,6 +71,10 @@ Global {9682CA6B-2380-463B-B6BC-17C3B9E992C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {9682CA6B-2380-463B-B6BC-17C3B9E992C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {9682CA6B-2380-463B-B6BC-17C3B9E992C8}.Release|Any CPU.Build.0 = Release|Any CPU + {EDDA59D4-BD38-46BF-8292-26A47187B76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EDDA59D4-BD38-46BF-8292-26A47187B76F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EDDA59D4-BD38-46BF-8292-26A47187B76F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EDDA59D4-BD38-46BF-8292-26A47187B76F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/API_SQLuedo/DbContextLib/UserDbContext.cs b/API_SQLuedo/DbContextLib/UserDbContext.cs index 9e0b150..a3956bb 100644 --- a/API_SQLuedo/DbContextLib/UserDbContext.cs +++ b/API_SQLuedo/DbContextLib/UserDbContext.cs @@ -1,4 +1,4 @@ -using Entities.SQLuedoDB; +using Entities; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Identity; diff --git a/API_SQLuedo/EntityFramework/BlackListEntity.cs b/API_SQLuedo/EntityFramework/BlackListEntity.cs index a1cb718..bcc8c6d 100644 --- a/API_SQLuedo/EntityFramework/BlackListEntity.cs +++ b/API_SQLuedo/EntityFramework/BlackListEntity.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Entities.SQLuedoDB +namespace Entities { public class BlackListEntity { diff --git a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs index 2778c16..414fef6 100644 --- a/API_SQLuedo/EntityFramework/ContentLessonEntity.cs +++ b/API_SQLuedo/EntityFramework/ContentLessonEntity.cs @@ -1,13 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Entities.SQLuedoDB; +using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { public class ContentLessonEntity { diff --git a/API_SQLuedo/EntityFramework/InquiryEntity.cs b/API_SQLuedo/EntityFramework/InquiryEntity.cs index 4d73630..e311db5 100644 --- a/API_SQLuedo/EntityFramework/InquiryEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryEntity.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Entities.SQLuedoDB +namespace Entities { public class InquiryEntity { diff --git a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs index 155398b..bc3f0e0 100644 --- a/API_SQLuedo/EntityFramework/InquiryTableEntity.cs +++ b/API_SQLuedo/EntityFramework/InquiryTableEntity.cs @@ -1,7 +1,7 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { public class InquiryTableEntity { diff --git a/API_SQLuedo/EntityFramework/LessonEntity.cs b/API_SQLuedo/EntityFramework/LessonEntity.cs index 623eb1b..af3986b 100644 --- a/API_SQLuedo/EntityFramework/LessonEntity.cs +++ b/API_SQLuedo/EntityFramework/LessonEntity.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Entities.SQLuedoDB +namespace Entities { public class LessonEntity { diff --git a/API_SQLuedo/EntityFramework/NotepadEntity.cs b/API_SQLuedo/EntityFramework/NotepadEntity.cs index f20c498..69226d2 100644 --- a/API_SQLuedo/EntityFramework/NotepadEntity.cs +++ b/API_SQLuedo/EntityFramework/NotepadEntity.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { public class NotepadEntity { diff --git a/API_SQLuedo/EntityFramework/ParagraphEntity.cs b/API_SQLuedo/EntityFramework/ParagraphEntity.cs index d83e27c..65bd2cb 100644 --- a/API_SQLuedo/EntityFramework/ParagraphEntity.cs +++ b/API_SQLuedo/EntityFramework/ParagraphEntity.cs @@ -1,4 +1,4 @@ -namespace Entities.SQLuedoDB +namespace Entities { public class ParagraphEntity { diff --git a/API_SQLuedo/EntityFramework/SolutionEntity.cs b/API_SQLuedo/EntityFramework/SolutionEntity.cs index 15879f7..fa15060 100644 --- a/API_SQLuedo/EntityFramework/SolutionEntity.cs +++ b/API_SQLuedo/EntityFramework/SolutionEntity.cs @@ -1,8 +1,7 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; -using System.Security.Cryptography.X509Certificates; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { public class SolutionEntity { diff --git a/API_SQLuedo/EntityFramework/SuccessEntity.cs b/API_SQLuedo/EntityFramework/SuccessEntity.cs index 4c06815..81f9e11 100644 --- a/API_SQLuedo/EntityFramework/SuccessEntity.cs +++ b/API_SQLuedo/EntityFramework/SuccessEntity.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { public class SuccessEntity { diff --git a/API_SQLuedo/EntityFramework/UserEntity.cs b/API_SQLuedo/EntityFramework/UserEntity.cs index 2de5210..52ed8f8 100644 --- a/API_SQLuedo/EntityFramework/UserEntity.cs +++ b/API_SQLuedo/EntityFramework/UserEntity.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Entities.SQLuedoDB +namespace Entities { [Table("user")] public class UserEntity diff --git a/API_SQLuedo/Model/Business/BlackList.cs b/API_SQLuedo/Model/BlackList.cs similarity index 67% rename from API_SQLuedo/Model/Business/BlackList.cs rename to API_SQLuedo/Model/BlackList.cs index b7fb84b..a53f1e9 100644 --- a/API_SQLuedo/Model/Business/BlackList.cs +++ b/API_SQLuedo/Model/BlackList.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class BlackList { diff --git a/API_SQLuedo/Model/Business/ContentLesson.cs b/API_SQLuedo/Model/ContentLesson.cs similarity index 56% rename from API_SQLuedo/Model/Business/ContentLesson.cs rename to API_SQLuedo/Model/ContentLesson.cs index 22494db..9ad8e3c 100644 --- a/API_SQLuedo/Model/Business/ContentLesson.cs +++ b/API_SQLuedo/Model/ContentLesson.cs @@ -1,12 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class ContentLesson { diff --git a/API_SQLuedo/Model/Business/Inquiry.cs b/API_SQLuedo/Model/Inquiry.cs similarity index 76% rename from API_SQLuedo/Model/Business/Inquiry.cs rename to API_SQLuedo/Model/Inquiry.cs index 316e8eb..05a23c2 100644 --- a/API_SQLuedo/Model/Business/Inquiry.cs +++ b/API_SQLuedo/Model/Inquiry.cs @@ -1,12 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Inquiry { diff --git a/API_SQLuedo/Model/Business/InquiryTable.cs b/API_SQLuedo/Model/InquiryTable.cs similarity index 72% rename from API_SQLuedo/Model/Business/InquiryTable.cs rename to API_SQLuedo/Model/InquiryTable.cs index d8ac992..e75b4fe 100644 --- a/API_SQLuedo/Model/Business/InquiryTable.cs +++ b/API_SQLuedo/Model/InquiryTable.cs @@ -1,11 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class InquiryTable { diff --git a/API_SQLuedo/Model/Business/Lesson.cs b/API_SQLuedo/Model/Lesson.cs similarity index 83% rename from API_SQLuedo/Model/Business/Lesson.cs rename to API_SQLuedo/Model/Lesson.cs index 2e2121d..40f16aa 100644 --- a/API_SQLuedo/Model/Business/Lesson.cs +++ b/API_SQLuedo/Model/Lesson.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Lesson { diff --git a/API_SQLuedo/Model/Model.csproj b/API_SQLuedo/Model/Model.csproj index 73abdcf..3a63532 100644 --- a/API_SQLuedo/Model/Model.csproj +++ b/API_SQLuedo/Model/Model.csproj @@ -1,27 +1,9 @@  - - net8.0 - enable - enable - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + net8.0 + enable + enable + diff --git a/API_SQLuedo/Model/Business/Notepad.cs b/API_SQLuedo/Model/Notepad.cs similarity index 73% rename from API_SQLuedo/Model/Business/Notepad.cs rename to API_SQLuedo/Model/Notepad.cs index 177a1d3..7a36862 100644 --- a/API_SQLuedo/Model/Business/Notepad.cs +++ b/API_SQLuedo/Model/Notepad.cs @@ -1,12 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Notepad { diff --git a/API_SQLuedo/Model/Business/Paragraph.cs b/API_SQLuedo/Model/Paragraph.cs similarity index 86% rename from API_SQLuedo/Model/Business/Paragraph.cs rename to API_SQLuedo/Model/Paragraph.cs index 0edb9df..62585d8 100644 --- a/API_SQLuedo/Model/Business/Paragraph.cs +++ b/API_SQLuedo/Model/Paragraph.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Paragraph { diff --git a/API_SQLuedo/Model/Business/Solution.cs b/API_SQLuedo/Model/Solution.cs similarity index 87% rename from API_SQLuedo/Model/Business/Solution.cs rename to API_SQLuedo/Model/Solution.cs index 4835fa5..fb17dca 100644 --- a/API_SQLuedo/Model/Business/Solution.cs +++ b/API_SQLuedo/Model/Solution.cs @@ -1,11 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Solution { diff --git a/API_SQLuedo/Model/Business/Success.cs b/API_SQLuedo/Model/Success.cs similarity index 63% rename from API_SQLuedo/Model/Business/Success.cs rename to API_SQLuedo/Model/Success.cs index 6e8ff28..1fe54cf 100644 --- a/API_SQLuedo/Model/Business/Success.cs +++ b/API_SQLuedo/Model/Success.cs @@ -1,12 +1,4 @@ -using Entities.SQLuedoDB; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Model.Business +namespace ModelToEntities.Business { public class Success { diff --git a/API_SQLuedo/Model/Business/User.cs b/API_SQLuedo/Model/User.cs similarity index 93% rename from API_SQLuedo/Model/Business/User.cs rename to API_SQLuedo/Model/User.cs index cf60046..2ee4ce3 100644 --- a/API_SQLuedo/Model/Business/User.cs +++ b/API_SQLuedo/Model/User.cs @@ -1,4 +1,4 @@ -namespace Model.Business +namespace ModelToEntities.Business { public class User { diff --git a/API_SQLuedo/Model/Mappers/BlackListMapper.cs b/API_SQLuedo/ModelToEntities/BlackListMapper.cs similarity index 83% rename from API_SQLuedo/Model/Mappers/BlackListMapper.cs rename to API_SQLuedo/ModelToEntities/BlackListMapper.cs index 4ada8c5..0eb2392 100644 --- a/API_SQLuedo/Model/Mappers/BlackListMapper.cs +++ b/API_SQLuedo/ModelToEntities/BlackListMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class BlackListMapper { diff --git a/API_SQLuedo/Model/Mappers/ContentLessonMapper.cs b/API_SQLuedo/ModelToEntities/ContentLessonMapper.cs similarity index 83% rename from API_SQLuedo/Model/Mappers/ContentLessonMapper.cs rename to API_SQLuedo/ModelToEntities/ContentLessonMapper.cs index 4084b0b..1cff6d4 100644 --- a/API_SQLuedo/Model/Mappers/ContentLessonMapper.cs +++ b/API_SQLuedo/ModelToEntities/ContentLessonMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class ContentLessonMapper { diff --git a/API_SQLuedo/Model/Mappers/InquiryMapper.cs b/API_SQLuedo/ModelToEntities/InquiryMapper.cs similarity index 88% rename from API_SQLuedo/Model/Mappers/InquiryMapper.cs rename to API_SQLuedo/ModelToEntities/InquiryMapper.cs index e6d30d4..5fc0fe4 100644 --- a/API_SQLuedo/Model/Mappers/InquiryMapper.cs +++ b/API_SQLuedo/ModelToEntities/InquiryMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class InquiryMapper { diff --git a/API_SQLuedo/Model/Mappers/InquiryTableMapper.cs b/API_SQLuedo/ModelToEntities/InquiryTableMapper.cs similarity index 86% rename from API_SQLuedo/Model/Mappers/InquiryTableMapper.cs rename to API_SQLuedo/ModelToEntities/InquiryTableMapper.cs index b1c9d55..5f01925 100644 --- a/API_SQLuedo/Model/Mappers/InquiryTableMapper.cs +++ b/API_SQLuedo/ModelToEntities/InquiryTableMapper.cs @@ -1,13 +1,8 @@ -using Model.Business; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class InquiryTableMapper { diff --git a/API_SQLuedo/Model/Mappers/LessonMapper.cs b/API_SQLuedo/ModelToEntities/LessonMapper.cs similarity index 84% rename from API_SQLuedo/Model/Mappers/LessonMapper.cs rename to API_SQLuedo/ModelToEntities/LessonMapper.cs index f33dd25..9b22858 100644 --- a/API_SQLuedo/Model/Mappers/LessonMapper.cs +++ b/API_SQLuedo/ModelToEntities/LessonMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class LessonMapper { diff --git a/API_SQLuedo/ModelToEntities/ModelToEntities.csproj b/API_SQLuedo/ModelToEntities/ModelToEntities.csproj new file mode 100644 index 0000000..1d0c3c9 --- /dev/null +++ b/API_SQLuedo/ModelToEntities/ModelToEntities.csproj @@ -0,0 +1,29 @@ + + + + net8.0 + enable + enable + ModelToEntities + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + diff --git a/API_SQLuedo/Model/Mappers/NotepadMapper.cs b/API_SQLuedo/ModelToEntities/NotepadMapper.cs similarity index 85% rename from API_SQLuedo/Model/Mappers/NotepadMapper.cs rename to API_SQLuedo/ModelToEntities/NotepadMapper.cs index 2984220..ecb7013 100644 --- a/API_SQLuedo/Model/Mappers/NotepadMapper.cs +++ b/API_SQLuedo/ModelToEntities/NotepadMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class NotepadMapper { diff --git a/API_SQLuedo/Model/Mappers/ParagraphMapper.cs b/API_SQLuedo/ModelToEntities/ParagraphMapper.cs similarity index 86% rename from API_SQLuedo/Model/Mappers/ParagraphMapper.cs rename to API_SQLuedo/ModelToEntities/ParagraphMapper.cs index 0ce3d02..72ddb9c 100644 --- a/API_SQLuedo/Model/Mappers/ParagraphMapper.cs +++ b/API_SQLuedo/ModelToEntities/ParagraphMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class ParagraphMapper { diff --git a/API_SQLuedo/Model/Mappers/SolutionMapper.cs b/API_SQLuedo/ModelToEntities/SolutionMapper.cs similarity index 88% rename from API_SQLuedo/Model/Mappers/SolutionMapper.cs rename to API_SQLuedo/ModelToEntities/SolutionMapper.cs index 6afd56b..cad2024 100644 --- a/API_SQLuedo/Model/Mappers/SolutionMapper.cs +++ b/API_SQLuedo/ModelToEntities/SolutionMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class SolutionMapper { diff --git a/API_SQLuedo/Model/Mappers/SuccessMapper.cs b/API_SQLuedo/ModelToEntities/SuccessMapper.cs similarity index 85% rename from API_SQLuedo/Model/Mappers/SuccessMapper.cs rename to API_SQLuedo/ModelToEntities/SuccessMapper.cs index 9db8e9f..935689a 100644 --- a/API_SQLuedo/Model/Mappers/SuccessMapper.cs +++ b/API_SQLuedo/ModelToEntities/SuccessMapper.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Dto; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class SuccessMapper { diff --git a/API_SQLuedo/Model/Mappers/UserMapper.cs b/API_SQLuedo/ModelToEntities/UserMapper.cs similarity index 94% rename from API_SQLuedo/Model/Mappers/UserMapper.cs rename to API_SQLuedo/ModelToEntities/UserMapper.cs index ab2dda5..940a187 100644 --- a/API_SQLuedo/Model/Mappers/UserMapper.cs +++ b/API_SQLuedo/ModelToEntities/UserMapper.cs @@ -1,8 +1,8 @@ using Dto; -using Entities.SQLuedoDB; -using Model.Business; +using Entities; +using ModelToEntities.Business; -namespace Model.Mappers +namespace ModelToEntities { public static class UserMapper { diff --git a/API_SQLuedo/Services/IDataService.cs b/API_SQLuedo/Services/IDataService.cs index 1f81b09..653a3bc 100644 --- a/API_SQLuedo/Services/IDataService.cs +++ b/API_SQLuedo/Services/IDataService.cs @@ -1,5 +1,5 @@ using Dto; -using Model.Business; +using ModelToEntities.Business; namespace Services { diff --git a/API_SQLuedo/Services/Services.csproj b/API_SQLuedo/Services/Services.csproj index 4eafac0..88af2f2 100644 --- a/API_SQLuedo/Services/Services.csproj +++ b/API_SQLuedo/Services/Services.csproj @@ -22,7 +22,7 @@ - + diff --git a/API_SQLuedo/Services/UserDataService.cs b/API_SQLuedo/Services/UserDataService.cs index 1a8fdff..f0b2a3a 100644 --- a/API_SQLuedo/Services/UserDataService.cs +++ b/API_SQLuedo/Services/UserDataService.cs @@ -1,13 +1,7 @@ using DbContextLib; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Dto; -using Model.Mappers; -using Model.Business; using Microsoft.EntityFrameworkCore; +using ModelToEntities; namespace Services { diff --git a/API_SQLuedo/StubbedContextLib/StubbedContext.cs b/API_SQLuedo/StubbedContextLib/StubbedContext.cs index 52a845f..a833821 100644 --- a/API_SQLuedo/StubbedContextLib/StubbedContext.cs +++ b/API_SQLuedo/StubbedContextLib/StubbedContext.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; using DbContextLib; -using Entities.SQLuedoDB; +using Entities; using Microsoft.AspNetCore.Cryptography.KeyDerivation; using Microsoft.EntityFrameworkCore; diff --git a/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj b/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj index c013237..cea8135 100644 --- a/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj +++ b/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj @@ -14,7 +14,7 @@ - +