Port demo feature (#226)

* Port demo feature * Migrate to dotnet 8 * Fix * Fix * Update browserstack * Fix * Fix
framebassman · May 1, 2024 · 41e5663 · 41e5663
1 parent 677fe34
commit 41e5663
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 43 deletions.
diff --git a/.ci/semaphore.yml b/.ci/semaphore.yml
@@ -27,7 +27,7 @@ blocks:
             - sudo apt-get install docker-compose-plugin
             - docker compose version
             # install dotnet core
-            - sudo apt-get install -y dotnet-sdk-7.0
+            - sudo apt-get install -y dotnet-sdk-8.0
             # checkout repo
             - chmod 0600 ~/.ssh/*
             - checkout
@@ -37,7 +37,7 @@ blocks:
             - bash ./Scripts/wait-until-app-is-deployed.sh
             # run migrations
             - dotnet --info
-            - dotnet tool install --global dotnet-ef --version 7.0.5
+            - dotnet tool install --global dotnet-ef --version 8.0.3
             - export ASPNETCORE_ENVIRONMENT=TestMigrations; ~/.dotnet/tools/dotnet-ef database update --project Services/TicketStore.Data/TicketStore.Data.csproj --verbose
             # run integration tests
             - dotnet test Services/TicketStore.Api.Tests --logger "junit;LogFilePath=TestResults/report.xml" --filter Category!=DevelopmentData

diff --git a/.github/workflows/bundlesize.yml b/.github/workflows/bundlesize.yml
@@ -29,6 +29,7 @@ jobs:
       working-directory: Services/TicketStore.Web/Client
       run: |
         npm install
-        npm run check-bundlesize
+        npm run build
+        npm run bundlesize
       env:
         CI: true
diff --git a/Deploy/docker-compose.yml b/Deploy/docker-compose.yml
@@ -31,6 +31,7 @@ services:
         tty: true
     store_proxy:
         container_name: store_proxy
+        image: traefik:1.7
         ports:
             - 80:80
         volumes:

diff --git a/Services/TicketStore.Api.Tests.Unit/TicketStore.Api.Tests.Unit.csproj b/Services/TicketStore.Api.Tests.Unit/TicketStore.Api.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/Services/TicketStore.Api.Tests/TicketStore.Api.Tests.csproj b/Services/TicketStore.Api.Tests/TicketStore.Api.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/Services/TicketStore.Api/Controllers/PaymentsController.cs b/Services/TicketStore.Api/Controllers/PaymentsController.cs
@@ -72,7 +72,7 @@ [FromForm] String? sha1_hash
             var concert = _db.Events
                 .AsEnumerable()
                 .FirstOrDefault(e =>
-                    new LabelCalculator(_log, e).Value() == label
+                    label.Contains(e.Artist)
                 );
             if (concert == null)
             {

diff --git a/Services/TicketStore.Api/Dockerfile.Development b/Services/TicketStore.Api/Dockerfile.Development
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-alpine3.17
+FROM mcr.microsoft.com/dotnet/sdk:8.0.203-alpine3.19-amd64
 ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false
 # libgdiplus-dev - for bitmap creating and pdf generation
 # gcompat, libwkhtmltox.so - for pdf generation

diff --git a/Services/TicketStore.Api/Dockerfile.Production b/Services/TicketStore.Api/Dockerfile.Production
@@ -1,12 +1,12 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-alpine3.17 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0.203-alpine3.19-amd64 AS build-env
 ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false
 COPY ./Services/TicketStore.Api/ /app
 COPY ./Services/TicketStore.Data/ /TicketStore.Data
 WORKDIR /app
 RUN dotnet restore
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0.5-alpine3.17
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-alpine3.19-amd64
 # libgdiplus-dev - for bitmap creating and pdf generation
 # gcompat, libwkhtmltox.so - for pdf generation
 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \

diff --git a/Services/TicketStore.Api/Model/PdfDocument/Model/BarcodeConverters/Converter.cs b/Services/TicketStore.Api/Model/PdfDocument/Model/BarcodeConverters/Converter.cs
@@ -22,7 +22,7 @@ public virtual String ToBase64(String origin)
 
         private String GenerateBarcodeTask(String ticketNumber)
         {
-            var imageUrl = $"https://www.scandit.com/wp-content/themes/scandit/barcode-generator.php?symbology=code128&value={ticketNumber}&size=200&ec=L";
+            var imageUrl = $"https://barcodeapi.org/api/code128/{ticketNumber}";
             using (var inputStream = _client.GetStreamAsync(imageUrl).Result)
             {
                 using (var memoryStream = new MemoryStream())

diff --git a/Services/TicketStore.Api/Model/PdfDocument/Templates/Barcode.html b/Services/TicketStore.Api/Model/PdfDocument/Templates/Barcode.html
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <div>
     <img style="height: 100px" src="data:image/png;base64, %PICTURE%" />
-    <div>%NUMBER%</div>
+    <!-- <div>%NUMBER%</div> -->
 </div>
diff --git a/Services/TicketStore.Api/TicketStore.Api.csproj b/Services/TicketStore.Api/TicketStore.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

diff --git a/Services/TicketStore.Data.Tests.Unit/TicketStore.Data.Tests.Unit.csproj b/Services/TicketStore.Data.Tests.Unit/TicketStore.Data.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/Services/TicketStore.Data/ApplicationContext.cs b/Services/TicketStore.Data/ApplicationContext.cs
@@ -29,7 +29,13 @@ protected override void OnConfiguring(DbContextOptionsBuilder builder)
         {
             if (IsAppRunning())
             {
-                builder.UseNpgsql(new ApplicationSettings().ConnectionString());                
+                builder.UseNpgsql(
+                    new ApplicationSettings().ConnectionString(),
+                    builder =>
+                    {
+                        builder.EnableRetryOnFailure(5, TimeSpan.FromSeconds(10), null);
+                    }
+                ); 
             }
             else
             {

diff --git a/Services/TicketStore.Data/TicketStore.Data.csproj b/Services/TicketStore.Data/TicketStore.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/Services/TicketStore.Web.Tests.Unit/TicketStore.Web.Tests.Unit.csproj b/Services/TicketStore.Web.Tests.Unit/TicketStore.Web.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/Services/TicketStore.Web/Client/package-lock.json b/Services/TicketStore.Web/Client/package-lock.json
diff --git a/Services/TicketStore.Web/Client/package.json b/Services/TicketStore.Web/Client/package.json
@@ -32,10 +32,9 @@
   "scripts": {
     "start": "NODE_OPTIONS=--openssl-legacy-provider react-scripts start",
     "build": "NODE_OPTIONS=--openssl-legacy-provider react-scripts build",
-    "test": "react-scripts test --env=jsdom --reporters=default --reporters=jest-junit",
+    "test": "NODE_OPTIONS=--openssl-legacy-provider react-scripts test --env=jsdom --reporters=default --reporters=jest-junit",
     "eject": "react-scripts eject",
-    "bundlesize": "bundlesize",
-    "check-bundlesize": "react-scripts build && bundlesize"
+    "bundlesize": "bundlesize"
   },
   "eslintConfig": {
     "extends": [

diff --git a/Services/TicketStore.Web/Client/src/components/greetings/PayButton.tsx b/Services/TicketStore.Web/Client/src/components/greetings/PayButton.tsx
@@ -14,19 +14,18 @@ function isEmpty(origin: string) {
 }
 
 export const PayButton = (props: PayButtonProps) => {
-  const { roubles, label, targets, yandexMoneyAccount } = props;
+  const { roubles, label, yandexMoneyAccount } = props;
   if (roubles <= 0 || isEmpty(yandexMoneyAccount)) {
     return null;
   } else {
     return (
-      <form style={{marginLeft: 'auto', marginRight: 'auto'}} method="POST" action="https://money.yandex.ru/quickpay/confirm.xml">
+      <form style={{marginLeft: 'auto', marginRight: 'auto'}} method="POST" action="https://yoomoney.ru/quickpay/confirm.xml">
         <input type="hidden" name="receiver" value={yandexMoneyAccount} />
-        <input type="hidden" name="quickpay-form" value="small" />
-        <input type="hidden" name="need-email" value="true" />
+        <input type="hidden" name="quickpay-form" value="button" />
         <input type="hidden" name="label" value={label} />
-        <input type="hidden" name="targets" value={targets} />
         <input type="hidden" name="sum" value={roubles} data-type="number"></input>
         <input type="hidden" name="paymentType" value="AC"/>
+        <input type="hidden" name="successURL" value={window.location.hostname + "/tickets/farewell"} />
         <Button variant="contained" color="secondary" size="large" type="submit">Купить билет</Button>
       </form>
     )

diff --git a/Services/TicketStore.Web/Client/src/components/turnstile/camera/on-hold/TurnstileOnHold.css b/Services/TicketStore.Web/Client/src/components/turnstile/camera/on-hold/TurnstileOnHold.css
@@ -0,0 +1,10 @@
+.button_wrapper {
+    text-align: center;
+}
+
+.start_button {
+    position: absolute;
+    top: 30%;
+    height: 320px;
+    width: 320px;
+}
diff --git a/Services/TicketStore.Web/Client/src/components/turnstile/camera/on-hold/TurnstileOnHold.tsx b/Services/TicketStore.Web/Client/src/components/turnstile/camera/on-hold/TurnstileOnHold.tsx
@@ -10,8 +10,10 @@ type Props = {
 
 export const TurnstileOnHold = ({ onClick }: Props) => {
   return (
-    <Button variant="contained" onClick={onClick}>
-      <Typography variant="h4">Начать сканировать</Typography>
-    </Button>
+    <div className="button_wrapper">
+      <Button variant="contained" onClick={onClick}>
+        <Typography variant="h4">Начать сканировать</Typography>
+      </Button>
+    </div>
   )
 };
diff --git a/Services/TicketStore.Web/Dockerfile.Development b/Services/TicketStore.Web/Dockerfile.Development
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-alpine3.17 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0.203-alpine3.19-amd64 AS build-env
 ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false
 RUN apk add --update 'nodejs>18.14.0' 'npm>9.1.0'
 # install debugger

diff --git a/Services/TicketStore.Web/Dockerfile.Production b/Services/TicketStore.Web/Dockerfile.Production
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-alpine3.17 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0.203-alpine3.19-amd64 AS build-env
 
 ARG REACT_APP_ENVIRONMENT=Production
 
@@ -15,7 +15,7 @@ RUN dotnet restore
 RUN dotnet publish -c Release -o out
 
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0.5-alpine3.17
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-alpine3.19-amd64
 ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false
 WORKDIR /app
 COPY --from=build-env /app/out .

diff --git a/Services/TicketStore.Web/TicketStore.Web.csproj b/Services/TicketStore.Web/TicketStore.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
         <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -46,7 +46,7 @@ stages:
       displayName: 'Install Dotnet Core'
       inputs:
         packageType: sdk
-        version: 7.0.203
+        version: 8.0.204
     - script: |
         dotnet test --logger "trx;LogFileName=report.trx" --collect:"XPlat Code Coverage"
       workingDirectory: $(build.sourcesDirectory)/Services/TicketStore.Api.Tests.Unit
@@ -64,7 +64,7 @@ stages:
       inputs:
         targetType: 'inline'
         script: bash <(curl -s https://codecov.io/bash)
-    - task: PublishCodeCoverageResults@1
+    - task: PublishCodeCoverageResults@2
       displayName: 'publish code coverage report to Azure Devops'
       inputs:
         codeCoverageTool: 'cobertura' # Options: cobertura, jaCoCo
@@ -83,7 +83,7 @@ stages:
       displayName: 'Install Dotnet Core'
       inputs:
         packageType: sdk
-        version: 7.0.203
+        version: 8.0.204
     - script: |
         dotnet test --logger "trx;LogFileName=report.trx" --collect:"XPlat Code Coverage"
       workingDirectory: $(build.sourcesDirectory)/Services/TicketStore.Web.Tests.Unit
@@ -107,7 +107,7 @@ stages:
       inputs:
         targetType: 'inline'
         script: bash <(curl -s https://codecov.io/bash)
-    - task: PublishCodeCoverageResults@1
+    - task: PublishCodeCoverageResults@2
       displayName: 'publish code coverage report to Azure Devops'
       inputs:
         codeCoverageTool: 'cobertura' # Options: cobertura, jaCoCo
@@ -126,7 +126,7 @@ stages:
       displayName: 'Install Dotnet Core'
       inputs:
         packageType: sdk
-        version: 7.0.203
+        version: 8.0.204
     - script: |
         dotnet test --logger "trx;LogFileName=report.trx" --collect:"XPlat Code Coverage"
       workingDirectory: $(build.sourcesDirectory)/Services/TicketStore.Data.Tests.Unit
@@ -150,7 +150,7 @@ stages:
       inputs:
         targetType: 'inline'
         script: bash <(curl -s https://codecov.io/bash)
-    - task: PublishCodeCoverageResults@1
+    - task: PublishCodeCoverageResults@2
       displayName: 'publish code coverage report to Azure Devops'
       inputs:
         codeCoverageTool: 'cobertura' # Options: cobertura, jaCoCo