Fixed CoreAPI seeding bug, updated docker configurations

StudioStoy · May 27, 2023 · 650abee · 650abee
1 parent 7b877b2
commit 650abee
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/GainsTracker.CoreAPI/Components/Security/Models/User.cs b/GainsTracker.CoreAPI/Components/Security/Models/User.cs
@@ -6,5 +6,5 @@ namespace GainsTracker.CoreAPI.Components.Security.Models;
 public class User : IdentityUser
 {
     public override string Id { get; set; } = Guid.NewGuid().ToString();
-    public GainsAccount GainsAccount { get; set; } = new();
+    public GainsAccount? GainsAccount { get; set; }
 }
diff --git a/GainsTracker.CoreAPI/Configurations/ProgramBuilderExtensions.cs b/GainsTracker.CoreAPI/Configurations/ProgramBuilderExtensions.cs
@@ -77,11 +77,11 @@ public static void ConfigureCors(this WebApplicationBuilder builder)
     {
         builder.Services.AddCors(options =>
         {
-            options.AddPolicy("AllowAngularDevClient",
+            options.AddPolicy("AllowBlazorDevClient",
                 b =>
                 {
                     b
-                        .WithOrigins("http://localhost:4200")
+                        .WithOrigins("https://localhost:7093", "http://localhost:5027", "http://localhost:5027")
                         .AllowAnyHeader()
                         .AllowAnyMethod();
                 });

diff --git a/GainsTracker.CoreAPI/Dockerfile b/GainsTracker.CoreAPI/Dockerfile
@@ -0,0 +1,10 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
+
+ENV ASPNETCORE_URLS=http://*:4040
+ENV ASPNETCORE_ENVIRONMENT=Development
+
+COPY ./bin/Release/net7.0/publish App/
+WORKDIR /App
+EXPOSE 4040
+
+ENTRYPOINT ["dotnet","GainsTracker.CoreAPI.dll"]
diff --git a/GainsTracker.CoreAPI/GainsTracker.CoreAPI.csproj b/GainsTracker.CoreAPI/GainsTracker.CoreAPI.csproj
@@ -16,17 +16,17 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12"/>
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3"/>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3"/>
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\GainsTracker.Common\GainsTracker.Common.csproj"/>
+        <ProjectReference Include="..\GainsTracker.Common\GainsTracker.Common.csproj" />
     </ItemGroup>
 </Project>
diff --git a/GainsTracker.CoreAPI/Program.cs b/GainsTracker.CoreAPI/Program.cs
@@ -21,7 +21,7 @@
 
 WebApplication app = builder.Build();
 
-app.ResetAndUpdateDatabase();
+app.ResetAndUpdateDatabase(false);
 
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
@@ -30,7 +30,7 @@
     app.UseSwaggerUI();
 }
 
-app.UseCors("AllowAngularDevClient");
+app.UseCors("AllowBlazorDevClient");
 app.UseHttpsRedirection();
 
 // Authentication

diff --git a/GainsTracker.CoreAPI/appsettings.json b/GainsTracker.CoreAPI/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "ConnectionStrings": {
-    "databaseConnection": "Host=localhost:15432; Database=gainstracker_db; Username=stoy; Password=postman"
+    "databaseConnection": "Host=db:5432; Database=gainstracker_db; Username=stoy; Password=postman"
   },
   "JWT": {
     "ValidAudience": "http://localhost:4200",

diff --git a/GainsTracker.CoreAPI/docker-compose.yml b/GainsTracker.CoreAPI/docker-compose.yml
@@ -22,3 +22,10 @@ services:
       DB_APP_PASS: gainstracker_db
     volumes:
       - ./development/postgres/data:/var/lib/postgresql/data
+  api:
+    build: ./
+    restart: always
+    depends_on: 
+      - db
+    ports:
+      - "420:4040" # funny