Release/1.2.2

.github/workflows/update-iteration.yml

@@ -2,8 +2,8 @@ name: Move Tasks To New Iteration
 
 on:
   schedule:
-    # Runs "at 05:00 GMT+2, only on Thursday"
-    - cron: '0 3 * * 4'
+    # Runs "at 05:00 GMT+2, everyday"
+    - cron: '0 3 * * *'
 
 jobs:
   move-to-next-iteration:

Dockerfile.dbupdate

@@ -0,0 +1,26 @@
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /app
+
+# copy dependencies
+COPY ./Streetcode/DbUpdate/DbUpdate.csproj ./DbUpdate/
+COPY ./Streetcode/DbUpdate/*.cs ./DbUpdate/
+COPY ./Streetcode/DbUpdate/appsettings.Local.json ./DbUpdate/
+COPY ./Streetcode/DbUpdate/appsettings.IntegrationTests.json ./DbUpdate/
+COPY ./Streetcode ./Streetcode/
+COPY ./Streetcode/Streetcode.DAL/Persistence/ScriptsMigration ./Streetcode.DAL/Persistence/ScriptsMigration/
+
+RUN dotnet restore ./DbUpdate/DbUpdate.csproj
+
+
+# build
+RUN dotnet build ./DbUpdate/DbUpdate.csproj -c Release -o /app/build
+
+# publishishing application
+FROM build AS publish
+RUN dotnet publish ./DbUpdate/DbUpdate.csproj -c Release -o /app/publish
+
+FROM mcr.microsoft.com/dotnet/runtime:7.0 AS runtime
+WORKDIR /app
+COPY --from=publish /app/publish .
+
+CMD ["dotnet", "DbUpdate.dll"]

Jenkinsfile

@@ -1,6 +1,8 @@
 def CODE_VERSION = ''     
 def IS_IMAGE_BUILDED = false
+def IS_DBUPDATE_IMAGE_BUILDED = false
 def IS_IMAGE_PUSH = false
+def IS_DBUPDATE_IMAGE_PUSH = false
 def isSuccess
 def preDeployFrontStage
 def preDeployBackStage
@@ -45,9 +47,14 @@ pipeline {
         stage('Setup dependencies') {
             steps {
                 script {
-                    sh 'dotnet tool update --global dotnet-coverage'
+                    sh 'rm -rf ~/.dotnet/tools/dotnet-coverage || true'
+                    sh 'rm -rf ~/.dotnet/tools/dotnet-sonarscanner || true'
+                    sh 'rm -rf ~/.dotnet/tools/GitVersion.Tool || true'
+
+                    sh 'dotnet tool update --global dotnet-coverage --version 17.13.1'
                     sh 'dotnet tool update --global dotnet-sonarscanner'
                     sh 'dotnet tool update --global GitVersion.Tool --version 5.12.0'
+
                     sh 'docker image prune --force --all --filter "until=72h"'
                     sh 'docker system prune --force --all --filter "until=72h"'
 
@@ -84,10 +91,10 @@ pipeline {
           steps {
             parallel(
               Unit_test: {
-                sh 'dotnet test ./Streetcode/Streetcode.XUnitTest/Streetcode.XUnitTest.csproj --configuration Release'
+                sh 'dotnet test ./Streetcode/Streetcode.XUnitTest/Streetcode.XUnitTest.csproj --configuration Release --no-build'
               },
               Integration_test: {
-                sh 'dotnet test ./Streetcode/Streetcode.XIntegrationTest/Streetcode.XIntegrationTest.csproj --configuration Release'
+                sh 'dotnet test ./Streetcode/Streetcode.XIntegrationTest/Streetcode.XIntegrationTest.csproj --configuration Release --no-build'
               }
             )
           }
@@ -116,8 +123,8 @@ pipeline {
                                     /d:sonar.pullrequest.branch=$PR_BRANCH \
                                     /d:sonar.pullrequest.base=$PR_BASE
 
-                                    dotnet build ./Streetcode/Streetcode.sln --configuration Release
-                                    dotnet-coverage collect "dotnet test ./Streetcode/Streetcode.sln --configuration Release" -f xml -o "coverage.xml"
+                                    dotnet build ./Streetcode/Streetcode.sln --configuration Release -p:WarningLevel=0
+                                    dotnet-coverage collect "dotnet test ./Streetcode/Streetcode.sln --configuration Release --no-build" -f xml -o "coverage.xml"
                                     dotnet sonarscanner end /d:sonar.token=$SONAR
                             '''
                         } else {
@@ -129,55 +136,62 @@ pipeline {
                                     /d:sonar.host.url="https://sonarcloud.io" \
                                     /d:sonar.cs.vscoveragexml.reportsPaths="**/coverage.xml" \
 
-                                    dotnet build ./Streetcode/Streetcode.sln --configuration Release
-                                    dotnet-coverage collect "dotnet test ./Streetcode/Streetcode.sln --configuration Release" -f xml -o "coverage.xml"
+                                    dotnet build ./Streetcode/Streetcode.sln --configuration Release -p:WarningLevel=0
+                                    dotnet-coverage collect "dotnet test ./Streetcode/Streetcode.sln --configuration Release --no-build" -f xml -o "coverage.xml"
                                     dotnet sonarscanner end /d:sonar.token=$SONAR
                             '''
                         }
                     }
                 }
             }
         }
-        stage('Build image') {
+        stage('Build images') {
             when {
                 branch pattern: "release/[0-9].[0-9].[0-9]", comparator: "REGEXP"
 
             }
             steps {
                 script {
                     withCredentials([usernamePassword(credentialsId: 'docker-login-streetcode', passwordVariable: 'password', usernameVariable: 'username')]){
-                        sh "docker build -t ${username}/streetcode:latest ."
+                        // Build the backend image
+                        sh "docker build -f Dockerfile -t ${username}/streetcode:${env.CODE_VERSION} ."
                         IS_IMAGE_BUILDED = true
+
+                        // Build the dbupdate image
+                        sh "docker build -f Dockerfile.dbupdate -t ${username}/dbupdate:${env.CODE_VERSION} ."
+                        IS_DBUPDATE_IMAGE_BUILDED = true
                     }
                 }
             }
         }
-        stage('Push image') {
+        stage('Push images') {
             when {
-                expression { IS_IMAGE_BUILDED == true }
+                expression { IS_IMAGE_BUILDED == true && IS_DBUPDATE_IMAGE_BUILDED == true }
             }   
             steps {
                 script {
                     withCredentials([usernamePassword(credentialsId: 'docker-login-streetcode', passwordVariable: 'password', usernameVariable: 'username')]){
                         sh 'echo "${password}" | docker login -u "${username}" --password-stdin'
-                        sh "docker push ${username}/streetcode:latest"
-                        sh "docker tag  ${username}/streetcode:latest ${username}/streetcode:${env.CODE_VERSION}"
+
                         sh "docker push ${username}/streetcode:${env.CODE_VERSION}"
                         IS_IMAGE_PUSH = true
-
+
+                        sh "docker push ${username}/dbupdate:${env.CODE_VERSION}"
+                        IS_DBUPDATE_IMAGE_PUSH = true
+
                     }
                 }
             }
         }
     stage('Deploy Stage'){
         when {
-                expression { IS_IMAGE_PUSH == true }
+                expression { IS_IMAGE_PUSH == true && IS_DBUPDATE_IMAGE_PUSH == true }
             }  
         steps {
             input message: 'Do you want to approve Staging deployment?', ok: 'Yes', submitter: 'admin_1, ira_zavushchak , dev'
                 script {
                     checkout scmGit(
-                      branches: [[name: 'main']],
+                      branches: [[name: 'feature/add-init-container']],
                      userRemoteConfigs: [[credentialsId: 'StreetcodeGithubCreds', url: '[email protected]:ita-social-projects/Streetcode-DevOps.git']])
 
                     preDeployBackStage = sh(script: 'docker container inspect $(docker container ls -aq) --format "{{.Config.Image}}" | grep "streetcodeua/streetcode:" | perl -pe \'($_)=/([0-9]+([.][0-9]+)+)/\'', returnStdout: true).trim()
@@ -195,7 +209,7 @@ pipeline {
                     sh 'docker system prune --force --filter "until=72h"'
                     sh """ export DOCKER_TAG_BACKEND=${env.CODE_VERSION}
                     export DOCKER_TAG_FRONTEND=${preDeployFrontStage}
-                    docker stop backend frontend nginx loki certbot
+                    docker stop backend frontend nginx loki certbot dbupdate
                     docker container prune -f                
                     docker volume prune -f
                     docker network prune -f
@@ -207,7 +221,7 @@ pipeline {
      }    
     stage('WHAT IS THE NEXT STEP') {
        when {
-                expression { IS_IMAGE_PUSH == true }
+                expression { IS_IMAGE_PUSH == true && IS_DBUPDATE_IMAGE_PUSH == true }
             }  
         steps {
              script {
@@ -228,7 +242,7 @@ pipeline {
                sh """
                export DOCKER_TAG_BACKEND=${preDeployBackStage}
                export DOCKER_TAG_FRONTEND=${preDeployFrontStage}
-               docker stop backend frontend nginx loki certbot
+               docker stop backend frontend nginx loki certbot dbupdate
                docker container prune -f
                docker volume prune -f
                docker network prune -f
@@ -245,7 +259,9 @@ pipeline {
             }
       }
     }
+
     /*
+
    stage('Deploy prod') {
          agent { 
            label 'production' 
@@ -286,7 +302,9 @@ pipeline {
             }
         }
     }
+
 */
+
     stage('Sync after release') {
         when {
            expression { isSuccess == '1' }
@@ -340,7 +358,9 @@ pipeline {
                 }
             }    
         }
+
     */
+
     }
 post { 
     always { 
@@ -349,3 +369,4 @@ post {
     }
 }
 }
+

Streetcode/DbUpdate/DbUpdate.csproj

@@ -11,7 +11,11 @@
     <PackageReference Include="DbUp" Version="5.0.8" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
@@ -21,11 +25,27 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+  </ItemGroup>  
+
+  <ItemGroup>
+    <None Remove="appsettings.Local.json" />
+    <Content Include="appsettings.Local.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <!-- <None Remove="appsettings.IntegrationTests.json" /> -->
+    <Content Include="appsettings.IntegrationTests.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Streetcode.WebApi\Streetcode.WebApi.csproj" />
+  <!-- Include the files you want to copy from the other project -->
+  	<FilesToCopy Include="..\Streetcode.DAL\Persistence\ScriptsMigration\*.*" />
   </ItemGroup>
+
+  <Target Name="CopyFiles" AfterTargets="Build">
+  	<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(OutputPath)\ScriptsMigration\" />
+  </Target>
 
   <PropertyGroup>
 	<SonarQubeExclude>true</SonarQubeExclude>

Streetcode/DbUpdate/Program.cs

@@ -1,4 +1,5 @@
-using DbUp;
+using System.Reflection;
+using DbUp;
 using Microsoft.Extensions.Configuration;
 
 public class Program
@@ -8,22 +9,20 @@ static int Main(string[] args)
         string rootDirectory = GetRootFolderPath();
         string pathToSqlScripts = Path.Combine(
             rootDirectory,
-            "Streetcode",
-            "Streetcode.DAL",
-            "Persistence",
             "ScriptsMigration");
 
         var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Local";
 
         var configuration = new ConfigurationBuilder()
-            .SetBasePath(Path.Combine(rootDirectory, "Streetcode", "Streetcode.WebApi"))
-            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .SetBasePath(rootDirectory)
+            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
             .AddJsonFile($"appsettings.{environment}.json", optional: true, reloadOnChange: true)
             .AddEnvironmentVariables("STREETCODE_")
             .Build();
 
         var connectionString = configuration.GetConnectionString("DefaultConnection");
 
+        Console.WriteLine($"Connection string: {connectionString}");
         var upgrader =
             DeployChanges.To
                 .SqlDatabase(connectionString)
@@ -50,16 +49,16 @@ static int Main(string[] args)
         return 0;
     }
 
-    private static string GetRootFolderPath()
-    {
-        // By root folder we mean folder, that contains .gitignore file.
-        string currentDirectoryPath = Directory.GetCurrentDirectory();
-        var directory = new DirectoryInfo(currentDirectoryPath);
-        while (directory is not null && !directory.GetFiles(".gitignore").Any())
-        {
-            directory = directory.Parent;
-        }
-
-        return directory?.FullName ?? throw new NullReferenceException("Cannot find root folder");
+    private static string GetRootFolderPath()
+    {
+        string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+        if (codeBase == null)
+        {
+            throw new NullReferenceException("Cannot find root folder");
+        }
+
+        UriBuilder uri = new UriBuilder(codeBase);
+        string path = Uri.UnescapeDataString(uri.Path);
+        return Path.GetDirectoryName(path) !;
     }
 }

Streetcode/DbUpdate/appsettings.IntegrationTests.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=localhost,1455;Database=Streetcode_IntegrationTests_Db;User Id=sa;Password=sdlLKMCD234!@#lkcmds;MultipleActiveResultSets=True;TrustServerCertificate=true"
+  }
+}

Streetcode/DbUpdate/appsettings.Local.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=localhost, 1433;Database=test-db;User Id=sa;Password=Admin@1234;MultipleActiveResultSets=true;TrustServerCertificate=true"
+  }
+}

Streetcode/Streetcode.BLL/Attributes/Authentication/ValidEmailAttribute.cs

@@ -3,6 +3,7 @@
 
 namespace Streetcode.BLL.Attributes.Authentication
 {
+    [AttributeUsage(AttributeTargets.Property)]
     public class ValidEmailAttribute : ValidationAttribute
     {
         protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
@@ -19,7 +20,7 @@ public class ValidEmailAttribute : ValidationAttribute
                 return new ValidationResult("Attribute cannot be applied to non-string property");
             }
 
-            if (!Regex.IsMatch(email, @"^[^@\s]+@[^@\s]+\.(com|net|org|gov|ua)$", RegexOptions.None, TimeSpan.FromMilliseconds(100)))
+            if (!Regex.IsMatch(email, @"^(?!.*\.\.)[a-zA-Z0-9_%+-]+(?:\.[a-zA-Z0-9_%+-]+)*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$", RegexOptions.None, TimeSpan.FromMilliseconds(100)))
             {
                 return new ValidationResult("Incorrect email address format");
             }

Streetcode/Streetcode.BLL/DTO/Authentication/GoogleLogin/GoogleLoginRequest.cs

@@ -0,0 +1,7 @@
+namespace Streetcode.BLL.DTO.Authentication.GoogleLogin
+{
+    public class GoogleLoginRequest
+    {
+        public string IdToken { get; set; } = string.Empty;
+    }
+}

Streetcode/Streetcode.BLL/DTO/Authentication/Login/LoginRequestDTO.cs

@@ -1,13 +1,14 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Streetcode.BLL.Constants.Authentication;
+using Streetcode.BLL.Attributes.Authentication;
 
 namespace Streetcode.BLL.DTO.Authentication.Login;
 
 public class LoginRequestDTO
 {
     [Required]
-    [EmailAddress]
+    [ValidEmail]
     [DefaultValue(AuthConstants.Email)]
     public string Login { get; set; } = null!;