Merge pull request #153 from NielsPilgaard/chat

Working Chat

Author: NielsPilgaard

.github/workflows/container_apps_chat_cd.yml

@@ -1,4 +1,4 @@
-name: Test & Publish Chat Docker Image to Docker Hub
+name: Chat - Publish Docker Image
 
 on:
   push:
@@ -13,7 +13,6 @@ jobs:
     env:
       MSSQL_SA_PASSWORD: 6efe173b-3e33-4d6c-8f50-3e5f7cadd54c
       TEST_DIRECTORY: tests/container_apps/Jordnaer.Chat.Tests
-      DOCKERFILE_PATH: src/container_apps/Jordnaer.Chat/Dockerfile
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-latest
@@ -30,42 +29,47 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7.x'
-          include-prerelease: true
 
       - name: Test
         run: dotnet test "${{ env.TEST_DIRECTORY }}" --filter Category!=ManualTest
         env:
           ConnectionStrings__AppConfig: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
           ConnectionStrings__JordnaerDbContext: "Server=localhost,1433;Database=jordnaer;User ID=sa;Password=${{ env.MSSQL_SA_PASSWORD }};Persist Security Info=False;TrustServerCertificate=true;"
 
-  build:
+  push:
+    if: |
+      always() && 
+      (needs.test.result == 'success' || needs.test.result == 'skipped')
+    needs: [test]
     runs-on: ubuntu-latest
     env:
-      IMAGE_NAME: chat
-      IMAGE_VERSION: latest
+      DOCKER_IMAGE_NAME: chat
     steps:
 
     - name: Checkout code
       uses: actions/checkout@v3
 
       # Apply tags and labels based on GitHub Actions events and Git metadata
-    - name: Docker meta
+    - name: Apply Docker Image tags & labels
       id: meta
       uses: docker/metadata-action@v4
       with:
           # list of Docker images to use as base name for tags
           images: |
-           ${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
-           ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
+           ghcr.io/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE_NAME }}
           # generate Docker tags based on the following events/attributes
           tags: |
            type=ref,event=branch
            type=ref,event=pr
-           type=semver,pattern={{version}}
-           type=semver,pattern={{major}}.{{minor}}
-           type=semver,pattern={{major}}
+           type=match,pattern=v(.*),group=1   
+           type=match,pattern=v(\d.\d),group=1
+           type=match,pattern=v(\d),group=1
            type=sha
-           
+           type=raw,value=latest,enable={{is_default_branch}}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
@@ -79,8 +83,15 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v4
       with:
-        context: .
         push: true
-        file: ${{ env.DOCKERFILE_PATH }}
+        context: .
+        file: ./src/container_apps/Jordnaer.Chat/Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
+
+    - name: Deploy pushed image to Azure Container Apps
+      uses: azure/container-apps-deploy-action@v1
+      with:
+        containerAppName: chat
+        resourceGroup: Jordnaer
+        imageToDeploy: ghcr.io/nielspilgaard/chat:${{ github.sha }}

.github/workflows/container_apps_chat_ci.yml

@@ -1,4 +1,4 @@
-name: Test Chat
+name: Chat - Run Tests
 
 on:
   push:
@@ -35,7 +35,6 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7.x'
-          include-prerelease: true
 
       - name: Test
         # Dependabot cannot access secrets, so we disable this step for Dependabot

.github/workflows/website_ci.yml renamed to .github/workflows/website_backend_ci.yml

@@ -1,55 +1,55 @@
-name: Test Website Backend
-
-on:
-  push:
-    paths:
-      - 'src/web/**'
-      - 'tests/web/**'
-      - '.github/workflows/website_ci.yml'
-  workflow_dispatch:
-
-# Needed by dorny/test-reporter@v1
-permissions:
-  statuses: write
-  checks: write
-
-env:
-  MSSQL_SA_PASSWORD: 6efe173b-3e33-4d6c-8f50-3e5f7cadd54c
-  WORKING_DIRECTORY: tests/web/Jordnaer.Server.Tests
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    services:
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2019-latest
-        env:
-          SA_PASSWORD: "${{ env.MSSQL_SA_PASSWORD }}"
-          ACCEPT_EULA: 'Y'
-        ports:
-          - 1433:1433
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up dotnet
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: '7.x'
-          include-prerelease: true
-          
-      - name: Test
-        # Dependabot cannot access secrets, so we disable this step for Dependabot
-        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
-        run: dotnet test "${{ env.WORKING_DIRECTORY }}" --logger "trx;LogFileName=test-results.trx" --filter Category!=ManualTest
-        env:
-          ConnectionStrings__AppConfig: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
-          ConnectionStrings__JordnaerDbContext: "Server=localhost,1433;Database=jordnaer;User ID=sa;Password=${{ env.MSSQL_SA_PASSWORD }};Persist Security Info=False;TrustServerCertificate=true;"
-
-      - name: Test Report
-        # Dependabot cannot access secrets, so we disable this step for Dependabot
-        if: (success() || failure()) && (github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]')
-        uses: dorny/test-reporter@v1
-        with:
-          name: Test Report
-          path: "**.trx"
-          reporter: dotnet-trx
+name: Website Backend - Run Tests
+
+on:
+  push:
+    paths:
+      - 'src/web/**'
+      - 'tests/web/**'
+      - '.github/workflows/website_backend_ci.yml'
+  workflow_dispatch:
+
+# Needed by dorny/test-reporter@v1
+permissions:
+  statuses: write
+  checks: write
+
+env:
+  MSSQL_SA_PASSWORD: 6efe173b-3e33-4d6c-8f50-3e5f7cadd54c
+  WORKING_DIRECTORY: tests/web/Jordnaer.Server.Tests
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2019-latest
+        env:
+          SA_PASSWORD: "${{ env.MSSQL_SA_PASSWORD }}"
+          ACCEPT_EULA: 'Y'
+        ports:
+          - 1433:1433
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7.x'
+          include-prerelease: true
+          
+      - name: Test
+        # Dependabot cannot access secrets, so we disable this step for Dependabot
+        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+        run: dotnet test "${{ env.WORKING_DIRECTORY }}" --logger "trx;LogFileName=test-results.trx" --filter Category!=ManualTest
+        env:
+          ConnectionStrings__AppConfig: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
+          ConnectionStrings__JordnaerDbContext: "Server=localhost,1433;Database=jordnaer;User ID=sa;Password=${{ env.MSSQL_SA_PASSWORD }};Persist Security Info=False;TrustServerCertificate=true;"
+
+      - name: Test Report
+        # Dependabot cannot access secrets, so we disable this step for Dependabot
+        if: (success() || failure()) && (github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]')
+        uses: dorny/test-reporter@v1
+        with:
+          name: Test Report
+          path: "**.trx"
+          reporter: dotnet-trx

.github/workflows/website_cd.yml

@@ -1,4 +1,4 @@
-name: Build, test and deploy to Azure App Service
+name: Website - Deploy
 
 on:
   push:
@@ -18,7 +18,7 @@ env:
   WORKING_DIRECTORY: src/web/Server
   MSSQL_SA_PASSWORD: 6efe173b-3e33-4d6c-8f50-3e5f7cadd54c
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
     services:
       mssql:
@@ -36,7 +36,6 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7.x'
-          include-prerelease: true
 
       - name: Restore Nugets
         run: dotnet restore "${{ env.WORKING_DIRECTORY }}"

benchmarks/Jordnaer.Server.Benchmarks/UserSearchBenchmark.cs

@@ -12,7 +12,7 @@ namespace Jordnaer.Server.Benchmarks;
 [MemoryDiagnoser]
 public class UserSearchBenchmark
 {
-    private IUserSearchApiClient _client = null!;
+    private IUserSearchClient _client = null!;
     private JordnaerDbContext _context = null!;
     private UserProfile _randomUser = null!;
     private List<LookingFor> _lookingFor = new();
@@ -43,7 +43,7 @@ public async Task GlobalSetupAsync()
             .Take(1)
             .FirstOrDefaultAsync())!;
 
-        _client = RestService.For<IUserSearchApiClient>(httpClient);
+        _client = RestService.For<IUserSearchClient>(httpClient);
     }
 
     [Benchmark]

src/container_apps/Jordnaer.Chat/ChatDbContext.cs

@@ -0,0 +1,72 @@
+
+using Jordnaer.Shared;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jordnaer.Chat;
+
+public class ChatDbContext : DbContext
+{
+    public DbSet<UserProfile> UserProfiles { get; set; } = default!;
+    public DbSet<Shared.Chat> Chats { get; set; } = default!;
+    public DbSet<ChatMessage> ChatMessages { get; set; } = default!;
+    public DbSet<UserChat> UserChats { get; set; } = default!;
+    public DbSet<UnreadMessage> UnreadMessages { get; set; } = default;
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<UserProfile>()
+            .HasMany(userProfile => userProfile.LookingFor)
+            .WithMany()
+            .UsingEntity<UserProfileLookingFor>();
+
+        modelBuilder.Entity<UserProfile>()
+            .HasMany(userProfile => userProfile.Contacts)
+            .WithMany()
+            .UsingEntity<UserContact>(
+                builder => builder
+                    .HasOne<UserProfile>()
+                    .WithMany()
+                    .HasForeignKey(userContact => userContact.UserProfileId),
+                builder => builder
+                    .HasOne<UserProfile>()
+                    .WithMany()
+                    .HasForeignKey(userContact => userContact.ContactId));
+
+        modelBuilder.Entity<Shared.Chat>()
+            .HasMany(userProfile => userProfile.Recipients)
+            .WithMany()
+            .UsingEntity<UserChat>();
+
+        modelBuilder.Entity<UserProfile>()
+            .Property(user => user.SearchableName)
+            .HasComputedColumnSql(
+                $"[{nameof(UserProfile.FirstName)}] + " +
+                $"[{nameof(UserProfile.LastName)}] + " +
+                $"[{nameof(UserProfile.UserName)}]",
+                stored: true);
+
+
+        modelBuilder.Entity<UserProfile>()
+            .Property(user => user.Age)
+            .HasComputedColumnSql(
+                $"DATEDIFF(YY, [{nameof(UserProfile.DateOfBirth)}], GETDATE()) - " +
+                $"CASE WHEN MONTH([{nameof(UserProfile.DateOfBirth)}]) > MONTH(GETDATE()) " +
+                $"OR MONTH([{nameof(UserProfile.DateOfBirth)}]) = MONTH(GETDATE()) " +
+                $"AND DAY([{nameof(UserProfile.DateOfBirth)}]) > DAY(GETDATE()) " +
+                $"THEN 1 ELSE 0 END");
+
+        modelBuilder.Entity<ChildProfile>()
+            .Property(child => child.Age)
+            .HasComputedColumnSql(
+                $"DATEDIFF(YY, [{nameof(ChildProfile.DateOfBirth)}], GETDATE()) - " +
+                $"CASE WHEN MONTH([{nameof(ChildProfile.DateOfBirth)}]) > MONTH(GETDATE()) " +
+                $"OR MONTH([{nameof(ChildProfile.DateOfBirth)}]) = MONTH(GETDATE()) " +
+                $"AND DAY([{nameof(ChildProfile.DateOfBirth)}]) > DAY(GETDATE()) " +
+                $"THEN 1 ELSE 0 END");
+
+        base.OnModelCreating(modelBuilder);
+    }
+
+    public ChatDbContext(DbContextOptions<ChatDbContext> options) : base(options)
+    { }
+}

src/container_apps/Jordnaer.Chat/Dockerfile

@@ -8,16 +8,16 @@ EXPOSE 443
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["Directory.Build.props", "."]
-COPY ["src/container_apps/Chat/Chat.csproj", "src/container_apps/Chat/"]
-RUN dotnet restore "src/container_apps/Chat/Chat.csproj"
+COPY ["src/container_apps/Jordnaer.Chat/Jordnaer.Chat.csproj", "src/container_apps/Jordnaer.Chat/"]
+RUN dotnet restore "src/container_apps/Jordnaer.Chat/Jordnaer.Chat.csproj"
 COPY . .
-WORKDIR "/src/container_apps/Chat"
-RUN dotnet build "Chat.csproj" -c Release -o /app/build
+WORKDIR "/src/src/container_apps/Jordnaer.Chat"
+RUN dotnet build "Jordnaer.Chat.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "Chat.csproj" -c Release -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "Jordnaer.Chat.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Chat.dll"]
+ENTRYPOINT ["dotnet", "Jordnaer.Chat.dll"]

src/container_apps/Jordnaer.Chat/Extensions/AzureAppConfigurationExtensions.cs

@@ -0,0 +1,30 @@
+namespace Jordnaer.Chat;
+
+public static class AzureAppConfigurationExtensions
+{
+    public static WebApplicationBuilder AddAzureAppConfiguration(this WebApplicationBuilder builder)
+    {
+        string? connectionString = builder.Configuration.GetConnectionString("AppConfig");
+        if (connectionString is null)
+        {
+            return builder.Environment.IsDevelopment()
+                ? builder
+                : throw new InvalidOperationException("Connection string 'AppConfig' not found.");
+        }
+
+        builder.Services.AddAzureAppConfiguration();
+        builder.Configuration.AddAzureAppConfiguration(options =>
+            options.Connect(connectionString)
+                // Load all keys that have no label
+                .Select("*")
+                // Configure to reload builder if the registered sentinel key is modified
+                .ConfigureRefresh(refreshOptions =>
+                {
+                    refreshOptions.Register("Sentinel", refreshAll: true);
+                    refreshOptions.SetCacheExpiration(TimeSpan.FromMinutes(5));
+                })
+                .UseFeatureFlags(flagOptions => flagOptions.CacheExpirationInterval = TimeSpan.FromMinutes(3)));
+
+        return builder;
+    }
+}