use postgres and EF migrations

.github/workflows/build-test.yml

@@ -10,6 +10,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    services:
+      postgres:
+        image: postgres:16 # Or your desired PostgreSQL version
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: labeller
+        ports:
+        - 5432:5432 # Expose the PostgreSQL port
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET

.github/workflows/deploy.yml

@@ -32,14 +32,9 @@ jobs:
         with:
           dotnet-version: '9.0.x'
 
-      - name: Install NativeAOT Dependencies
+      - name: Publish app
         run: |
-          sudo apt-get update
-          sudo apt-get install -y clang zlib1g-dev
-
-      - name: Publish NativeAOT app
-        run: |
-          dotnet publish ./SS14.Labeller -c Release -r ${{ matrix.rid }} --self-contained true /p:PublishAot=true -o publish
+          dotnet publish ./SS14.Labeller -c Release -r ${{ matrix.rid }} --self-contained true -o publish
 
       - name: Prepare release zip
         run: |

Dockerfile

@@ -18,9 +18,9 @@ RUN echo "Building for platform: $TARGETPLATFORM" \
     "linux/arm64") export RID=linux-arm64 ;; \
     *) echo "Unsupported TARGETPLATFORM: $TARGETPLATFORM" && exit 1 ;; \
     esac \
-    && dotnet publish -c Release -r $RID --self-contained true /p:PublishAot=true -o /app
+    && dotnet publish -c Release -r $RID -o /app
 
-FROM debian:bookworm-slim AS final
+FROM mcr.microsoft.com/dotnet/aspnet:9.0.10-bookworm-slim AS final
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y --no-install-recommends \

README.md

@@ -2,7 +2,21 @@
 
 Simple ASP.NET NativeAOT application for labelling our [content repository](https://github.com/space-wizards/space-station-14)
 
-## Usage
+## Features
+
+Main features of application are related to reaction to github events:
+* Event of issue creation will lead to issue getting marked as ```S: Untriaged``` label
+* Event of leaving review under pull request will lead to marking it with ```S: Approved``` or ```S: Awaiting Changes``` labels
+* Events, related to pull request support following labels:
+  * marked with ```size/XS```, ```size/S```, ```size/M```, ```size/L``` or ```size/XL``` for size (depending on a total lines changed in PR)
+  * marked with ```Changes: Audio```, ```Changes: Map```, ```Changes: NoCSharp```, ```Changes: Shaders```, ```Changes: Sprites```, ```Changes: Ui``` labels based on extensions and routes of files that were affected by PR
+  * marked ```Branch: Stable``` or ```Branch: Staging``` if PR is targeting specific branch
+  * marked with ```S: Untriaged``` on creation
+  * marked ```S: Approved``` if created by maintainer
+  * can create discourse thread when PR is labelled with ```S: Undergoing Discussion``` by gh users (will post link to discussion in comment of PR)
+  * marks with either ```S: Needs Review``` or ```S: Awaiting Changes``` depending on review state that maintainers leave on PR (set to ```S: Needs Review``` on opening)
+
+## Usage        
 
 Create the a file called appsettings.json like so:
 ```json
@@ -37,12 +51,12 @@ To set the port, use the `ASPNETCORE_URLS` environment variable, e.g. `ASPNETCOR
 *DiscussionCategoryId*: What category to send new discussion Topics in. You can get this by opening the Topic in your browser and the number in the URL is the category ID.\
 *Url*: The Forum URL. Must end with a trailing slash.
 
-## Building
+## Building and setting up hooks
 
-To build the application, use the following command:
+To build application for release and deployment, use the following command:
 
 ```bash
-dotnet publish ./SS14.Labeller -c Release -r <platform ex. win-x64> --self-contained true /p:PublishAot=true
+dotnet publish ./SS14.Labeller -c Release -r <platform ex. win-x64> --self-contained true
 ```
 
 Running the application is just like any other executable. On Unix systems, you may need to set the executable bit on the binary.
@@ -54,17 +68,27 @@ The token must have the `Issues` and `Pull requests` scopes enabled for read and
 
 ## Testing and debug
 
+To run application locally you can launch run it as any other dotnet application. To set up its dependencies (database) locally you can run docker-compose:
+```
+docker compose -f docker-compose-debug.yml up -d
+```
+This will run local postgres to which labeller will try attach upon launching and when running integration tests.
+
+### Forwarding github events for local debugging
 You will need set up proxy for messages from GitHub to your local machine. For that you can use https://smee.io
 1. Install Smee cli using npm (if you don't have it - follow those instructions [here](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm))\
 ``` npm install --global smee-client ```
 2. Visit https://smee.io, click 'Start a new channel' and copy the link that will be generated.
-3. In your console use Smee cli to start proxy forwarding to your local machine\
-```smee -u https://smee.io/{place-you-channel-code-here} -t http://127.0.0.1:5000/webhook```
+3. In your console use Smee cli to start proxy forwarding to your local machine: ``` smee -u https://smee.io/{place-you-channel-code-here} -t http://127.0.0.1:5000/webhook ```
+
 
 Upon launching, it will output line like
+
+
 ```
 Forwarding https://smee.io/{place-you-channel-code-here} to http://127.0.0.1:5000/webhook
 ```
+
 That means that every message it receives, including
 * Its payload
 * Its headers

SS14.Labeller.Tests/CustomWebApplicationFactory.cs

@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
 using NSubstitute;
-using SS14.Labeller.Database;
 using SS14.Labeller.DiscourseApi;
 using SS14.Labeller.GitHubApi;
 using SS14.Labeller.Repository;
+using SS14.Labeller.Tests.IntegrationTests;
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
 
 namespace SS14.Labeller.Tests;
 
@@ -35,11 +34,6 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             sp.Replace(new ServiceDescriptor(typeof(IGitHubApiClient), GitHubApiClient));
             sp.Replace(new ServiceDescriptor(typeof(IDiscourseClient), DiscourseClient));
             sp.Replace(new ServiceDescriptor(typeof(IDiscourseTopicsRepository), TopicsRepository));
-            var hostedServiceDescriptor = sp.First(d =>
-                d.ServiceType == typeof(IHostedService) &&
-                d.ImplementationType == typeof(DatabaseMigrationApplyingBackgroundService)); // Replace YourHostedService with the actual type
-
-            sp.Remove(hostedServiceDescriptor);
         }).ConfigureAppConfiguration((context, configurationBuilder) =>
         {
             configurationBuilder.AddInMemoryCollection(new Dictionary<string, string?>
@@ -48,7 +42,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 { "Discourse:Username", "aw" },
                 { "Discourse:DiscussionCategoryId", "42" },
                 { "Discourse:Url", "http://wa.wa" },
-                { "GitHub:WebhookSecret", IntegrationTests.HookSecret },
+                { "GitHub:WebhookSecret", HandlersTests.HookSecret },
                 { "GitHub:Token", "test-test" },
             });
         });

SS14.Labeller.Tests/GitHubApi/GithubRetryHandlerTests.cs

@@ -39,14 +39,14 @@
         _mockInnerHandler.Send(Arg.Any<HttpRequestMessage>(), Arg.Any<CancellationToken>())
                          .Returns(Task.FromResult(new HttpResponseMessage { StatusCode = HttpStatusCode.OK }));
 
-        var handler = new GithubRetryHandler(_mockInnerHandler, _config, _logger);
+        var handler = new GithubRetryHandler(_config, _logger) { InnerHandler = _mockInnerHandler };
         var httpClient = new HttpClient(handler);
 
         // Act
         var result = httpClient.SendAsync(_httpRequestMessage, default).Result;
 
         // Assert
         Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
     }
 
     [Test]
@@ -55,18 +55,18 @@
         // Arrange
         _mockInnerHandler.Send(Arg.Any<HttpRequestMessage>(), Arg.Any<CancellationToken>())
                          .Returns(
-                             _=> throw new HttpRequestException(HttpRequestError.ConnectionError), 
-                             _=>  Task.FromResult(new HttpResponseMessage { StatusCode = HttpStatusCode.OK })
+                             _ => throw new HttpRequestException(HttpRequestError.ConnectionError),
+                             _ => Task.FromResult(new HttpResponseMessage { StatusCode = HttpStatusCode.OK })
                         );
 
-        var handler = new GithubRetryHandler(_mockInnerHandler, _config, _logger);
+        var handler = new GithubRetryHandler(_config, _logger) { InnerHandler = _mockInnerHandler };
         var httpClient = new HttpClient(handler);
 
         // Act
         var result = httpClient.SendAsync(_httpRequestMessage, default).Result;
 
         // Assert
         Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
     }
 
     [Test]
@@ -87,7 +87,7 @@
         _mockInnerHandler.Send(Arg.Any<HttpRequestMessage>(), Arg.Any<CancellationToken>())
                          .Returns(response1, response2);
 
-        var handler = new GithubRetryHandler(_mockInnerHandler, _config, _logger);
+        var handler = new GithubRetryHandler(_config, _logger) { InnerHandler = _mockInnerHandler };
         var httpClient = new HttpClient(handler);
 
         // Act
@@ -108,7 +108,7 @@
 
         _gitHubConfig.MaxRetryAttempt = 2;
 
-        var handler = new GithubRetryHandler(_mockInnerHandler, _config, _logger);
+        var handler = new GithubRetryHandler(_config, _logger) { InnerHandler = _mockInnerHandler };
         var httpClient = new HttpClient(handler);
 
         // Act & Assert
@@ -128,7 +128,7 @@
         return Send(request, cancellationToken);
     }
 
     public virtual Task<HttpResponseMessage> Send(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }

SS14.Labeller.Tests/IntegrationTests.Issue.cs → SS14.Labeller.Tests/IntegrationTests/HandlersTests.Issue.cs

@@ -1,14 +1,14 @@
-using NSubstitute;
-using NUnit.Framework;
-using SS14.Labeller.Models;
-using System.Net;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using NSubstitute;
+using NUnit.Framework;
 using SS14.Labeller.Labelling.Labels;
+using SS14.Labeller.Models;
 
-namespace SS14.Labeller.Tests;
+namespace SS14.Labeller.Tests.IntegrationTests;
 
-public partial class IntegrationTests
+public partial class HandlersTests
 {
     [Test]
     public async Task Issue_Created_AddedUntriagedLabel()

SS14.Labeller.Tests/IntegrationTests.PullRequest.cs → SS14.Labeller.Tests/IntegrationTests/HandlersTests.PullRequest.cs

@@ -1,14 +1,14 @@
-using NSubstitute;
-using NUnit.Framework;
-using SS14.Labeller.Models;
-using System.Net;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using NSubstitute;
+using NUnit.Framework;
 using SS14.Labeller.Labelling.Labels;
+using SS14.Labeller.Models;
 
-namespace SS14.Labeller.Tests;
+namespace SS14.Labeller.Tests.IntegrationTests;
 
-public partial class IntegrationTests
+public partial class HandlersTests
 {
     [Test]
     public async Task PullRequest()

SS14.Labeller.Tests/IntegrationTests.PullRequestReview.cs → SS14.Labeller.Tests/IntegrationTests/HandlersTests.PullRequestReview.cs

@@ -1,14 +1,14 @@
-using NSubstitute;
-using NUnit.Framework;
-using SS14.Labeller.Models;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net;
 using System.Threading;
+using System.Threading.Tasks;
+using NSubstitute;
+using NUnit.Framework;
 using SS14.Labeller.Labelling.Labels;
+using SS14.Labeller.Models;
 
-namespace SS14.Labeller.Tests;
+namespace SS14.Labeller.Tests.IntegrationTests;
 
-public partial class IntegrationTests
+public partial class HandlersTests
 {
 
     [Test]

SS14.Labeller.Tests/IntegrationTests.cs → SS14.Labeller.Tests/IntegrationTests/HandlersTests.cs

@@ -7,10 +7,10 @@
 using NUnit.Framework;
 using SS14.Labeller.Helpers;
 
-namespace SS14.Labeller.Tests;
+namespace SS14.Labeller.Tests.IntegrationTests;
 
 [ExcludeFromCodeCoverage]
-public partial class IntegrationTests
+public partial class HandlersTests
 {
     public const string HookSecret = "asdasdasdasdasdasdasdadsadad";
 

SS14.Labeller.Tests/IntegrationTests/Repository/DiscourseTopicsRepositoryTests.cs

@@ -0,0 +1,67 @@
+using System.Threading.Tasks;
+using Dapper;
+using Microsoft.Extensions.Configuration;
+using Npgsql;
+using NUnit.Framework;
+using SS14.Labeller.Repository;
+
+namespace SS14.Labeller.Tests.IntegrationTests.Repository;
+
+public class DiscourseTopicsRepositoryTests
+{
+    private IDiscourseTopicsRepository _repository;
+
+    [SetUp]
+    public void Setup()
+    {
+        _repository = new DiscourseTopicsRepository(TestSetup.Configuration);
+
+        CleanUpDb();
+    }
+
+    [Test]
+    public async Task HasTopic_NoSuchParamsCombination_IsFalse()
+    {
+        // Arrange
+
+        // Act
+        var actual = await _repository.HasTopic("some-random-owner", "some-random-name", 54353, default);
+
+        // Assert
+        Assert.That(actual, Is.False);
+    }
+
+
+    [Test]
+    public async Task Add_DoesNotExist_IsAdded()
+    {
+        // Arrange
+        const string owner = "some-random-owner";
+        const string repoName = "some-random-name";
+        const int issueNumber = 54353;
+        var before = await _repository.HasTopic(owner, repoName, issueNumber, default);
+
+        // Act
+        await _repository.Add(owner, repoName, issueNumber, 1231, default);
+
+        // Assert
+        var after = await _repository.HasTopic(owner, repoName, issueNumber, default);
+
+        Assert.That(before, Is.False);
+        Assert.That(after, Is.True);
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        CleanUpDb();
+    }
+
+    private static void CleanUpDb()
+    {
+        var connectionString = TestSetup.Configuration.GetConnectionString("Default");
+        using var con = new NpgsqlConnection(connectionString);
+        con.Open();
+        con.Execute("TRUNCATE TABLE discourse.discussions");
+    }
+}

SS14.Labeller.Tests/TestSetup.cs

@@ -0,0 +1,21 @@
+using System.IO;
+using Microsoft.Extensions.Configuration;
+using NUnit.Framework;
+
+namespace SS14.Labeller.Tests;
+
+[SetUpFixture]
+public class TestSetup
+{
+    public static IConfiguration Configuration { get; private set; }
+
+    [OneTimeSetUp]
+    public void RunBeforeAnyTests()
+    {
+        Configuration = new ConfigurationBuilder()
+                        .SetBasePath(Directory.GetCurrentDirectory())
+                        .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                        .AddEnvironmentVariables()
+                        .Build();
+    }
+}

SS14.Labeller.sln

@@ -1,12 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.13.35818.85 d17.13
+VisualStudioVersion = 17.13.35818.85
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SS14.Labeller", "SS14.Labeller\SS14.Labeller.csproj", "{23A01977-7FE4-491F-BBE8-E8C412D8D753}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
 	ProjectSection(SolutionItems) = preProject
+		docker-compose-debug.yml = docker-compose-debug.yml
+		docker-compose.yml = docker-compose.yml
+		Dockerfile = Dockerfile
 		README.md = README.md
 	EndProjectSection
 EndProject