diff --git a/.docker/docker-compose.yaml b/.docker/docker-compose.yaml
index 4514f2f..2d5db57 100644
--- a/.docker/docker-compose.yaml
+++ b/.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
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 5c97b77..5918581 100644
--- a/.vscode/tasks.json
+++ b/.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",
diff --git a/props/Directory.Tests.Build.props b/props/Directory.Tests.Build.props
index e69de29..9eeba92 100644
--- a/props/Directory.Tests.Build.props
+++ b/props/Directory.Tests.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/Course.cs b/src/InternshipSystem.Core/Course.cs
index 4797e1a..4a91813 100644
--- a/src/InternshipSystem.Core/Course.cs
+++ b/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 DesiredSemesters { get; set; }
+ public List ProgramEntries { get; set; }
}
}
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/Edition.cs b/src/InternshipSystem.Core/Edition.cs
index 60db76f..dd192bb 100644
--- a/src/InternshipSystem.Core/Edition.cs
+++ b/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 Subjects { get; set;}
+ public List Subjects { get; set;}
}
}
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/Intern.cs b/src/InternshipSystem.Core/Intern.cs
index f9297e6..02339cd 100644
--- a/src/InternshipSystem.Core/Intern.cs
+++ b/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; }
}
}
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/Internship.cs b/src/InternshipSystem.Core/Internship.cs
index 582be5d..34d763f 100644
--- a/src/InternshipSystem.Core/Internship.cs
+++ b/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 Program { get; set; }
+ public List Program { get; set; }
public Mentor Mentor { get; set; }
}
}
\ No newline at end of file
diff --git a/src/InternshipSystem.Core/InternshipProgramSubject.cs b/src/InternshipSystem.Core/InternshipProgramEntry.cs
similarity index 80%
rename from src/InternshipSystem.Core/InternshipProgramSubject.cs
rename to src/InternshipSystem.Core/InternshipProgramEntry.cs
index 9904ac1..16d2115 100644
--- a/src/InternshipSystem.Core/InternshipProgramSubject.cs
+++ b/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; }
diff --git a/src/InternshipSystem.Core/Mentor.cs b/src/InternshipSystem.Core/Mentor.cs
index b1fc801..c6503d0 100644
--- a/src/InternshipSystem.Core/Mentor.cs
+++ b/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; }
}
}
diff --git a/test/InternshipSystem.Api.Test/InternshipSystem.Api.Test.csproj b/test/InternshipSystem.Api.Test/InternshipSystem.Api.Test.csproj
index 7d90bea..80e5e31 100644
--- a/test/InternshipSystem.Api.Test/InternshipSystem.Api.Test.csproj
+++ b/test/InternshipSystem.Api.Test/InternshipSystem.Api.Test.csproj
@@ -6,13 +6,6 @@
false
-
-
-
-
-
-
-
-
+
diff --git a/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj b/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
index 1977a73..a689a18 100644
--- a/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
+++ b/test/InternshipSystem.Core.Tests/InternshipSystem.Core.Tests.csproj
@@ -6,14 +6,7 @@
false
-
-
-
-
-
-
-
-
+