Merge pull request #124 from meysamhadeli/develop

Develop

.github/release-drafter.yml

@@ -8,12 +8,11 @@
 # This release drafter follows the conventions from https://keepachangelog.com, https://common-changelog.org/
 # https://www.conventionalcommits.org
 
-name-template: 'v$RESOLVED_VERSION'
+
-tag-template: 'v$RESOLVED_VERSION'
 template: |
   ## What Changed 👀
   $CHANGES
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+
 categories:
   - title: 🚀 Features
     labels:

.github/workflows/ci.yml

@@ -0,0 +1,70 @@
+name: CI
+
+on:
+  push:
+    branches: [ "main" , "develop" ]
+    paths-ignore:
+      - "README.md"
+  pull_request:
+    branches: [ "main" , "develop" ]
+    paths-ignore:
+      - "README.md"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 7.0.x
+
+      - name: Cache NuGet Packages
+        uses: actions/cache@v3
+        with:
+          key: ${{ runner.os }}-dotnet-nuget
+          path: ~/.nuget/packages
+
+      - name: Restore dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build -c Release --no-restore
+
+      - name: Test
+        run: dotnet test -c Release --no-restore
+
+      - name: Update Release Drafter
+        if: github.ref == 'refs/heads/main'
+        id: last_release
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to DockerHub
+        if: github.ref == 'refs/heads/main'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+       ##ref: https://docs.docker.com/language/golang/configure-ci-cd/
+       ##ref: https://event-driven.io/en/how_to_buid_and_push_docker_image_with_github_actions
+      - name: Build Docker Image
+        if: github.ref == 'refs/heads/main'
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-passenger:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-booking:${{ steps.last_release.outputs.tag_name }} -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
+
+      - name: Publish Docker Image
+        if: github.ref == 'refs/heads/main'
+        run: |
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-flight:${{ steps.last_release.outputs.tag_name }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-identity:${{ steps.last_release.outputs.tag_name }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-passenger:${{ steps.last_release.outputs.tag_name }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/booking-microservices-booking:${{ steps.last_release.outputs.tag_name }}
+

.github/workflows/dotnet.yml

@@ -1,28 +0,0 @@
-name: Build-Test
-
-on:
-  push:
-    branches: [ "main" , "develop"]
-    paths-ignore:
-     - "README.md"
-  pull_request:
-    branches: [ "main" , "develop" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 7.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build -c Release --no-restore
-    - name: Test
-      run: dotnet test -c Release --no-restore
-

.github/workflows/release-drafter.yml

@@ -1,18 +0,0 @@
- # https://johanneskonings.dev/github/2021/02/28/github_automatic_releases_and-changelog/
- # https://tiagomichaelsousa.dev/articles/stop-writing-your-changelogs-manually
- name: Release Drafter
-
- on:
-   push:
-     branches:
-       - main
- jobs:
-   update_release_draft:
-     name: Release drafter
-     runs-on: ubuntu-latest
-
-     steps:
-       - name: Update Release Draft
-         uses: release-drafter/release-drafter@v5
-         env:
-           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -0,0 +1,3 @@
+{
+  "version": "0.0.0"
+}

src/BuildingBlocks/PersistMessageProcessor/Data/DesignTimeDbContextFactory.cs

@@ -11,6 +11,6 @@ public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<PersistMes
 
         builder.UseNpgsql("Server=localhost;Port=5432;Database=persist_message;User Id=postgres;Password=postgres;Include Error Detail=true")
             .UseSnakeCaseNamingConvention();
-        return new PersistMessageDbContext(builder.Options);
+        return new PersistMessageDbContext(builder.Options, null);
     }
 }

src/BuildingBlocks/PersistMessageProcessor/Data/PersistMessageDbContext.cs

@@ -12,9 +12,13 @@ using Exception = System.Exception;
 
 public class PersistMessageDbContext : DbContext, IPersistMessageDbContext
 {
-    public PersistMessageDbContext(DbContextOptions<PersistMessageDbContext> options)
+    private readonly ILogger<PersistMessageDbContext> _logger;
+
+    public PersistMessageDbContext(DbContextOptions<PersistMessageDbContext> options,
+        ILogger<PersistMessageDbContext> logger)
         : base(options)
     {
+        _logger = logger;
     }
 
     public DbSet<PersistMessage> PersistMessages => Set<PersistMessage>();
@@ -37,10 +41,7 @@ public class PersistMessageDbContext : DbContext, IPersistMessageDbContext
                 {
                     if (exception != null)
                     {
-                        var factory = LoggerFactory.Create(b => b.AddConsole());
+                        _logger.LogError(exception,
-                        var logger = factory.CreateLogger<PersistMessageDbContext>();
-
-                        logger.LogError(exception,
                             "Request failed with {StatusCode}. Waiting {TimeSpan} before next retry. Retry attempt {RetryCount}.",
                             HttpStatusCode.Conflict,
                             timeSpan,
@@ -55,12 +56,22 @@ public class PersistMessageDbContext : DbContext, IPersistMessageDbContext
         {
             foreach (var entry in ex.Entries)
             {
-                var currentEntity = entry.Entity; // we can use it for specific merging
+                var currentValue = entry.Entity; // we can use it for specific merging
-                var databaseValues = await entry.GetDatabaseValuesAsync(cancellationToken);
+                var databaseValue = await entry.GetDatabaseValuesAsync(cancellationToken);
 
-                if (databaseValues != null)
+                _logger.LogInformation(
+                    "Entry to entity with type: {Type}, database-value: {DatabaseValue} and current-value: {CurrentValue}",
+                    entry.GetType().Name,
+                    databaseValue,
+                    currentValue);
+
+                if (databaseValue != null)
                 {
-                    entry.OriginalValues.SetValues(databaseValues);
+                    entry.OriginalValues.SetValues(databaseValue);
+                }
+                else
+                {
+                    entry.OriginalValues.SetValues(currentValue);
                 }
             }