Robienie takich commitów jest męczące ziomeczku

.docker/docker-compose.yaml

@@ -4,8 +4,10 @@ services:
   internship.api:
     image: internship.api:latest
     environment:
-      CONNECTIONSTRINGS__INTERNSHIPDATABASE: "Host=localhost;Port=5432;Database=postgres;Username=postgres;Password=szwoniu"
+      CONNECTIONSTRINGS__INTERNSHIPDATABASE: "Host=db.postgres;Port=5432;Database=postgres;Username=postgres;Password=szwoniu"
       ASPNETCORE_ENVIRONMENT: Development
+    depends_on: 
+      - db.postgres
     ports: 
       - 8080:80
 

.vscode/tasks.json

@@ -49,7 +49,8 @@
                 "-f",
                 ".docker/docker-compose.yaml",
                 "down",
-                "--volumes"
+                "--volumes",
+                "--remove-orphans"
             ]
         },
         {
@@ -60,7 +61,6 @@
                 "-f",
                 ".docker/docker-compose.yaml",
                 "up",
-                "--remove-orphans"
             ],
             "dependsOn": [
                 "down: api",

props/Directory.Tests.Build.props

@@ -0,0 +1,10 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="Machine.Fakes.FakeItEasy" Version="2.11.0" />
+    <PackageReference Include="Machine.Specifications" Version="1.0.0" />
+    <PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.1" />
+    <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="coverlet.collector" Version="1.2.0" />
+  </ItemGroup>
+</Project>

src/InternshipSystem.Core/Course.cs

@@ -1,8 +1,12 @@
-namespace InternshipSystem.Core
+using System.Collections.Generic;
+
+namespace InternshipSystem.Core
 {
     public class Course
     {
         public int Id { get; set; }
         public string Name { get; set; }
+        public List<int> DesiredSemesters { get; set; }
+        public List<InternshipProgramEntry> ProgramEntries { get; set; }
     }
 }

src/InternshipSystem.Core/Edition.cs

@@ -9,6 +9,6 @@ namespace InternshipSystem.Core
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public DateTime IPPDeadlineDate { get; set; }
-        public List<InternshipProgramSubject> Subjects { get; set;}
+        public List<InternshipProgramEntry> Subjects { get; set;}
     }
 }

src/InternshipSystem.Core/Intern.cs

@@ -8,7 +8,7 @@ namespace InternshipSystem.Core
         public string Name { get; set; }
         public string Surname { get; set; }
         public string Email { get; set; }
-        public Course Course { get; set; }
         public int Semester { get; set; }
+        public Course Course { get; set; }
     }
 }

src/InternshipSystem.Core/Internship.cs

@@ -16,9 +16,9 @@ namespace InternshipSystem.Core
         public bool IsAccepted { get; set; }
         public DeanAcceptance DeanAcceptance { get; set; }
         public Insurance Insurance { get; set; }
-        public int InternshipLengthInWeeks { get; set; }
+        public int LengthInWeeks { get; set; }
         public float Grade { get; set; }
-        public List<InternshipProgramSubject> Program { get; set; }
+        public List<InternshipProgramEntry> Program { get; set; }
         public Mentor Mentor { get; set; }
     }
 }

src/InternshipSystem.Core/InternshipProgramEntry.cs

@@ -1,6 +1,6 @@
 namespace InternshipSystem.Core
 {
-    public class InternshipProgramSubject
+    public class InternshipProgramEntry
     {
         public int Id { get; set; }
         public Course Course { get; set; }

src/InternshipSystem.Core/Mentor.cs

@@ -5,5 +5,6 @@ namespace InternshipSystem.Core
         public string Surname { get; set; }
         public string Email { get; set; }
         public string Phone { get; set; }
+        public Company Company { get; set; }
     }
 }

test/InternshipSystem.Api.Test/InternshipSystem.Api.Test.csproj

@@ -6,13 +6,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
+  <Import Project="../../props/Directory.Tests.Build.props" />
-    <PackageReference Include="Machine.Fakes.FakeItEasy" Version="2.11.0" />
-    <PackageReference Include="Machine.Specifications" Version="1.0.0" />
-    <PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.1" />
-    <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
-  </ItemGroup>
 
 </Project>

test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj

@@ -6,14 +6,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
+  <Import Project="../../props/Directory.Tests.Build.props"/>
-    <PackageReference Include="Machine.Fakes.FakeItEasy" Version="2.11.0" />
-    <PackageReference Include="Machine.Specifications" Version="1.0.0" />
-    <PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.10.1" />
-    <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\InternshipSystem.Core\InternshipSystem.Core.csproj" />