Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./NoteBookmark.Api/Dockerfile
file: ./src/NoteBookmark.Api/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta-api.outputs.tags }}
labels: ${{ steps.meta-api.outputs.labels }}
Expand All @@ -66,7 +66,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./NoteBookmark.BlazorApp/Dockerfile
file: ./src/NoteBookmark.BlazorApp/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta-blazor.outputs.tags }}
labels: ${{ steps.meta-blazor.outputs.labels }}
226 changes: 0 additions & 226 deletions NoteBookmark.Api.Tests/Endpoints/SummaryEndpointsTests.cs
Original file line number Diff line number Diff line change
@@ -1,226 +0,0 @@
using FluentAssertions;
using NoteBookmark.Api.Tests.Fixtures;
using NoteBookmark.Domain;
using System.Net;
using System.Net.Http.Json;
using System.Text;
using Xunit;

namespace NoteBookmark.Api.Tests.Endpoints;

public class SummaryEndpointsTests : IClassFixture<NoteBookmarkApiTestFactory>
{
private readonly NoteBookmarkApiTestFactory _factory;
private readonly HttpClient _client;

public SummaryEndpointsTests(NoteBookmarkApiTestFactory factory)
{
_factory = factory;
_client = _factory.CreateClient();
}

[Fact]
public async Task GetSummaries_ReturnsAllSummaries()
{
// Arrange
await SeedTestSummaries();

// Act
var response = await _client.GetAsync("/api/summary/");

// Assert
response.StatusCode.Should().Be(HttpStatusCode.OK);

var summaries = await response.Content.ReadFromJsonAsync<List<Summary>>();
summaries.Should().NotBeNull();
summaries.Should().NotBeEmpty();
}

[Fact]
public async Task SaveSummary_WithValidSummary_ReturnsCreated()
{
// Arrange
var testSummary = CreateTestSummary();

// Act
var response = await _client.PostAsJsonAsync("/api/summary/summary", testSummary);

// Assert
response.StatusCode.Should().Be(HttpStatusCode.Created);
var createdSummary = await response.Content.ReadFromJsonAsync<Summary>();
createdSummary.Should().NotBeNull();
createdSummary!.RowKey.Should().Be(testSummary.RowKey);
createdSummary.Title.Should().Be(testSummary.Title);
}

[Fact]
public async Task SaveSummary_WithInvalidSummary_ReturnsBadRequest()
{
// Arrange
var invalidSummary = new Summary
{
PartitionKey = "summaries",
RowKey = "invalid-summary"
}; // Missing required fields

// Act
var response = await _client.PostAsJsonAsync("/api/summary/summary", invalidSummary);

// Assert
response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
}

[Fact]
public async Task GetReadingNotes_WhenExists_ReturnsOkWithReadingNotes()
{
// Arrange
var readingNotes = CreateTestReadingNotes();
await SeedReadingNotes(readingNotes);

// Act
var response = await _client.GetAsync($"/api/summary/{readingNotes.Number}");

// Assert
response.StatusCode.Should().Be(HttpStatusCode.OK);

var retrievedReadingNotes = await response.Content.ReadFromJsonAsync<ReadingNotes>();
retrievedReadingNotes.Should().NotBeNull();
retrievedReadingNotes!.Number.Should().Be(readingNotes.Number);
retrievedReadingNotes.Title.Should().Be(readingNotes.Title);
}

[Fact]
public async Task GetReadingNotes_WhenDoesNotExist_ReturnsNotFound()
{
// Arrange
var nonExistentNumber = "999";

// Act
var response = await _client.GetAsync($"/api/summary/{nonExistentNumber}");

// Assert
response.StatusCode.Should().Be(HttpStatusCode.NotFound);
}

[Fact]
public async Task SaveReadingNotesMarkdown_WithValidMarkdown_ReturnsOkWithUrl()
{
// Arrange
var number = "456";
var markdown = "# Test Reading Notes\n\nThis is test markdown content.\n\n## Summary\n\nTest summary here.";
var content = new StringContent(markdown, Encoding.UTF8, "text/plain");

// Act
var response = await _client.PostAsync($"/api/summary/{number}/markdown", content);

// Assert
response.StatusCode.Should().Be(HttpStatusCode.OK);

var resultUrl = await response.Content.ReadAsStringAsync();
resultUrl.Should().NotBeNullOrEmpty();
resultUrl.Should().Contain($"readingnotes-{number}.md");
}

[Fact]
public async Task SaveReadingNotesMarkdown_WithEmptyMarkdown_ReturnsBadRequest()
{
// Arrange
var number = "789";
var content = new StringContent("", Encoding.UTF8, "text/plain");

// Act
var response = await _client.PostAsync($"/api/summary/{number}/markdown", content);

// Assert
response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
}

[Fact]
public async Task SaveSummary_ThenGetSummaries_IncludesNewSummary()
{
// Arrange
var testSummary = CreateTestSummary();

// Act - Save summary
var saveResponse = await _client.PostAsJsonAsync("/api/summary/summary", testSummary);
saveResponse.EnsureSuccessStatusCode();

// Act - Get all summaries
var getResponse = await _client.GetAsync("/api/summary/");

// Assert
getResponse.StatusCode.Should().Be(HttpStatusCode.OK);

var summaries = await getResponse.Content.ReadFromJsonAsync<List<Summary>>();
summaries.Should().NotBeNull();
summaries.Should().Contain(s => s.RowKey == testSummary.RowKey);
}

[Fact]
public async Task SaveSummary_ExistingSummary_UpdatesSuccessfully()
{
// Arrange
var testSummary = CreateTestSummary();
await _client.PostAsJsonAsync("/api/summary/summary", testSummary);
// Modify the summary
testSummary.Title = "Updated summary content";

// Act
var response = await _client.PostAsJsonAsync("/api/summary/summary", testSummary);

// Assert
response.StatusCode.Should().Be(HttpStatusCode.Created);

// Verify the summary was updated
var summaries = await GetAllSummaries();
var updatedSummary = summaries.FirstOrDefault(s => s.RowKey == testSummary.RowKey);
updatedSummary.Should().NotBeNull();
updatedSummary!.Title.Should().Be("Updated summary content");
}

// Helper methods
private async Task SeedTestSummaries()
{ var summary1 = CreateTestSummary();
summary1.RowKey = "summary-1";
summary1.Id = "100";

var summary2 = CreateTestSummary();
summary2.RowKey = "summary-2";
summary2.Id = "101";

await _client.PostAsJsonAsync("/api/summary/summary", summary1);
await _client.PostAsJsonAsync("/api/summary/summary", summary2);
}

private async Task SeedReadingNotes(ReadingNotes readingNotes)
{
// Save reading notes via the notes endpoint
await _client.PostAsJsonAsync("/api/notes/SaveReadingNotes", readingNotes);
}

private async Task<List<Summary>> GetAllSummaries()
{
var response = await _client.GetAsync("/api/summary/");
response.EnsureSuccessStatusCode();
var summaries = await response.Content.ReadFromJsonAsync<List<Summary>>();
return summaries ?? new List<Summary>();
} private static Summary CreateTestSummary()
{
return new Summary
{
PartitionKey = "summaries",
RowKey = Guid.NewGuid().ToString(),
Id = "123",
Title = "Test summary content for reading notes 123.",
FileName = "readingnotes-123.json"
}; }

private static ReadingNotes CreateTestReadingNotes()
{
return new ReadingNotes("456")
{
Title = "Test Reading Notes for Summary",
Intro = "Test description for summary endpoint testing"
};
}
}
22 changes: 0 additions & 22 deletions NoteBookmark.Api/Dockerfile

This file was deleted.

14 changes: 7 additions & 7 deletions NoteBookmark.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.2.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoteBookmark.Api", "NoteBookmark.Api\NoteBookmark.Api.csproj", "{482A0C21-91F3-4B77-B8CD-E1241D33B40D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoteBookmark.Api", "src\NoteBookmark.Api\NoteBookmark.Api.csproj", "{482A0C21-91F3-4B77-B8CD-E1241D33B40D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.ServiceDefaults", "NoteBookmark.ServiceDefaults\NoteBookmark.ServiceDefaults.csproj", "{B3C00A0B-AFF2-4CF2-8A24-98430BC0206B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.ServiceDefaults", "src\NoteBookmark.ServiceDefaults\NoteBookmark.ServiceDefaults.csproj", "{B3C00A0B-AFF2-4CF2-8A24-98430BC0206B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AppHost", "NoteBookmark.AppHost\NoteBookmark.AppHost.csproj", "{49440529-42B9-497D-8F2F-D0A2DE20253E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AppHost", "src\NoteBookmark.AppHost\NoteBookmark.AppHost.csproj", "{49440529-42B9-497D-8F2F-D0A2DE20253E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.Domain", "NoteBookmark.Domain\NoteBookmark.Domain.csproj", "{204E2DC3-7131-4D7C-BA02-68AD272F9C58}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.Domain", "src\NoteBookmark.Domain\NoteBookmark.Domain.csproj", "{204E2DC3-7131-4D7C-BA02-68AD272F9C58}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.BlazorApp", "NoteBookmark.BlazorApp\NoteBookmark.BlazorApp.csproj", "{91470C33-E926-409D-8C0B-3647D7D5848B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.BlazorApp", "src\NoteBookmark.BlazorApp\NoteBookmark.BlazorApp.csproj", "{91470C33-E926-409D-8C0B-3647D7D5848B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.Api.Tests", "NoteBookmark.Api.Tests\NoteBookmark.Api.Tests.csproj", "{3DBF1970-A8DA-44E2-8AE8-0858F0269382}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.Api.Tests", "src\NoteBookmark.Api.Tests\NoteBookmark.Api.Tests.csproj", "{3DBF1970-A8DA-44E2-8AE8-0858F0269382}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AIServices", "NoteBookmark.AIServices\NoteBookmark.AIServices.csproj", "{D29D80A5-82EC-4350-B738-96BAF88EB9DD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AIServices", "src\NoteBookmark.AIServices\NoteBookmark.AIServices.csproj", "{D29D80A5-82EC-4350-B738-96BAF88EB9DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ name: NoteBookmark
services:
app:
language: dotnet
project: ./NoteBookmark.AppHost/NoteBookmark.AppHost.csproj
project: ./src/NoteBookmark.AppHost/NoteBookmark.AppHost.csproj
host: containerapp
4 changes: 2 additions & 2 deletions docker-compose/build-and-push.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Write-Host "Building and pushing Docker images for NoteBookmark..." -ForegroundC

# Build API image
Write-Host "Building API image..." -ForegroundColor Yellow
docker build -f ../NoteBookmark.Api/Dockerfile -t "$DockerHubUsername/notebookmark-api:$ApiTag" ..
docker build -f ../src/NoteBookmark.Api/Dockerfile -t "$DockerHubUsername/notebookmark-api:$ApiTag" ..

if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to build API image"
Expand All @@ -22,7 +22,7 @@ if ($LASTEXITCODE -ne 0) {

# Build Blazor App image
Write-Host "Building Blazor App image..." -ForegroundColor Yellow
docker build -f ../NoteBookmark.BlazorApp/Dockerfile -t "$DockerHubUsername/notebookmark-blazor:$BlazorTag" ..
docker build -f ../src/NoteBookmark.BlazorApp/Dockerfile -t "$DockerHubUsername/notebookmark-blazor:$BlazorTag" ..

if ($LASTEXITCODE -ne 0) {
Write-Error "Failed to build Blazor App image"
Expand Down
File renamed without changes.
Loading