major change on project structuration

2 years ago · 3bcca963e6
parent 0001d567b0
commit 3bcca963e6
15 changed files with 62 additions and 41 deletions
--- a/MCTG/ConsoleApp/ConsoleApp.csproj
+++ b/MCTG/ConsoleApp/ConsoleApp.csproj
@ -7,10 +7,11 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\DataPersistence\DataPersistence.csproj" />
-    <ProjectReference Include="..\FakePersistance\FakePersistance.csproj" />
-    <ProjectReference Include="..\Model\Model.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\Model\Model.csproj" />
+    <ProjectReference Include="..\Persistance\DataPersistence\DataPersistence.csproj" />
+    <ProjectReference Include="..\Persistance\FakePersistance\FakePersistance.csproj" />
  </ItemGroup>

+
 </Project>
--- a/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
+++ b/MCTG/ConsoleApp/Menu/AddRecipeMenu.cs
@ -40,6 +40,7 @@ namespace ConsoleApp.Menu
            Recipe recipe = new Recipe(
                title: title,
                type: RecipeType.Unspecified,
+                priority: Priority.Fast,
                id: null,
                authorMail: masterMgr.CurrentConnectedUser?.Mail,
                picture: null)
--- a/MCTG/Managers/Managers.csproj
+++ b/MCTG/Managers/Managers.csproj
@ -6,4 +6,9 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\Exception\AppException.csproj" />
+    <ProjectReference Include="..\Model\Model.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/MCTG/Managers/RecipeDefaultManager.cs
+++ b/MCTG/Managers/RecipeDefaultManager.cs
@ -66,7 +66,7 @@ namespace Managers
        public RecipeCollection GetRecipesByPriorityOrder(Priority priority)
        {
            IEnumerable<Recipe> recipes = from Recipe recipe in _dataManager.GetFromData<Recipe>()
-                                          where recipe.Title.Contains(title)
+                                          where recipe.Priority == priority
                                          select recipe;
            return new RecipeCollection(
                $"Suggestions", recipes.ToArray());
--- a/MCTG/Model/Model.csproj
+++ b/MCTG/Model/Model.csproj
@ -11,4 +11,5 @@
    <ProjectReference Include="..\Exception\AppException.csproj" />
  </ItemGroup>

+
 </Project>
--- a/MCTG/Persistance/DataPersistence/DataContractJSON.cs
+++ b/MCTG/Persistance/DataPersistence/DataContractJSON.cs
--- a/MCTG/Persistance/DataPersistence/DataContractXML.cs
+++ b/MCTG/Persistance/DataPersistence/DataContractXML.cs
--- a/MCTG/Persistance/DataPersistence/DataPersistence.csproj
+++ b/MCTG/Persistance/DataPersistence/DataPersistence.csproj
@ -6,8 +6,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\Model\Model.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\Model\Model.csproj" />
  </ItemGroup>

 </Project>
--- a/MCTG/Persistance/FakePersistance/FakePersistance.csproj
+++ b/MCTG/Persistance/FakePersistance/FakePersistance.csproj
@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Model\Model.csproj" />
+    <ProjectReference Include="..\..\Model\Model.csproj" />
  </ItemGroup>

 </Project>
--- a/MCTG/Persistance/FakePersistance/Stubs.cs
+++ b/MCTG/Persistance/FakePersistance/Stubs.cs
--- a/MCTG/SAE-2.01.sln
+++ b/MCTG/SAE-2.01.sln
@ -12,13 +12,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model_UnitTests", "Tests\Mo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{08B80CE8-A01D-4D86-8989-AF225D5DA48C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataPersistence", "DataPersistence\DataPersistence.csproj", "{432F9D12-B1F7-4A79-8720-4971BB10B831}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataPersistence", ""Persistance\DataPersistence\DataPersistence.csproj", "{432F9D12-B1F7-4A79-8720-4971BB10B831}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Managers", "Managers\Managers.csproj", "{A3703A19-687C-4F63-A5DE-18E6D8995C77}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managers", "Managers\Managers.csproj", "{A3703A19-687C-4F63-A5DE-18E6D8995C77}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppException", "Exception\AppException.csproj", "{77E6BD97-B1E5-45F5-ABFB-9A1D985A8EDE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppException", "Exception\AppException.csproj", "{77E6BD97-B1E5-45F5-ABFB-9A1D985A8EDE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakePersistance", "FakePersistance\FakePersistance.csproj", "{7C340CB2-8925-4BC4-9D8C-9058D9657F3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakePersistance", "Persistance\FakePersistance\FakePersistance.csproj", "{7C340CB2-8925-4BC4-9D8C-9058D9657F3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Persistance", "Persistance", "{F6413DA3-CE67-4097-8FF7-8D221AF2A5E8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -66,6 +68,8 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{45AB746A-194B-4E43-81EB-83B06F35AA33} = {08B80CE8-A01D-4D86-8989-AF225D5DA48C}
+		{432F9D12-B1F7-4A79-8720-4971BB10B831} = {F6413DA3-CE67-4097-8FF7-8D221AF2A5E8}
+		{7C340CB2-8925-4BC4-9D8C-9058D9657F3F} = {F6413DA3-CE67-4097-8FF7-8D221AF2A5E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ADEA5603-1EF6-4D43-9493-7D6D9DE7FA3F}
--- a/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
+++ b/MCTG/Tests/Model_UnitTests/Model_UnitTests.csproj
@ -1,27 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <Configurations>Debug;Release;CI</Configurations>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Model\Model.csproj" />
-    <ProjectReference Include="..\..\DataPersistence\DataPersistence.csproj" />
-  </ItemGroup>
-</Project>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <Configurations>Debug;Release;CI</Configurations>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Managers\Managers.csproj" />
+    <ProjectReference Include="..\..\Persistance\DataPersistence\DataPersistence.csproj" />
+    <ProjectReference Include="..\..\Persistance\FakePersistance\FakePersistance.csproj" />
+  </ItemGroup>
+
+</Project>
+
--- a/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs
+++ b/MCTG/Tests/Model_UnitTests/RecipeCollection_UT.cs
@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DataPersistence;
+using FakePersistance;
 using Model;
 using Model.Managers;

--- a/MCTG/Views/App.xaml.cs
+++ b/MCTG/Views/App.xaml.cs
@ -12,6 +12,7 @@ using Microsoft.Maui.Controls;
 using System.Linq;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using FakePersistance;

 namespace Views
 {
--- a/MCTG/Views/Views.csproj
+++ b/MCTG/Views/Views.csproj
@ -57,10 +57,14 @@
 	</ItemGroup>

 	<ItemGroup>
-	  <ProjectReference Include="..\DataPersistence\DataPersistence.csproj" />
+	  <ProjectReference Include="..\Exception\AppException.csproj" />
+	  <ProjectReference Include="..\Managers\Managers.csproj" />
 	  <ProjectReference Include="..\Model\Model.csproj" />
+	  <ProjectReference Include="..\Persistance\DataPersistence\DataPersistence.csproj" />
+	  <ProjectReference Include="..\Persistance\FakePersistance\FakePersistance.csproj" />
 	</ItemGroup>
-
+	
+	
 	<ItemGroup>
 	  <MauiXaml Update="AddRecipe.xaml">
 	    <Generator>MSBuild:Compile</Generator>