mirror of
				https://github.com/D4M13N-D3V/comissions-app-core-api.git
				synced 2025-10-31 01:25:27 +00:00 
			
		
		
		
	Merge pull request #2 from D4M13N-D3V/fix-document-preview
ci: update to build the sdk
This commit is contained in:
		
						commit
						e955270cf5
					
				
							
								
								
									
										279
									
								
								.github/workflows/build-image.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										279
									
								
								.github/workflows/build-image.yml
									
									
									
									
										vendored
									
									
								
							| @ -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: | on: | ||||||
|   push: |   push: | ||||||
|     branches: [main] |     branches: | ||||||
|  |       - 'main' | ||||||
| 
 | 
 | ||||||
| jobs: | 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: |   build-image: | ||||||
|     runs-on: [ubuntu-latest] |     runs-on: ubuntu-latest | ||||||
|     env: |     needs: gitversion | ||||||
|       DOTNET_INSTALL_DIR: "/home/runner" |     strategy: | ||||||
|     permissions: |       matrix: | ||||||
|       contents: write |         platform: [amd64, arm64] | ||||||
|       packages: write |  | ||||||
|     steps: |     steps: | ||||||
|       - name: 'Cleanup build folder' |       - name: 'Cleanup build folder' | ||||||
|         run: | |         run: | | ||||||
|           rm ./* -r || true |           rm ./* -r || true | ||||||
|           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 |       - name: login into registry | ||||||
|         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u $ --password-stdin |         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u $ --password-stdin | ||||||
|    |    | ||||||
|       - name: Build image |       - name: Build image | ||||||
|         env: |         env: | ||||||
|           dockerfile: ./src/comissions.app.api/Dockerfile |           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: | |         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 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 }}:${{ env.GitVersion_MajorMinorPatch }} ${{ env.docker_image_name }}:latest |           docker tag ${{ env.docker_image_name }}:${{ needs.gitversion.outputs.semantic_version }} ${{ env.docker_image_name }}:latest | ||||||
|           docker push --all-tags ${{ env.docker_image_name }} |           docker push --all-tags ${{ env.docker_image_name }} | ||||||
|    |    | ||||||
|       - name: Tag branch |       - name: Tag branch | ||||||
|         run: | |         run: | | ||||||
|           git tag ${{ env.GitVersion_MajorMinorPatch }} |           git tag ${{ needs.gitversion.outputs.semantic_version }} | ||||||
|           git push origin ${{ env.GitVersion_MajorMinorPatch }} |           git push origin ${{ needs.gitversion.outputs.semantic_version }} | ||||||
							
								
								
									
										
											BIN
										
									
								
								src/.DS_Store
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/.DS_Store
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								src/.idea/.idea.comissions.app/.idea/aws.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								src/.idea/.idea.comissions.app/.idea/aws.xml
									
									
									
										generated
									
									
									
								
							| @ -15,6 +15,6 @@ | |||||||
|     </option> |     </option> | ||||||
|   </component> |   </component> | ||||||
|   <component name="explorerToolWindow"> |   <component name="explorerToolWindow"> | ||||||
|     <option name="selectedTab" value="Amazon Q + CodeWhisperer" /> |     <option name="selectedTab" value="Explorer" /> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -3,6 +3,7 @@ | |||||||
|   <component name="UserContentModel"> |   <component name="UserContentModel"> | ||||||
|     <attachedFolders> |     <attachedFolders> | ||||||
|       <Path>../../../../Development</Path> |       <Path>../../../../Development</Path> | ||||||
|  |       <Path>../../core-api</Path> | ||||||
|     </attachedFolders> |     </attachedFolders> | ||||||
|     <explicitIncludes /> |     <explicitIncludes /> | ||||||
|     <explicitExcludes /> |     <explicitExcludes /> | ||||||
|  | |||||||
							
								
								
									
										8
									
								
								src/.idea/.idea.comissions.app/.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								src/.idea/.idea.comissions.app/.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							| @ -3,13 +3,21 @@ | |||||||
|   <component name="VcsDirectoryMappings"> |   <component name="VcsDirectoryMappings"> | ||||||
|     <mapping directory="$PROJECT_DIR$/../../../Data443/File-Transformation-Api" vcs="Git" /> |     <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/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_api" vcs="Git" /> | ||||||
|     <mapping directory="$PROJECT_DIR$/../../../Data443/dim_connectors" 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_document_api" vcs="Git" /> | ||||||
|     <mapping directory="$PROJECT_DIR$/../../../Data443/dim_etl" 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/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$/.." vcs="Git" /> | ||||||
|  |     <mapping directory="$PROJECT_DIR$/../../neroshitron" vcs="Git" /> | ||||||
|     <mapping directory="$PROJECT_DIR$/../../project_brazier" vcs="Git" /> |     <mapping directory="$PROJECT_DIR$/../../project_brazier" vcs="Git" /> | ||||||
|  |     <mapping directory="$PROJECT_DIR$/../../supabase" vcs="Git" /> | ||||||
|     <mapping directory="$PROJECT_DIR$/../../ui" vcs="Git" /> |     <mapping directory="$PROJECT_DIR$/../../ui" vcs="Git" /> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @ -1,7 +1,5 @@ | |||||||
| 
 | 
 | ||||||
| using Microsoft.Extensions.Configuration; | namespace comissions.app.api; | ||||||
| 
 |  | ||||||
| namespace comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| public class ApplicationDatabaseConfigurationModel | public class ApplicationDatabaseConfigurationModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,8 +1,8 @@ | |||||||
| using comissions.app.database.Entities; | using comissions.app.api.Entities; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Npgsql; | using Npgsql; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database; | namespace comissions.app.api; | ||||||
| 
 | 
 | ||||||
| public class ApplicationDbContext:DbContext | public class ApplicationDbContext:DbContext | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,13 +1,10 @@ | |||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Models.Admin; | ||||||
| using comissions.app.database; | using comissions.app.api.Models.Request; | ||||||
| using comissions.app.database.Models.Admin; |  | ||||||
| using comissions.app.database.Models.Request; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Http.HttpResults; |  | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Controllers; | namespace comissions.app.api.Controllers.Admin; | ||||||
| 
 | 
 | ||||||
| [ApiController] | [ApiController] | ||||||
| [Authorize("admin")] | [Authorize("admin")] | ||||||
|  | |||||||
| @ -1,16 +1,15 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Extensions; | 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.api.Services.Payment; | ||||||
| using comissions.app.database; |  | ||||||
| using comissions.app.database.Entities; |  | ||||||
| using comissions.app.database.Models; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Novu; | using Novu; | ||||||
| using Novu.DTO.Events; | using Novu.DTO.Events; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Controllers; | namespace comissions.app.api.Controllers.Admin; | ||||||
| 
 | 
 | ||||||
| [ApiController] | [ApiController] | ||||||
| [Authorize("admin")] | [Authorize("admin")] | ||||||
|  | |||||||
| @ -1,13 +1,11 @@ | |||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Entities; | ||||||
| using comissions.app.database; | using comissions.app.api.Models.Admin; | ||||||
| using comissions.app.database.Entities; | using comissions.app.api.Models.Request; | ||||||
| using comissions.app.database.Models.Admin; |  | ||||||
| using comissions.app.database.Models.Request; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Controllers; | namespace comissions.app.api.Controllers.Admin; | ||||||
| 
 | 
 | ||||||
| [ApiController] | [ApiController] | ||||||
| [Authorize("admin")] | [Authorize("admin")] | ||||||
|  | |||||||
| @ -1,13 +1,10 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
|  | using comissions.app.api.Models; | ||||||
| using comissions.app.api.Models.PortfolioModel; | using comissions.app.api.Models.PortfolioModel; | ||||||
| using comissions.app.api.Models.Artist; | using comissions.app.api.Models.SellerProfileRequest; | ||||||
| using comissions.app.api.Models.ArtistRequest; |  | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | 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.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,13 +1,9 @@ | |||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
| using comissions.app.api.Models.PortfolioModel; | using comissions.app.api.Models.PortfolioModel; | ||||||
| using comissions.app.api.Models.Artist; | using comissions.app.api.Models.SellerProfile; | ||||||
| using comissions.app.api.Models.ArtistRequest; | using comissions.app.api.Models.SellerProfileRequest; | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | 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.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,8 +1,7 @@ | |||||||
| using comissions.app.api.Extensions; | 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.Payment; | ||||||
| using comissions.app.api.Services.Storage; | using comissions.app.api.Services.Storage; | ||||||
| using comissions.app.database; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,10 +1,8 @@ | |||||||
| using comissions.app.api.Extensions; | 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.Payment; | ||||||
| using comissions.app.api.Services.Storage; | 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.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,9 +1,8 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
| using comissions.app.api.Models.PortfolioModel; | using comissions.app.api.Models.PortfolioModel; | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | using comissions.app.api.Services.Storage; | ||||||
| using comissions.app.database; |  | ||||||
| using comissions.app.database.Entities; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,9 +1,8 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
|  | using comissions.app.api.Models.Request; | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | 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.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,9 +1,7 @@ | |||||||
| using comissions.app.api.Extensions; | 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.Payment; | ||||||
| using comissions.app.api.Services.Storage; | using comissions.app.api.Services.Storage; | ||||||
| using comissions.app.database; |  | ||||||
| using comissions.app.database.Models.Request; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,10 +1,8 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
|  | using comissions.app.api.Models.Request; | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | 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.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -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.PortfolioModel; | ||||||
|  | using comissions.app.api.Models.Request; | ||||||
|  | using comissions.app.api.Models.SellerProfile; | ||||||
| using comissions.app.api.Services.Storage; | 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.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,7 +1,6 @@ | |||||||
| using System.Security.Claims; | using System.Security.Claims; | ||||||
| using comissions.app.api.Extensions; | using comissions.app.api.Extensions; | ||||||
| using comissions.app.api.Models.User; | using comissions.app.api.Models.User; | ||||||
| using comissions.app.database; |  | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class ArtistPageSettings | public class ArtistPageSettings | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class ArtistPortfolioPiece | public class ArtistPortfolioPiece | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class ArtistRequest | public class ArtistRequest | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class ArtistRequestMessage | public class ArtistRequestMessage | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class Ban | public class Ban | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class Request | public class Request | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class RequestAsset | public class RequestAsset | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public class RequestReference | public class RequestReference | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
|     namespace comissions.app.database.Entities; |     namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
|     public class Suspension |     public class Suspension | ||||||
|     { |     { | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| using System.Text.Json.Serialization; | using System.Text.Json.Serialization; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| [PrimaryKey(nameof(Id))] | [PrimaryKey(nameof(Id))] | ||||||
| public record User | public record User | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| using System.ComponentModel.DataAnnotations.Schema; | using System.ComponentModel.DataAnnotations.Schema; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database.Entities; | namespace comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| public record UserArtist | public record UserArtist | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Enums; | namespace comissions.app.api.Enums; | ||||||
| 
 | 
 | ||||||
| public enum EnumOrderStatus | public enum EnumOrderStatus | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| using Microsoft.AspNetCore.Mvc.Filters; | using Microsoft.AspNetCore.Mvc.Filters; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.database.Filters; | namespace comissions.app.api.Filters; | ||||||
| 
 | 
 | ||||||
| public class LoggingFilter : IActionFilter | public class LoggingFilter : IActionFilter | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,7 +1,6 @@ | |||||||
| using System.Security.Claims; | using System.Security.Claims; | ||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.database; |  | ||||||
| using comissions.app.database.Entities; |  | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Novu; | using Novu; | ||||||
| using Novu.Interfaces; | using Novu.Interfaces; | ||||||
|  | |||||||
| @ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; | |||||||
| using Microsoft.EntityFrameworkCore.Migrations; | using Microsoft.EntityFrameworkCore.Migrations; | ||||||
| using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | ||||||
| using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||||||
| using comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| #nullable disable | #nullable disable | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; | |||||||
| using Microsoft.EntityFrameworkCore.Migrations; | using Microsoft.EntityFrameworkCore.Migrations; | ||||||
| using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | ||||||
| using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||||||
| using comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| #nullable disable | #nullable disable | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; | |||||||
| using Microsoft.EntityFrameworkCore.Migrations; | using Microsoft.EntityFrameworkCore.Migrations; | ||||||
| using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | ||||||
| using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||||||
| using comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| #nullable disable | #nullable disable | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; | |||||||
| using Microsoft.EntityFrameworkCore.Migrations; | using Microsoft.EntityFrameworkCore.Migrations; | ||||||
| using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | ||||||
| using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||||||
| using comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| #nullable disable | #nullable disable | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -4,7 +4,6 @@ using Microsoft.EntityFrameworkCore; | |||||||
| using Microsoft.EntityFrameworkCore.Infrastructure; | using Microsoft.EntityFrameworkCore.Infrastructure; | ||||||
| using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | using Microsoft.EntityFrameworkCore.Storage.ValueConversion; | ||||||
| using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||||||
| using comissions.app.database; |  | ||||||
| 
 | 
 | ||||||
| #nullable disable | #nullable disable | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -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 | public class AdminArtistModel | ||||||
| { | { | ||||||
| @ -22,7 +22,7 @@ public class AdminArtistModel | |||||||
|     public int NumberOfPortfolio { get; set; } |     public int NumberOfPortfolio { get; set; } | ||||||
|     public int NumberOfCompleted { get; set; } |     public int NumberOfCompleted { get; set; } | ||||||
|     public double? AverageRating  { get; set; } |     public double? AverageRating  { get; set; } | ||||||
|     public User User { get; set; } |     public Entities.User User { get; set; } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| public static class AdminArtistModelExtensions | public static class AdminArtistModelExtensions | ||||||
|  | |||||||
| @ -1,6 +1,4 @@ | |||||||
| using comissions.app.database.Entities; | namespace comissions.app.api.Models.Admin; | ||||||
| 
 |  | ||||||
| namespace comissions.app.database.Models.Admin; |  | ||||||
| 
 | 
 | ||||||
| public class AdminUserModel | public class AdminUserModel | ||||||
| { | { | ||||||
| @ -18,7 +16,7 @@ public class AdminUserModel | |||||||
| 
 | 
 | ||||||
| public static class AdminUserModelExtensions | public static class AdminUserModelExtensions | ||||||
| { | { | ||||||
|     public static AdminUserModel ToAdminUserModel(this User user) |     public static AdminUserModel ToAdminUserModel(this Entities.User user) | ||||||
|     { |     { | ||||||
|         return new AdminUserModel |         return new AdminUserModel | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -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 | public class ArtistAccessRequestMessage | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Models; | namespace comissions.app.api.Models; | ||||||
| 
 | 
 | ||||||
| public class PayoutModel | public class PayoutModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -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 | public class PenaltyModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| using comissions.app.database.Entities; | using comissions.app.api.Entities; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Models.PortfolioModel; | namespace comissions.app.api.Models.PortfolioModel; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,6 +1,4 @@ | |||||||
| using Microsoft.AspNetCore.Mvc; | namespace comissions.app.api.Models.Request; | ||||||
| 
 |  | ||||||
| namespace comissions.app.database.Models.Request; |  | ||||||
| 
 | 
 | ||||||
| public class RequestCreateModel | public class RequestCreateModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Models.Request; | namespace comissions.app.api.Models.Request; | ||||||
| 
 | 
 | ||||||
| public class RequestImageModel | public class RequestImageModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Models.Request; | namespace comissions.app.api.Models.Request; | ||||||
| 
 | 
 | ||||||
| public class RequestModel | public class RequestModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Models.Request; | namespace comissions.app.api.Models.Request; | ||||||
| 
 | 
 | ||||||
| public static class RequestModelExtensions | public static class RequestModelExtensions | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.database.Models.Request; | namespace comissions.app.api.Models.Request; | ||||||
| 
 | 
 | ||||||
| public class RequestReviewModel | public class RequestReviewModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.api.Models.Artist; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 | 
 | ||||||
| public class ArtistOnboardStatusModel | public class ArtistOnboardStatusModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.api.Models.Artist; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 | 
 | ||||||
| public class ArtistOnboardUrlModel | public class ArtistOnboardUrlModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.api.Models.Artist; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 | 
 | ||||||
| public class ArtistModel | public class ArtistModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Models.Discovery; | 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 | public static class ArtistModelExtensions | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,6 +1,4 @@ | |||||||
| using comissions.app.database.Entities; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 |  | ||||||
| namespace comissions.app.api.Models.Artist; |  | ||||||
| 
 | 
 | ||||||
| public class ArtistPageSettingsModel | public class ArtistPageSettingsModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| using comissions.app.database.Entities; | using comissions.app.api.Entities; | ||||||
| using Newtonsoft.Json; | using Newtonsoft.Json; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Models.Artist; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 | 
 | ||||||
| public static class ArtistPageSettingsModelExtensions | public static class ArtistPageSettingsModelExtensions | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| namespace comissions.app.api.Models.Artist; | namespace comissions.app.api.Models.SellerProfile; | ||||||
| 
 | 
 | ||||||
| public class ArtistStatsModel | public class ArtistStatsModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| using comissions.app.api.Models.User; | using comissions.app.api.Models.User; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Models.ArtistRequest; | namespace comissions.app.api.Models.SellerProfileRequest; | ||||||
| 
 | 
 | ||||||
| public class ArtistRequestModel | public class ArtistRequestModel | ||||||
| { | { | ||||||
|  | |||||||
| @ -1,10 +1,11 @@ | |||||||
|  | using comissions.app.api.Entities; | ||||||
| using comissions.app.api.Models.User; | using comissions.app.api.Models.User; | ||||||
| 
 | 
 | ||||||
| namespace comissions.app.api.Models.ArtistRequest; | namespace comissions.app.api.Models.SellerProfileRequest; | ||||||
| 
 | 
 | ||||||
| public static class ArtistRequestModelExtensions | public static class ArtistRequestModelExtensions | ||||||
| { | { | ||||||
|     public static ArtistRequestModel ToModel(this database.Entities.ArtistRequest sellerProfileRequest) |     public static ArtistRequestModel ToModel(this ArtistRequest sellerProfileRequest) | ||||||
|     { |     { | ||||||
|         return new ArtistRequestModel() |         return new ArtistRequestModel() | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -2,7 +2,7 @@ namespace comissions.app.api.Models.User; | |||||||
| 
 | 
 | ||||||
| public static class UserInfoModelExtensions | public static class UserInfoModelExtensions | ||||||
| { | { | ||||||
|     public static UserInfoModel ToModel(this database.Entities.User user) |     public static UserInfoModel ToModel(this Entities.User user) | ||||||
|     { |     { | ||||||
|         return new() |         return new() | ||||||
|         { |         { | ||||||
| @ -12,7 +12,7 @@ public static class UserInfoModelExtensions | |||||||
|             Email = user.Email |             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.DisplayName = user.DisplayName; | ||||||
|         existingUser.Biography = user.Biography; |         existingUser.Biography = user.Biography; | ||||||
|  | |||||||
| @ -5,8 +5,8 @@ using comissions.app.api.Middleware.Authentication; | |||||||
| using comissions.app.api.Services.Payment; | using comissions.app.api.Services.Payment; | ||||||
| using comissions.app.api.Services.Storage; | using comissions.app.api.Services.Storage; | ||||||
| using Auth0.AspNetCore.Authentication; | using Auth0.AspNetCore.Authentication; | ||||||
| using comissions.app.database; | using comissions.app.api; | ||||||
| using comissions.app.database.Filters; | using comissions.app.api.Filters; | ||||||
| using Microsoft.AspNetCore.Authentication.JwtBearer; | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.AspNetCore.Authorization; | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.HttpOverrides; | using Microsoft.AspNetCore.HttpOverrides; | ||||||
|  | |||||||
| @ -44,4 +44,7 @@ | |||||||
|       </Content> |       </Content> | ||||||
|     </ItemGroup> |     </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> | </Project> | ||||||
|  | |||||||
| @ -13,7 +13,7 @@ using System.Reflection; | |||||||
| [assembly: System.Reflection.AssemblyCompanyAttribute("comissions.app.database.migrator")] | [assembly: System.Reflection.AssemblyCompanyAttribute("comissions.app.database.migrator")] | ||||||
| [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] | ||||||
| [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] | ||||||
| [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+24930f0519753f894ca4e5b28b672c9a9b451dc7")] | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+607a69448cce6812b36eca7f356b4bbf838ea658")] | ||||||
| [assembly: System.Reflection.AssemblyProductAttribute("comissions.app.database.migrator")] | [assembly: System.Reflection.AssemblyProductAttribute("comissions.app.database.migrator")] | ||||||
| [assembly: System.Reflection.AssemblyTitleAttribute("comissions.app.database.migrator")] | [assembly: System.Reflection.AssemblyTitleAttribute("comissions.app.database.migrator")] | ||||||
| [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] | ||||||
|  | |||||||
| @ -1 +1 @@ | |||||||
| ea55b099dc2c6f35fd99b7442f1ea2cc21c83c65442e401bedb0910209dc6138 | eb92e60c9c30d9c3ed943663cf7d6d02d6aceb145bc704cb5683006c8ffba559 | ||||||
|  | |||||||
							
								
								
									
										34
									
								
								src/comissions.app.sdk/comissions.app.sdk.csproj
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								src/comissions.app.sdk/comissions.app.sdk.csproj
									
									
									
									
									
										Normal 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> | ||||||
| @ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.database.mig | |||||||
| EndProject | EndProject | ||||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.api", "comissions.app.api\comissions.app.api.csproj", "{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}" | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.api", "comissions.app.api\comissions.app.api.csproj", "{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}" | ||||||
| EndProject | EndProject | ||||||
|  | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "comissions.app.sdk", "comissions.app.sdk\comissions.app.sdk.csproj", "{C03CA063-25C7-4177-9D44-F6A5C37B47FF}" | ||||||
|  | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		Debug|Any CPU = Debug|Any CPU | 		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}.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.ActiveCfg = Release|Any CPU | ||||||
| 		{83F914D0-0C7A-47F7-A7D7-F9296AD00A97}.Release|Any CPU.Build.0 = 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 | 	EndGlobalSection | ||||||
| 	GlobalSection(NestedProjects) = preSolution | 	GlobalSection(NestedProjects) = preSolution | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 GitHub
							GitHub