From bdf4f2b2f558c2978dde0a19ee6c0a2d0a59f274 Mon Sep 17 00:00:00 2001 From: mborzyszkowski Date: Sat, 11 Jul 2020 16:28:40 +0200 Subject: [PATCH] First version of building data --- .docker/docker-compose.yaml | 4 +- .vscode/tasks.json | 4 +- .../Controllers/AdminController.cs | 31 ++- src/InternshipSystem.Core/Course.cs | 5 +- .../DatabaseFiller.cs | 263 +++++++++++++++++- .../InternshipDbContext.cs | 1 - .../InternshipDbContextFactory.cs | 18 ++ 7 files changed, 315 insertions(+), 11 deletions(-) create mode 100644 src/InternshipSystem.Repository/InternshipDbContextFactory.cs 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..2e8fcd7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -63,8 +63,8 @@ "--remove-orphans" ], "dependsOn": [ - "down: api", - "build: api" + "build: api", + "down: api" ], "problemMatcher": [] }, diff --git a/src/InternshipSystem.Api/Controllers/AdminController.cs b/src/InternshipSystem.Api/Controllers/AdminController.cs index 062e7f8..b3548d0 100644 --- a/src/InternshipSystem.Api/Controllers/AdminController.cs +++ b/src/InternshipSystem.Api/Controllers/AdminController.cs @@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Mvc; namespace Internship.Api.Controller { [ApiController] - [Route("[controller]")] - class AdminController : ControllerBase + [Route("admin")] + public class AdminController : ControllerBase { public AdminController(DatabaseFiller fillerService) { @@ -15,11 +15,36 @@ namespace Internship.Api.Controller public DatabaseFiller FillerService { get; } - [HttpPost] + [HttpPost("fill/companies")] public async Task FillCompaniesAsync() { await FillerService.FillCompany(); return Ok(); } + + [HttpPost("fill/interns")] + public async Task FillInternsAsync() { + await FillerService.FillInterns(); + return Ok(); + } + + [HttpPost("fill/internshiptypes")] + public async Task FillInternshipTypesAsync() { + await FillerService.FillInternshipTypes(); + return Ok(); + } + + // TODO: + // [HttpPost("fill/editions")] + // public async Task FillEditionsAsync() { + // await FillerService.FillEditions(); + // return Ok(); + // } + + [HttpPost("fill/internships")] + public async Task FillInternShipsAsync() { + await FillerService.FillInternShips(); + return Ok(); + } } } \ No newline at end of file diff --git a/src/InternshipSystem.Core/Course.cs b/src/InternshipSystem.Core/Course.cs index 4797e1a..9a38b3b 100644 --- a/src/InternshipSystem.Core/Course.cs +++ b/src/InternshipSystem.Core/Course.cs @@ -1,8 +1,11 @@ -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; } } } \ No newline at end of file diff --git a/src/InternshipSystem.Repository/DatabaseFiller.cs b/src/InternshipSystem.Repository/DatabaseFiller.cs index a0b94d8..8903ab9 100644 --- a/src/InternshipSystem.Repository/DatabaseFiller.cs +++ b/src/InternshipSystem.Repository/DatabaseFiller.cs @@ -1,4 +1,6 @@ +using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using InternshipSystem.Core; @@ -19,10 +21,265 @@ namespace InternshipSystem.Repository { new Company { - + Name = "Intel", + SiteAddress = new Uri("https://www.intel.com/content/www/us/en/jobs/locations/poland.html"), + Nip = "9570752316", + Range = RangeOfActivities.International, + Branches = new List() + { + new BranchOffice() + { + Address = new Address() + { + City = "Gdańsk", + Street = "ul. Słowackiego", + Building = "173", + PostalCode = "80-298", + Country = "Poland" + } + }, + new BranchOffice() + { + Address = new Address() + { + City = "Gdańsk", + Street = "Jana z Kolna", + Building = "11", + PostalCode = "80-001", + Country = "Poland" + } + }, + new BranchOffice() + { + Address = new Address() + { + City = "Boston", + Street = "State St", + Building = "53", + PostalCode = "MA 02109", + Country = "Stany Zjednoczone" + } + } + } + }, + new Company + { + Name = "Asseco Poland", + SiteAddress = new Uri("http://pl.asseco.com"), + Nip = "5842068320", + Range = RangeOfActivities.National, + Branches = new List + { + new BranchOffice + { + Address = new Address + { + City = "Gdańsk", + Street = "ul. Podolska", + Building = "21", + PostalCode = "81-321", + Country = "Poland" + } + }, + new BranchOffice + { + Address = new Address + { + City = "Wrocław", + Street = "Traugutta", + Building = "1/7", + PostalCode = "50-449", + Country = "Poland" + } + } + } } }; + Context.Companies.AddRange(companies); + await Context.SaveChangesAsync(); } - } - + + public async Task FillInterns() + { + var interns = new List + { + new Intern { + Name = "Jan", + Surname = "Kowalski", + AlbumNumber = "123456", + Email = "s123456@student.pg.edu.pl", + Course = new Course + { + Name = "Informatyka", + DesiredSemesters = new List { 4, 6 } + } + }, + new Intern { + Name = "Adam", + Surname = "Kołek", + AlbumNumber = "102137", + Email = "s102137@student.pg.edu.pl", + Course = new Course + { + Name = "Robotyka", + DesiredSemesters = new List { 6 } + } + } + }; + Context.Interns.AddRange(interns); + await Context.SaveChangesAsync(); + } + + public async Task FillInternshipTypes() { + var internshipTypes = new List + { + new InternshipType + { + Type = "FreeInternship", + Description = "Praktyka bezpłatna", + }, + new InternshipType + { + Type = "GraduateInternship" + }, + new InternshipType + { + Type = "FreeApprenticeship" + }, + new InternshipType + { + Type = "PaidApprenticeship", + Description = "np. przemysłowy" + }, + new InternshipType + { + Type = "ForeignInternship", + Description = "np. IAESTE, ERASMUS" + }, + new InternshipType + { + Type = "UOP" + }, + new InternshipType + { + Type = "UD" + }, + new InternshipType + { + Type = "UZ" + }, + new InternshipType + { + Type = "Other", + Description = "Należy wprowadzić samodzielnie" + } + }; + Context.InternshipTypes.AddRange(internshipTypes); + await Context.SaveChangesAsync(); + } + + // TODO: rewrite later + // public async Task FillEditions() { + // var editions = new List + // { + // new Edition + // { + // StartDate = new DateTime(2000, 5, 10), + // EndDate = new DateTime(2000, 11, 10), + // IPPDeadlineDate = new DateTime(2000, 9, 30), + // Subjects = new List + // { + // new InternshipProgramSubject + // { + // Course = new Course + // { + // Name = "Informatyka" + // } + // }, + // new InternshipProgramSubject + // { + // Course = new Course + // { + // Name = "Budowanie UI" + // } + // }, + // new InternshipProgramSubject + // { + // Course = new Course + // { + // Name = "Budowanie Back End" + // } + // } + // } + // } + // }; + // Context.Editions.AddRange(editions); + // await Context.SaveChangesAsync(); + // } + + public async Task FillInternShips() { + var intenrships = new List + { + new Internship + { + Intern = Context.Interns.Where(i => i.AlbumNumber == "123456").Single(), + Edition = null, //TODO: Context.Editions.Where(e => e.StartDate.Equals(new DateTime(2000, 5, 10))).Single(), + BranchOffice = new BranchOffice() + { + Address = new Address() + { + City = "Gdańsk", + Street = "ul. Słowackiego", + Building = "173", + PostalCode = "80-298", + Country = "Poland" + } + }, + Type = Context.InternshipTypes.Where(t => t.Type == "UOP").Single(), + StartDate = new DateTime(2000, 7, 1), + EndDate = new DateTime(2000, 8, 30), + IsAccepted = false, + DeanAcceptance = new DeanAcceptance + { + AcceptanceDate = new DateTime(2000, 6, 26), + IsDeansAcceptanceRequired = true, + Reason = DeanAcceptanceReason.Semester + }, + Insurance = new Insurance + { + InsuranceDeliveryDate = new DateTime(2000, 6, 29), + IsInsuranceRequired = true + }, + InternshipLengthInWeeks = 9, + Grade = 0, + Program = new List + { + new InternshipProgramSubject + { + Course = new Course + { + Name = "Bazy Danych" + } + }, + new InternshipProgramSubject + { + Course = new Course + { + Name = "Design UI" + } + } + }, + Mentor = new Mentor + { + Name = "Horacy", + Surname = "Wościcki", + Email = "howos@intel.com", + Phone = "605-555-555" + } + } + }; + Context.Internships.AddRange(intenrships); + await Context.SaveChangesAsync(); + } + } } \ No newline at end of file diff --git a/src/InternshipSystem.Repository/InternshipDbContext.cs b/src/InternshipSystem.Repository/InternshipDbContext.cs index 7391851..d498c22 100644 --- a/src/InternshipSystem.Repository/InternshipDbContext.cs +++ b/src/InternshipSystem.Repository/InternshipDbContext.cs @@ -11,7 +11,6 @@ namespace InternshipSystem.Repository public DbSet Reports { get; set; } public DbSet Interns { get; set; } public DbSet InternshipTypes { get; set; } - public InternshipDbContext(DbContextOptions options) : base(options) { diff --git a/src/InternshipSystem.Repository/InternshipDbContextFactory.cs b/src/InternshipSystem.Repository/InternshipDbContextFactory.cs new file mode 100644 index 0000000..6292291 --- /dev/null +++ b/src/InternshipSystem.Repository/InternshipDbContextFactory.cs @@ -0,0 +1,18 @@ + +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Design; + +namespace InternshipSystem.Repository { + + public class InternshipDbContextFactory : IDesignTimeDbContextFactory + { + + public InternshipDbContext CreateDbContext(string[] args) + { + var optionsBulider = new DbContextOptionsBuilder(); + optionsBulider.UseNpgsql("Host=localhost;Port=5432;Database=postgres;Username=postgres;Password=szwoniu"); + + return new InternshipDbContext(optionsBulider.Options); + } + } +} \ No newline at end of file