Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

undo PR -#4 core_project_scaffolding commit into main #8

Closed
wants to merge 1 commit into from
Closed
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore dfe.data.SearchPrototype.web/DfE.Data.SearchPrototype.web.sln
run: dotnet restore
- name: Build
run: dotnet build dfe.data.SearchPrototype.web/DfE.Data.SearchPrototype.web.sln --no-restore
run: dotnet --no-restore
- name: Test
run: dotnet test dfe.data.SearchPrototype.web/DfE.Data.SearchPrototype.web.sln --no-build --verbosity normal
run: dotnet --no-build --verbosity normal
36 changes: 0 additions & 36 deletions DfE.Data.SearchPrototype.Test/DfE.Data.SearchPrototype.Test.csproj

This file was deleted.

43 changes: 43 additions & 0 deletions Dfe.Data.SearchPrototype.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35004.147
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dfe.Data.SearchPrototype", "Dfe.Data.SearchPrototype\Dfe.Data.SearchPrototype.csproj", "{18B64406-F4DC-4A8D-9934-6A09F9151A18}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dfe.Data.SearchPrototype.Web", "Dfe.Data.SearchPrototype\Web\Dfe.Data.SearchPrototype.Web.csproj", "{DCFCFF67-DB1A-44C0-8174-799EB05194BD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dfe.Data.SearchPrototype.Tests", "Dfe.Data.SearchPrototype\Tests\Dfe.Data.SearchPrototype.Tests.csproj", "{011C329A-A195-439A-ACED-F20AFF560FE7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dfe.Data.SearchPrototype.Web.Tests", "Dfe.Data.SearchPrototype\Web\Tests\Dfe.Data.SearchPrototype.Web.Tests.csproj", "{650783D2-FCBB-473B-BCBE-5B3E007540FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{18B64406-F4DC-4A8D-9934-6A09F9151A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18B64406-F4DC-4A8D-9934-6A09F9151A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18B64406-F4DC-4A8D-9934-6A09F9151A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18B64406-F4DC-4A8D-9934-6A09F9151A18}.Release|Any CPU.Build.0 = Release|Any CPU
{DCFCFF67-DB1A-44C0-8174-799EB05194BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCFCFF67-DB1A-44C0-8174-799EB05194BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCFCFF67-DB1A-44C0-8174-799EB05194BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCFCFF67-DB1A-44C0-8174-799EB05194BD}.Release|Any CPU.Build.0 = Release|Any CPU
{011C329A-A195-439A-ACED-F20AFF560FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{011C329A-A195-439A-ACED-F20AFF560FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{011C329A-A195-439A-ACED-F20AFF560FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{011C329A-A195-439A-ACED-F20AFF560FE7}.Release|Any CPU.Build.0 = Release|Any CPU
{650783D2-FCBB-473B-BCBE-5B3E007540FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{650783D2-FCBB-473B-BCBE-5B3E007540FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{650783D2-FCBB-473B-BCBE-5B3E007540FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{650783D2-FCBB-473B-BCBE-5B3E007540FE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9A4942D1-651F-41CB-8813-7201597A71C6}
EndGlobalSection
EndGlobal
29 changes: 29 additions & 0 deletions Dfe.Data.SearchPrototype/Dfe.Data.SearchPrototype.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Dfe.Data.SearchPrototype\**" />
<Compile Remove="Tests\**" />
<Compile Remove="Web\**" />
<EmbeddedResource Remove="Dfe.Data.SearchPrototype\**" />
<EmbeddedResource Remove="Tests\**" />
<EmbeddedResource Remove="Web\**" />
<None Remove="Dfe.Data.SearchPrototype\**" />
<None Remove="Tests\**" />
<None Remove="Web\**" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Class1.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DfE.Data.ComponentLibrary.CleanArchitecture" Version="2.0.37-beta-CI-20240610-104522" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using Dfe.Data.SearchPrototype.Search.Domain;

namespace Dfe.Data.SearchPrototype.Search.Application.Services
{
public interface ISearchService
{
Task<SearchResults> SearchByKeyword(string keyword);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Dfe.Data.SearchPrototype.Search.Application.UseCases.SearchByKeyword
{
public sealed class SearchByKeywordRequest
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Dfe.Data.SearchPrototype.Search.Application.UseCases.SearchByKeyword
{
public class SearchByKeywordResponse
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Dfe.Data.SearchPrototype.Search.Application.Services;
using DfE.Data.ComponentLibrary.CleanArchitecture.CleanArchitecture.Application.UseCase;

namespace Dfe.Data.SearchPrototype.Search.Application.UseCases.SearchByKeyword
{
public sealed class SearchByKeywordUseCase : IUseCase<SearchByKeywordRequest, SearchByKeywordResponse>
{
private readonly ISearchService _searchService;

public SearchByKeywordUseCase(ISearchService searchService)
{
_searchService = searchService;
}

public Task<SearchByKeywordResponse> HandleRequest(SearchByKeywordRequest request)
{
throw new NotImplementedException();
}
}
}
6 changes: 6 additions & 0 deletions Dfe.Data.SearchPrototype/Search/Domain/SearchResults.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Dfe.Data.SearchPrototype.Search.Domain
{
public sealed class SearchResults // aggregate root??
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Dfe.Data.SearchPrototype.Tests\**" />
<EmbeddedResource Remove="Dfe.Data.SearchPrototype.Tests\**" />
<None Remove="Dfe.Data.SearchPrototype.Tests\**" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Dfe.Data.SearchPrototype.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="FluentAssertions" Version="7.0.0-alpha.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Dfe.Data.SearchPrototype.Tests.Search.Application.UseCases.SearchByKeyword
{
public sealed class SearchByKeywordUseCaseTests
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Dfe.Data.SearchPrototype.Tests.Search.Domain
{
public sealed class SearchResultsTests
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>data.search_prototype.web</RootNamespace>
<RootNamespace>Dfe.Data.SearchPrototype.Web</RootNamespace>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Tests\**" />
<Content Remove="Tests\**" />
<EmbeddedResource Remove="Tests\**" />
<None Remove="Tests\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="GovUk.Frontend.AspNetCore" Version="2.1.0-rc" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public class ErrorViewModel

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

app.Run();

public partial class Program { }
public partial class Program { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Unit\**" />
<EmbeddedResource Remove="Unit\**" />
<None Remove="Unit\**" />
</ItemGroup>

<ItemGroup>
<Folder Include="Integration\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" Version="1.1.2" />
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="WireMock.Net" Version="1.5.58" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Dfe.Data.SearchPrototype.Web.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

<ItemGroup>
<None Update="xunit.runner.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,23 @@
</a>
</div>
<div class="govuk-header__content">
<a class="govuk-header__link govuk-header__service-name" asp-controller="Home" asp-action="Index">Search prototype</a>
<a class="govuk-header__link govuk-header__service-name" asp-controller="Home" asp-action="Index">
Search prototype
</a>
<nav aria-label="Menu" class="govuk-header__navigation">
<button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" hidden>Menu</button>
<button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" hidden>
Menu
</button>
<ul id="navigation" class="govuk-header__navigation-list">
<li class="govuk-header__navigation-item govuk-header__navigation-item--active">
<a class="govuk-header__link" asp-controller="Home" asp-action="Index">Home</a>
<a class="govuk-header__link" asp-controller="Home" asp-action="Index">
Home
</a>
</li>
<li class="govuk-header__navigation-item">
<a class="govuk-header__link" asp-controller="Home" asp-action="Privacy">Privacy</a>
<a class="govuk-header__link" asp-controller="Home" asp-action="Privacy">
Privacy
</a>
</li>
</ul>
</nav>
Expand Down
31 changes: 0 additions & 31 deletions dfe.data.SearchPrototype.web/DfE.Data.SearchPrototype.web.sln

This file was deleted.

Loading