diff --git a/Server/Controllers/CompletionController.cs b/Server/Controllers/CompletionController.cs index 7fb8dbe..b410211 100644 --- a/Server/Controllers/CompletionController.cs +++ b/Server/Controllers/CompletionController.cs @@ -8,13 +8,21 @@ namespace Server.Controllers; [Route("[controller]")] public class CompletionController : ControllerBase { private readonly ILogger _logger; + private SpaceRaceDbContext _db; - public CompletionController(ILogger logger) { + public CompletionController(ILogger logger, SpaceRaceDbContext db) { _logger = logger; + _db = db; } [HttpGet(Name = "GetCompletion")] public IEnumerable Get() { - return Enumerable.Range(1, 5).Select(index => new CompletionDTO()).ToArray(); + return _db.Completions.Select(c => new CompletionDTO { + Id = c.Id, + UserId = c.UserId, + Map = c.Map, + Time = c.Time, + Date = c.Date, + }); } } diff --git a/Server/Dockerfile b/Server/Dockerfile index bd42c23..7e1e498 100644 --- a/Server/Dockerfile +++ b/Server/Dockerfile @@ -12,4 +12,4 @@ RUN dotnet publish -c Release -o out FROM mcr.microsoft.com/dotnet/aspnet:7.0 WORKDIR /App COPY --from=build-env /App/out . -ENTRYPOINT ["dotnet", "DotNet.Docker.dll"] +ENTRYPOINT ["dotnet", "Server.dll"] diff --git a/Server/docker-compose.yaml b/Server/docker-compose.yaml index b95cc19..cfbc6a1 100644 --- a/Server/docker-compose.yaml +++ b/Server/docker-compose.yaml @@ -7,12 +7,28 @@ services: POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}' ports: - '45432:5432' - volumes: - - "./db:/var/lib/postgresql/data" + + # server: + # ports: + # - '40080:80' + # environment: + # CONNECTIONSTRINGS__SPACERACE: "Server=pg;Port=5432;Database=${POSTGRES_DB};User Id=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}" + # build: + # context: . + # dockerfile: ./Dockerfile + # command: dotnet watch server: + depends_on: + - 'pg' + ports: + - '40080:80' environment: CONNECTIONSTRINGS__SPACERACE: "Server=pg;Port=5432;Database=${POSTGRES_DB};User Id=${POSTGRES_USER};Password=${POSTGRES_PASSWORD}" build: context: . dockerfile: ./Dockerfile + command: dotnet watch + volumes: + - "./:/App" +