diff --git a/src/.idea/.idea.comissions.app/.idea/.gitignore b/src/.idea/.idea.comissions.app/.idea/.gitignore index f197dd4..1b03bb1 100644 --- a/src/.idea/.idea.comissions.app/.idea/.gitignore +++ b/src/.idea/.idea.comissions.app/.idea/.gitignore @@ -11,3 +11,5 @@ # Datasource local storage ignored files /dataSources/ /dataSources.local.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/src/.idea/.idea.comissions.app/.idea/indexLayout.xml b/src/.idea/.idea.comissions.app/.idea/indexLayout.xml index 7b08163..7c4e9b1 100644 --- a/src/.idea/.idea.comissions.app/.idea/indexLayout.xml +++ b/src/.idea/.idea.comissions.app/.idea/indexLayout.xml @@ -1,7 +1,9 @@ - + + ../../../../Development + diff --git a/src/.idea/.idea.comissions.app/.idea/vcs.xml b/src/.idea/.idea.comissions.app/.idea/vcs.xml index 6c0b863..2a90a69 100644 --- a/src/.idea/.idea.comissions.app/.idea/vcs.xml +++ b/src/.idea/.idea.comissions.app/.idea/vcs.xml @@ -1,6 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs b/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs index 05c92d7..d712723 100644 --- a/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs +++ b/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs @@ -36,7 +36,7 @@ public class AdminArtistRequestsController : Controller [HttpGet] public async Task GetArtistRequests(int offset = 0, int pageSize = 10) { - var requests = _dbContext.ArtistRequests.OrderByDescending(x=>x.Id).Skip(offset).Take(pageSize).ToList(); + var requests = _dbContext.ArtistRequests.Include(x=>x.User).OrderByDescending(x=>x.Id).Skip(offset).Take(pageSize).ToList(); var result = requests.Select(x=>x.ToModel()).ToList(); return Ok(result); } @@ -73,7 +73,7 @@ public class AdminArtistRequestsController : Controller [Route("{requestId:int}")] public async Task AcceptArtistRequest(int requestId) { - var request = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.Id==requestId); + var request = await _dbContext.ArtistRequests.Include(x=>x.User).FirstOrDefaultAsync(request=>request.Id==requestId); if(request==null) return NotFound("No request for that user exists."); diff --git a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs index fe004c6..b526218 100644 --- a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs +++ b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("comissions.app.database.migrator")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+381bc5e8844469bf214194d596b636911956a7d5")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+aaeb7e0919509686e857528d9132e2ca6a7d4b17")] [assembly: System.Reflection.AssemblyProductAttribute("comissions.app.database.migrator")] [assembly: System.Reflection.AssemblyTitleAttribute("comissions.app.database.migrator")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache index d67adfc..d43b473 100644 --- a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache +++ b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache @@ -1 +1 @@ -6cfb6d6c07caaac1b0771125f7ea3e69ff4063637d28b9675056b98fc03ad52a +b9e9dc47a8a6cef6635c3f2217e29cc1b5bcaaaccc3494b376ff4a3fc528b522 diff --git a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.GeneratedMSBuildEditorConfig.editorconfig b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.GeneratedMSBuildEditorConfig.editorconfig index 2b4ded0..82a48dc 100644 --- a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.GeneratedMSBuildEditorConfig.editorconfig +++ b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = comissions.app.database.migrator -build_property.ProjectDir = /home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/ +build_property.ProjectDir = /Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.assets.cache b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.assets.cache index 0f0be70..592575c 100644 Binary files a/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.assets.cache and b/src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.assets.cache differ diff --git a/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.dgspec.json b/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.dgspec.json index d95ed40..21ecdba 100644 --- a/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.dgspec.json +++ b/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj": {} + "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj": {} }, "projects": { - "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj": { + "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", + "projectUniqueName": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", "projectName": "comissions.app.database.migrator", - "projectPath": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", - "packagesPath": "/home/damienostler/.nuget/packages/", - "outputPath": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/obj/", + "projectPath": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", + "packagesPath": "/Users/damienostler/.nuget/packages/", + "outputPath": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/damienostler/.nuget/NuGet/NuGet.Config" + "/Users/damienostler/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -53,7 +53,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.101/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.204/PortableRuntimeIdentifierGraph.json" } } } diff --git a/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.g.props b/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.g.props index ab079a3..5020aa0 100644 --- a/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.g.props +++ b/src/comissions.app.database.migrator/obj/comissions.app.database.migrator.csproj.nuget.g.props @@ -4,12 +4,12 @@ True NuGet $(MSBuildThisFileDirectory)project.assets.json - /home/damienostler/.nuget/packages/ - /home/damienostler/.nuget/packages/ + /Users/damienostler/.nuget/packages/ + /Users/damienostler/.nuget/packages/ PackageReference - 6.8.0 + 6.9.1 - + \ No newline at end of file diff --git a/src/comissions.app.database.migrator/obj/project.assets.json b/src/comissions.app.database.migrator/obj/project.assets.json index d0c8715..8e3f74d 100644 --- a/src/comissions.app.database.migrator/obj/project.assets.json +++ b/src/comissions.app.database.migrator/obj/project.assets.json @@ -8,19 +8,19 @@ "net8.0": [] }, "packageFolders": { - "/home/damienostler/.nuget/packages/": {} + "/Users/damienostler/.nuget/packages/": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", + "projectUniqueName": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", "projectName": "comissions.app.database.migrator", - "projectPath": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", - "packagesPath": "/home/damienostler/.nuget/packages/", - "outputPath": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/obj/", + "projectPath": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", + "packagesPath": "/Users/damienostler/.nuget/packages/", + "outputPath": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/damienostler/.nuget/NuGet/NuGet.Config" + "/Users/damienostler/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -59,7 +59,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.101/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/8.0.204/PortableRuntimeIdentifierGraph.json" } } } diff --git a/src/comissions.app.database.migrator/obj/project.nuget.cache b/src/comissions.app.database.migrator/obj/project.nuget.cache index 8caf352..42c6307 100644 --- a/src/comissions.app.database.migrator/obj/project.nuget.cache +++ b/src/comissions.app.database.migrator/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "p6/TmQt8oPLBfkrUB0/+oeF4I+uCaGsmlKWtxmA4Oq0iVRVhQZsGo99kQPglNxokTW1dwmB3FoYOmbyKdtutrg==", + "dgSpecHash": "8FbkztmnlsInCtgIxUaqACvD72GyqCwHeEUrfaBt/0to2N+uGQ18blqmDMr3GFlYztOpUURm3k3UQnidHb/m2Q==", "success": true, - "projectFilePath": "/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", + "projectFilePath": "/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/src/comissions.app.database.migrator/obj/project.packagespec.json b/src/comissions.app.database.migrator/obj/project.packagespec.json index 3d6b419..38384e3 100644 --- a/src/comissions.app.database.migrator/obj/project.packagespec.json +++ b/src/comissions.app.database.migrator/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj","projectName":"comissions.app.database.migrator","projectPath":"/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj","outputPath":"/home/damienostler/Documents/Github Repositories/comissions.app/core-api/src/comissions.app.database.migrator/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net8.0":{"targetAlias":"net8.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/share/dotnet/sdk/8.0.101/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj","projectName":"comissions.app.database.migrator","projectPath":"/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/comissions.app.database.migrator.csproj","outputPath":"/Users/damienostler/Documents/Development/Personal/core-api/src/comissions.app.database.migrator/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net8.0":{"targetAlias":"net8.0","imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/local/share/dotnet/sdk/8.0.204/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/src/comissions.app.database.migrator/obj/rider.project.model.nuget.info b/src/comissions.app.database.migrator/obj/rider.project.model.nuget.info index 92fdbc6..2bf5ccb 100644 --- a/src/comissions.app.database.migrator/obj/rider.project.model.nuget.info +++ b/src/comissions.app.database.migrator/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17089118002979834 \ No newline at end of file +17136744781404725 \ No newline at end of file diff --git a/src/comissions.app.database.migrator/obj/rider.project.restore.info b/src/comissions.app.database.migrator/obj/rider.project.restore.info index 92fdbc6..5072c4b 100644 --- a/src/comissions.app.database.migrator/obj/rider.project.restore.info +++ b/src/comissions.app.database.migrator/obj/rider.project.restore.info @@ -1 +1 @@ -17089118002979834 \ No newline at end of file +17136747318225640 \ No newline at end of file