damien/comissions-app-core-api
1
0
Fork 0
mirror of https://github.com/D4M13N-D3V/comissions-app-core-api.git synced 2025-03-13 01:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix

Browse Source
This commit is contained in:
Damien Ostler 2024-06-15 03:10:24 -04:00
parent 607a69448c
commit 493074f671
68 changed files with 383 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

285
.github/workflows/build-image.yml vendored
View File

@ -1,55 +1,268 @@
name: build-image
#name: build-image
#on:
# push:
# branches: [main]
#
#jobs:
# build-image:
# runs-on: [ubuntu-latest]
# env:
# DOTNET_INSTALL_DIR: "/home/runner"
# permissions:
# contents: write
# packages: write
# steps:
# - name: 'Cleanup build folder'
# run: |
# rm ./* -r || true
# rm ./.??* -r || true
#
# - uses: actions/setup-dotnet@v3
# with:
# dotnet-version: 8.0.x
#
# - name: Set up GitVersion
# uses: gittools/actions/gitversion/setup@v0.9.15
# with:
# versionSpec: '5.x'
#
# - name: Checkout code
# uses: actions/checkout@v3
# with:
# fetch-depth: 0
#
# - name: Execute GitVersion
# uses: gittools/actions/gitversion/execute@v0.9.15
# with:
# useConfigFile: true
# configFilePath: GitVersion.yml
#
# - name: login into registry
# run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u $ --password-stdin
#
# - name: Build image
# env:
# dockerfile: ./src/comissions.app.api/Dockerfile
# docker_image_name: ghcr.io/comissions-app/core-api
# run: |
# docker build --build-arg NUGET_SOURCE=https://nuget.pkg.github.com/data443/index.json --build-arg NUGET_API_KEY=${{ secrets.PACKAGE_TOKEN }} -t ${{ env.docker_image_name }}:${{ env.GitVersion_MajorMinorPatch }} -f ${{ env.dockerfile }} --force-rm .
# docker tag ${{ env.docker_image_name }}:${{ env.GitVersion_MajorMinorPatch }} ${{ env.docker_image_name }}:latest
# docker push --all-tags ${{ env.docker_image_name }}
#
# - name: Tag branch
# run: |
# git tag ${{ env.GitVersion_MajorMinorPatch }}
# git push origin ${{ env.GitVersion_MajorMinorPatch }}
name: on-push
on:
push:
branches: [main]
branches:
- 'main'
jobs:
gitversion:
runs-on: ubuntu-latest
outputs:
semantic_version: ${{ steps.result.outputs.semver }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: gittools/actions/gitversion/setup@v1.1.1
with:
versionSpec: '5.x'
- uses: gittools/actions/gitversion/execute@v1.1.1
with:
useConfigFile: true
configFilePath: GitVersion.yml
- name: set output
id: result
run: echo "semver=$GitVersion_SemVer" >> "$GITHUB_OUTPUT"
- name: Tag branch
run: |
git tag $GitVersion_SemVer
git push origin $GitVersion_SemVer
build-cs-sdk:
runs-on: ubuntu-latest
needs: gitversion
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Set Version
id: update
uses: vers-one/dotnet-project-version-updater@v1.6
with:
file: "src/comissions.app.sdk/comissions.app.sdk.csproj"
version: ${{ needs.gitversion.outputs.semantic_version }}
- name: Authorize NuGet Source
uses: StirlingLabs/GithubNugetAuthAction@main
with:
owner: data443
name: Data443
token: ${{secrets.DATA443_PACKAGE_SECRET}}
- name: Build SDK
run: dotnet build ./src/comissions.app.sdk/comissions.app.sdk.csproj --configuration Release -p:Version=${{needs.gitversion.outputs.semantic_version}}
- name: Push SDK
run: dotnet nuget push src/comissions.app.sdk/bin/Release/**/*.nupkg --skip-duplicate -s "https://nuget.pkg.github.com/data443/index.json" --api-key ${{secrets.GITHUB_TOKEN}}
build-js-sdk-build:
runs-on: ubuntu-latest
needs: gitversion
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Generate Swagger JSON
run: dotnet build ./src/comissions.app.api/comissions.app.api.csproj --configuration Release
- name: Generate code
uses: hatamiarash7/openapi-generator@v0.2.0
with:
generator: javascript
openapi-file: src/comissions.app.sdk/swagger.json
output-dir: ./javascript-client/
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: 'https://npm.pkg.github.com'
node-auth-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Install Babel"
run: npm install @babel/core @babel/cli @babel/preset-env @babel/plugin-proposal-class-properties @babel/plugin-proposal-json-strings @babel/plugin-proposal-decorators @babel/plugin-proposal-function-sent
- name: Install dependencies
run: |
cd javascript-client
npm install
- name: Update dependencies
run: |
cd javascript-client
npm update
- name: Run Tests
run: |
cd javascript-client
npm test
- name: Update my-file.json description
uses: jossef/action-set-json-field@v2.1
with:
file: javascript-client/package.json
field: name
value: "@D4M13N-D3V/comissions.app.sdk"
- name: 'Change vVersion'
uses: reedyuk/npm-version@1.1.1
with:
version: '${{needs.gitversion.outputs.semantic_version}}'
package: 'javascript-client/'
git-tag-version: 'false'
- uses: JS-DevTools/npm-publish@v3
with:
package : javascript-client/
token: ${{ secrets.GITHUB_TOKEN }}
registry: "https://npm.pkg.github.com"
- name: Create Release
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: actions/create-release@v1
with:
tag_name: v${{ needs.gitversion.outputs.semantic_version }}
release_name: SDK
draft: false
prerelease: false
body: Release of SDK version ${{ needs.gitversion.outputs.semantic_version }}
- name: Zip JavaScript client folder
run: zip -r dim.api.sdk.zip javascript-client
- name: Upload Assets
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dim.api.sdk.zip
asset_name: documentation_and_source_code.zip
asset_content_type: application/zip
- name: Delete unnecessary files in javascript-client folder
run: |
find javascript-client -type f ! -name "*.md" -delete
- name: Rename .md files to .html
run: |
find javascript-client -type f -name "*.md" -exec bash -c 'mv "$0" "${0%.md}.html"' {} \;
- name: Add script tag to HTML files
run: |
find javascript-client -type f -name "*.html" -exec sed -i '1i<script src="https://rawcdn.githack.com/oscarmorrison/md-page/master/md-page.js"></script><noscript>' {} \;
- name: Rename readme.html to index.html
run: |
mv javascript-client/README.html javascript-client/index.html
- name: Replace .md with .html in index.html
run: |
sed -i 's/\.md/\.html/g' javascript-client/index.html
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: javascript-client
publish_branch: gh-pages
enable_jekyll: false
enable_html: true
ext: md
build-image:
runs-on: [ubuntu-latest]
env:
DOTNET_INSTALL_DIR: "/home/runner"
permissions:
contents: write
packages: write
runs-on: ubuntu-latest
needs: gitversion
strategy:
matrix:
platform: [amd64, arm64]
steps:
- name: 'Cleanup build folder'
run: |
rm ./* -r || true
rm ./.??* -r || true
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
- name: Set up GitVersion
uses: gittools/actions/gitversion/setup@v0.9.15
with:
versionSpec: '5.x'
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Execute GitVersion
uses: gittools/actions/gitversion/execute@v0.9.15
with:
useConfigFile: true
configFilePath: GitVersion.yml
- name: login into registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u $ --password-stdin
- name: Build image
env:
dockerfile: ./src/comissions.app.api/Dockerfile
docker_image_name: ghcr.io/comissions-app/core-api
docker_image_name: ghcr.io/comissions-app/comissions-api-${{ matrix.platform }}
run: |
docker build --build-arg NUGET_SOURCE=https://nuget.pkg.github.com/data443/index.json --build-arg NUGET_API_KEY=${{ secrets.PACKAGE_TOKEN }} -t ${{ env.docker_image_name }}:${{ env.GitVersion_MajorMinorPatch }} -f ${{ env.dockerfile }} --force-rm .
docker tag ${{ env.docker_image_name }}:${{ env.GitVersion_MajorMinorPatch }} ${{ env.docker_image_name }}:latest
docker build --build-arg NUGET_SOURCE=https://nuget.pkg.github.com/data443/index.json --build-arg NUGET_API_KEY=${{ secrets.PACKAGE_TOKEN }} --platform linux/${{ matrix.platform }} -t ${{ env.docker_image_name }}:${{ env.GitVersion_MajorMinorPatch }} -f ${{ env.dockerfile }} --force-rm .
docker tag ${{ env.docker_image_name }}:${{ needs.gitversion.outputs.semantic_version }} ${{ env.docker_image_name }}:latest
docker push --all-tags ${{ env.docker_image_name }}
- name: Tag branch
run: |
git tag ${{ env.GitVersion_MajorMinorPatch }}
git push origin ${{ env.GitVersion_MajorMinorPatch }}
git tag ${{ needs.gitversion.outputs.semantic_version }}
git push origin ${{ needs.gitversion.outputs.semantic_version }}

BIN
src/.DS_Store vendored Normal file
View File

Binary file not shown.

2
src/.idea/.idea.comissions.app/.idea/aws.xml generated
View File

@ -15,6 +15,6 @@
</option>
</component>
<component name="explorerToolWindow">
<option name="selectedTab" value="Amazon Q + CodeWhisperer" />
<option name="selectedTab" value="Explorer" />
</component>
</project>

1
src/.idea/.idea.comissions.app/.idea/indexLayout.xml generated
View File

@ -3,6 +3,7 @@
<component name="UserContentModel">
<attachedFolders>
<Path>../../../../Development</Path>
<Path>../../core-api</Path>
</attachedFolders>
<explicitIncludes />
<explicitExcludes />

8
src/.idea/.idea.comissions.app/.idea/vcs.xml generated
View File

@ -3,13 +3,21 @@
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../../../Data443/File-Transformation-Api" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/aws-argocd-dim" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim-ingest" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_api" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_connectors" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_document_api" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_etl" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_export" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_provision" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/dim_search" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/keycloak_box" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/keycloak_box_provider" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../Data443/neroshitron" vcs="Git" />
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../neroshitron" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../project_brazier" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../supabase" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../ui" vcs="Git" />
</component>
</project>

4
src/comissions.app.api/ApplicationDatabaseConfigurationModel.cs
View File

@ -1,7 +1,5 @@
using Microsoft.Extensions.Configuration;
namespace comissions.app.database;
namespace comissions.app.api;
public class ApplicationDatabaseConfigurationModel
{

4
src/comissions.app.api/ApplicationDbContext.cs
View File

@ -1,8 +1,8 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
using Microsoft.EntityFrameworkCore;
using Npgsql;
namespace comissions.app.database;
namespace comissions.app.api;
public class ApplicationDbContext:DbContext
{

9
src/comissions.app.api/Controllers/Admin/AdminArtistsController.cs
View File

@ -1,13 +1,10 @@
using comissions.app.api.Extensions;
using comissions.app.database;
using comissions.app.database.Models.Admin;
using comissions.app.database.Models.Request;
using comissions.app.api.Models.Admin;
using comissions.app.api.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
namespace comissions.app.api.Controllers;
namespace comissions.app.api.Controllers.Admin;
[ApiController]
[Authorize("admin")]

9
src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs
View File

@ -1,16 +1,15 @@
using comissions.app.api.Entities;
using comissions.app.api.Extensions;
using comissions.app.api.Models.ArtistRequest;
using comissions.app.api.Models;
using comissions.app.api.Models.SellerProfileRequest;
using comissions.app.api.Services.Payment;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Novu;
using Novu.DTO.Events;
namespace comissions.app.api.Controllers;
namespace comissions.app.api.Controllers.Admin;
[ApiController]
[Authorize("admin")]

10
src/comissions.app.api/Controllers/Admin/AdminUsersController.cs
View File

@ -1,13 +1,11 @@
using comissions.app.api.Extensions;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models.Admin;
using comissions.app.database.Models.Request;
using comissions.app.api.Entities;
using comissions.app.api.Models.Admin;
using comissions.app.api.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
namespace comissions.app.api.Controllers;
namespace comissions.app.api.Controllers.Admin;
[ApiController]
[Authorize("admin")]

9
src/comissions.app.api/Controllers/ArtistAccessRequestController.cs
View File

@ -1,13 +1,10 @@
using comissions.app.api.Entities;
using comissions.app.api.Extensions;
using comissions.app.api.Models;
using comissions.app.api.Models.PortfolioModel;
using comissions.app.api.Models.Artist;
using comissions.app.api.Models.ArtistRequest;
using comissions.app.api.Models.SellerProfileRequest;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

8
src/comissions.app.api/Controllers/ArtistController.cs
View File

@ -1,13 +1,9 @@
using comissions.app.api.Extensions;
using comissions.app.api.Models.PortfolioModel;
using comissions.app.api.Models.Artist;
using comissions.app.api.Models.ArtistRequest;
using comissions.app.api.Models.SellerProfile;
using comissions.app.api.Models.SellerProfileRequest;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

3
src/comissions.app.api/Controllers/ArtistPageController.cs
View File

@ -1,8 +1,7 @@
using comissions.app.api.Extensions;
using comissions.app.api.Models.Artist;
using comissions.app.api.Models.SellerProfile;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

6
src/comissions.app.api/Controllers/ArtistPaymentController.cs
View File

@ -1,10 +1,8 @@
using comissions.app.api.Extensions;
using comissions.app.api.Models.Artist;
using comissions.app.api.Models;
using comissions.app.api.Models.SellerProfile;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

3
src/comissions.app.api/Controllers/ArtistPortfolioController.cs
View File

@ -1,9 +1,8 @@
using comissions.app.api.Entities;
using comissions.app.api.Extensions;
using comissions.app.api.Models.PortfolioModel;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

5
src/comissions.app.api/Controllers/ArtistRequestsController.cs
View File

@ -1,9 +1,8 @@
using comissions.app.api.Entities;
using comissions.app.api.Extensions;
using comissions.app.api.Models.Request;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

4
src/comissions.app.api/Controllers/ArtistReviewsController.cs
View File

@ -1,9 +1,7 @@
using comissions.app.api.Extensions;
using comissions.app.api.Models.Artist;
using comissions.app.api.Models.Request;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

6
src/comissions.app.api/Controllers/CustomerRequestsController.cs
View File

@ -1,10 +1,8 @@
using comissions.app.api.Entities;
using comissions.app.api.Extensions;
using comissions.app.api.Models.Request;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Enums;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

8
src/comissions.app.api/Controllers/DiscoveryController.cs
View File

@ -1,10 +1,8 @@
using comissions.app.api.Models.Artist;
using comissions.app.api.Models;
using comissions.app.api.Models.PortfolioModel;
using comissions.app.api.Models.Request;
using comissions.app.api.Models.SellerProfile;
using comissions.app.api.Services.Storage;
using comissions.app.database;
using comissions.app.database.Entities;
using comissions.app.database.Models;
using comissions.app.database.Models.Request;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

1
src/comissions.app.api/Controllers/UserController.cs
View File

@ -1,7 +1,6 @@
using System.Security.Claims;
using comissions.app.api.Extensions;
using comissions.app.api.Models.User;
using comissions.app.database;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

2
src/comissions.app.api/Entities/ArtistPageSettings.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class ArtistPageSettings
{

2
src/comissions.app.api/Entities/ArtistPortfolioPiece.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class ArtistPortfolioPiece
{

2
src/comissions.app.api/Entities/ArtistRequest.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class ArtistRequest
{

2
src/comissions.app.api/Entities/ArtistRequestMessage.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class ArtistRequestMessage
{

2
src/comissions.app.api/Entities/Ban.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class Ban
{

2
src/comissions.app.api/Entities/Request.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class Request
{

2
src/comissions.app.api/Entities/RequestAsset.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class RequestAsset
{

2
src/comissions.app.api/Entities/RequestReference.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class RequestReference
{

2
src/comissions.app.api/Entities/Suspension.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public class Suspension
{

2
src/comissions.app.api/Entities/User.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json.Serialization;
using Microsoft.EntityFrameworkCore;
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
[PrimaryKey(nameof(Id))]
public record User

2
src/comissions.app.api/Entities/UserSellerProfile.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace comissions.app.database.Entities;
namespace comissions.app.api.Entities;
public record UserArtist
{

2
src/comissions.app.api/Enums/EnumOrderStatus.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Enums;
namespace comissions.app.api.Enums;
public enum EnumOrderStatus
{

2
src/comissions.app.api/Filters/LoggingFilter.cs
View File

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.Filters;
namespace comissions.app.database.Filters;
namespace comissions.app.api.Filters;
public class LoggingFilter : IActionFilter
{

3
src/comissions.app.api/Middleware/UserMiddleware.cs
View File

@ -1,7 +1,6 @@
using System.Security.Claims;
using comissions.app.api.Entities;
using comissions.app.api.Services.Payment;
using comissions.app.database;
using comissions.app.database.Entities;
using Microsoft.EntityFrameworkCore;
using Novu;
using Novu.Interfaces;

1
src/comissions.app.api/Migrations/20240225210127_Initial.Designer.cs generated
View File

@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using comissions.app.database;
#nullable disable

1
src/comissions.app.api/Migrations/20240228005126_reviews.Designer.cs generated
View File

@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using comissions.app.database;
#nullable disable

1
src/comissions.app.api/Migrations/20240310021457_fix.Designer.cs generated
View File

@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using comissions.app.database;
#nullable disable

1
src/comissions.app.api/Migrations/20240310034454_moarr.Designer.cs generated
View File

@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using comissions.app.database;
#nullable disable

1
src/comissions.app.api/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -4,7 +4,6 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using comissions.app.database;
#nullable disable

6
src/comissions.app.api/Models/Admin/AdminArtistModel.cs
View File

@ -1,6 +1,6 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
namespace comissions.app.database.Models.Admin;
namespace comissions.app.api.Models.Admin;
public class AdminArtistModel
{
@ -22,7 +22,7 @@ public class AdminArtistModel
public int NumberOfPortfolio { get; set; }
public int NumberOfCompleted { get; set; }
public double? AverageRating { get; set; }
public User User { get; set; }
public Entities.User User { get; set; }
}
public static class AdminArtistModelExtensions

6
src/comissions.app.api/Models/Admin/AdminUserModel.cs
View File

@ -1,6 +1,4 @@
using comissions.app.database.Entities;
namespace comissions.app.database.Models.Admin;
namespace comissions.app.api.Models.Admin;
public class AdminUserModel
{
@ -18,7 +16,7 @@ public class AdminUserModel
public static class AdminUserModelExtensions
{
public static AdminUserModel ToAdminUserModel(this User user)
public static AdminUserModel ToAdminUserModel(this Entities.User user)
{
return new AdminUserModel
{

4
src/comissions.app.api/Models/ArtistAccessRequestMessage.cs
View File

@ -1,6 +1,6 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
namespace comissions.app.database.Models;
namespace comissions.app.api.Models;
public class ArtistAccessRequestMessage
{

2
src/comissions.app.api/Models/PayoutModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Models;
namespace comissions.app.api.Models;
public class PayoutModel
{

4
src/comissions.app.api/Models/PenaltyModel.cs
View File

@ -1,6 +1,6 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
namespace comissions.app.database.Models;
namespace comissions.app.api.Models;
public class PenaltyModel
{

2
src/comissions.app.api/Models/PortfolioModel/PortfolioModelExtensions.cs
View File

@ -1,4 +1,4 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
namespace comissions.app.api.Models.PortfolioModel;

4
src/comissions.app.api/Models/Request/RequestCreateModel.cs
View File

@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Mvc;
namespace comissions.app.database.Models.Request;
namespace comissions.app.api.Models.Request;
public class RequestCreateModel
{

2
src/comissions.app.api/Models/Request/RequestImageModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Models.Request;
namespace comissions.app.api.Models.Request;
public class RequestImageModel
{

2
src/comissions.app.api/Models/Request/RequestModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Models.Request;
namespace comissions.app.api.Models.Request;
public class RequestModel
{

2
src/comissions.app.api/Models/Request/RequestModelExtensions.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Models.Request;
namespace comissions.app.api.Models.Request;
public static class RequestModelExtensions
{

2
src/comissions.app.api/Models/Request/RequestReviewModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.database.Models.Request;
namespace comissions.app.api.Models.Request;
public class RequestReviewModel
{

2
src/comissions.app.api/Models/SellerProfile/ArtistOnboardStatusModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public class ArtistOnboardStatusModel
{

2
src/comissions.app.api/Models/SellerProfile/ArtistOnboardUrlModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public class ArtistOnboardUrlModel
{

2
src/comissions.app.api/Models/SellerProfile/ArtistProfileModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public class ArtistModel
{

4
src/comissions.app.api/Models/SellerProfile/ArtistProfileModelExtensions.cs
View File

@ -1,7 +1,7 @@
using comissions.app.api.Entities;
using comissions.app.api.Models.Discovery;
using comissions.app.database.Entities;
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public static class ArtistModelExtensions
{

4
src/comissions.app.api/Models/SellerProfile/ArtistProfilePageSettingsModel.cs
View File

@ -1,6 +1,4 @@
using comissions.app.database.Entities;
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public class ArtistPageSettingsModel
{

4
src/comissions.app.api/Models/SellerProfile/ArtistProfilePageSettingsModelExtensions.cs
View File

@ -1,7 +1,7 @@
using comissions.app.database.Entities;
using comissions.app.api.Entities;
using Newtonsoft.Json;
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public static class ArtistPageSettingsModelExtensions
{

2
src/comissions.app.api/Models/SellerProfile/ArtistStatsModel.cs
View File

@ -1,4 +1,4 @@
namespace comissions.app.api.Models.Artist;
namespace comissions.app.api.Models.SellerProfile;
public class ArtistStatsModel
{

2
src/comissions.app.api/Models/SellerProfileRequest/SellerProfileRequestModel.cs
View File

@ -1,6 +1,6 @@
using comissions.app.api.Models.User;
namespace comissions.app.api.Models.ArtistRequest;
namespace comissions.app.api.Models.SellerProfileRequest;
public class ArtistRequestModel
{

5
src/comissions.app.api/Models/SellerProfileRequest/SellerProfileRequestModelExtensions.cs
View File

@ -1,10 +1,11 @@
using comissions.app.api.Entities;
using comissions.app.api.Models.User;
namespace comissions.app.api.Models.ArtistRequest;
namespace comissions.app.api.Models.SellerProfileRequest;
public static class ArtistRequestModelExtensions
{
public static ArtistRequestModel ToModel(this database.Entities.ArtistRequest sellerProfileRequest)
public static ArtistRequestModel ToModel(this ArtistRequest sellerProfileRequest)
{
return new ArtistRequestModel()
{

4
src/comissions.app.api/Models/User/UserInfoModelExtensions.cs
View File

@ -2,7 +2,7 @@ namespace comissions.app.api.Models.User;
public static class UserInfoModelExtensions
{
public static UserInfoModel ToModel(this database.Entities.User user)
public static UserInfoModel ToModel(this Entities.User user)
{
return new()
{
@ -12,7 +12,7 @@ public static class UserInfoModelExtensions
Email = user.Email
};
}
public static database.Entities.User ToEntity(this UserInfoUpdateModel user, database.Entities.User existingUser)
public static Entities.User ToEntity(this UserInfoUpdateModel user, Entities.User existingUser)
{
existingUser.DisplayName = user.DisplayName;
existingUser.Biography = user.Biography;

4
src/comissions.app.api/Program.cs
View File

@ -5,8 +5,8 @@ using comissions.app.api.Middleware.Authentication;
using comissions.app.api.Services.Payment;
using comissions.app.api.Services.Storage;
using Auth0.AspNetCore.Authentication;
using comissions.app.database;
using comissions.app.database.Filters;
using comissions.app.api;
using comissions.app.api.Filters;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.HttpOverrides;

3
src/comissions.app.api/comissions.app.api.csproj
View File

@ -44,4 +44,7 @@
</Content>
</ItemGroup>
<Target Name="CreateSwaggerJson" AfterTargets="Build">
<Exec Command="dotnet swagger tofile --output ../commissions.app.sdk/swagger.json $(OutputPath)$(AssemblyName).dll v1" WorkingDirectory="$(ProjectDir)" ContinueOnError="true" />
</Target>
</Project>

2
src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs
View File

@ -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+aaeb7e0919509686e857528d9132e2ca6a7d4b17")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+607a69448cce6812b36eca7f356b4bbf838ea658")]
[assembly: System.Reflection.AssemblyProductAttribute("comissions.app.database.migrator")]
[assembly: System.Reflection.AssemblyTitleAttribute("comissions.app.database.migrator")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
b9e9dc47a8a6cef6635c3f2217e29cc1b5bcaaaccc3494b376ff4a3fc528b522
eb92e60c9c30d9c3ed943663cf7d6d02d6aceb145bc704cb5683006c8ffba559

2
src/comissions.app.database.migrator/obj/rider.project.model.nuget.info
View File

@ -1 +1 @@
17136744781404725
17136747318225640

34
src/comissions.app.sdk/comissions.app.sdk.csproj Normal file
View File

@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<IsTestProject>true</IsTestProject>
<OutputType>Library</OutputType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="NUnit" Version="3.14.0"/>
<PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
</ItemGroup>
<ItemGroup>
<Using Include="NUnit.Framework"/>
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="dotnet build ../comissions.app.api/comissions.app.api.csproj" />
</Target>
<ItemGroup>
<OpenApiReference Include="swagger.json" Namespace="comissions.app.api" ClassName="Client">
<Options>/OperationGenerationMode:SingleClientFromOperationId /Output:../ /ArrayType:System.Collections.ObjectModel.Collection /ArrayType:System.Collections.Generic.ICollection</Options>
</OpenApiReference>
</ItemGroup>
</Project>

6
src/comissions.app.sln
View File

@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.database.mig
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.api", "comissions.app.api\comissions.app.api.csproj", "{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.sdk", "comissions.app.sdk\comissions.app.sdk.csproj", "{C03CA063-25C7-4177-9D44-F6A5C37B47FF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -18,6 +20,10 @@ Global
{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}.Release|Any CPU.Build.0 = Release|Any CPU
{C03CA063-25C7-4177-9D44-F6A5C37B47FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C03CA063-25C7-4177-9D44-F6A5C37B47FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C03CA063-25C7-4177-9D44-F6A5C37B47FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C03CA063-25C7-4177-9D44-F6A5C37B47FF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection