remove building block

.github/workflows/Identity-api-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Identity/**
     - .github/workflows/Identity-api-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Identity/**
     - .github/workflows/Identity-api-CI.yml
 

.github/workflows/basket-api-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Basket/**
     - .github/workflows/basket-api-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Basket/**
     - .github/workflows/basket-api-CI.yml
 

.github/workflows/catalog-api-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Catalog/**
     - .github/workflows/catalog-api-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/BuildingBlocSharedks/**
     - src/Services/Catalog/**
     - .github/workflows/catalog-api-CI.yml
 

.github/workflows/discount-grpc-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Discount/**
     - .github/workflows/discount-grpc-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Discount/**
     - .github/workflows/discount-grpc-CI.yml
 

.github/workflows/order-command-api-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Command/**
     - .github/workflows/order-command-api-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Command/**
     - .github/workflows/order-command-api-CI.yml
 

.github/workflows/order-query-api-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Query/**
     - .github/workflows/order-query-api-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Query/**
     - .github/workflows/order-query-api-CI.yml
 

.github/workflows/order-query-event-processor-CI.yaml

@@ -8,14 +8,14 @@ on:
   push:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Query/**
     - .github/workflows/order-query-event-processor-CI.yml
 
   pull_request:
     branches: [ "main" ]
     paths:
-    - src/BuildingBlocks/**
+    - src/Shared/**
     - src/Services/Order.Query/**
     - .github/workflows/order-query-event-processor-CI.yml
 

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -27,7 +27,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks\BuildingBlocks.csproj" />
         <ProjectReference Include="..\..\Shared\Shared.csproj" />
         <Protobuf Include="Protos\basket.proto" GrpcServices="none" />
         <Protobuf Include="..\..\Discount\Discount.Grpc\Protos\discount.proto" GrpcServices="Client"/>

src/Services/Basket/Basket.API/Common/HealthChecksExtension.cs

@@ -1,5 +1,5 @@
-using BuildingBlocks.HealthChecks;
 using eshop.Shared;
+using eshop.Shared.HealthChecks;
 
 namespace Basket.API.Common;
 

src/Services/Basket/Basket.API/Dockerfile

@@ -10,7 +10,6 @@ RUN apk update && apk add --no-cache libc6-compat gcompat
 
 WORKDIR /src
 COPY ["Services/Basket/Basket.API/Basket.API.csproj", "Services/Basket/Basket.API/"]
-COPY ["BuildingBlocks/BuildingBlocks/BuildingBlocks.csproj", "BuildingBlocks/BuildingBlocks/"]
 COPY ["Services/Shared/Shared.csproj", "Services/Shared/"]
 COPY ["Directory.Packages.props", "/"]
 RUN dotnet restore "Services/Basket/Basket.API/Basket.API.csproj"

src/Services/Basket/Basket.API/Exceptions/BasketNotFoundException.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Exceptions;
+using eshop.Shared.Exceptions;
 
 namespace Basket.API.Exceptions;
 

src/Services/Basket/Basket.API/Features/DeleteBasket/DeleteBasketHandler.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.CQRS.Command;
+using eshop.Shared.CQRS.Command;
 
 namespace Basket.API.Features.DeleteBasket;
 

src/Services/Basket/Basket.API/Features/GetBasket/GetBasketHandler.cs

@@ -1,3 +1,5 @@
+using eshop.Shared.CQRS.Query;
+
 namespace Basket.API.Features.GetBasket;
 
 public record GetBasketQuery(string Username) : IQuery<GetBasketResult>;

src/Services/Basket/Basket.API/Features/StoreBasket/StoreBasketHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
-using BuildingBlocks.CQRS.Command;
 using Discount;
+using eshop.Shared.CQRS.Command;
 
 namespace Basket.API.Features.StoreBasket;
 

src/Services/Basket/Basket.API/GlobalUsing.cs

@@ -1,4 +1,3 @@
-global using BuildingBlocks.CQRS.Query;
 global using Basket.API.Models;
 global using Basket.API.Models.Dtos;
 global using Basket.API.Exceptions;

src/Services/Basket/Basket.API/Program.cs

@@ -1,10 +1,10 @@
 using Basket.API.Authorization;
 using Basket.API.Common;
-using BuildingBlocks.CQRS.Extensions;
-using BuildingBlocks.Exceptions.Handler;
-using BuildingBlocks.HealthChecks;
 using Discount;
 using eshop.Shared;
+using eshop.Shared.CQRS.Extensions;
+using eshop.Shared.Exceptions.Handler;
+using eshop.Shared.HealthChecks;
 using Microsoft.AspNetCore.Authorization;
 
 var builder = WebApplication.CreateBuilder(args);

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -17,7 +17,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks\BuildingBlocks.csproj"/>
         <ProjectReference Include="..\..\Shared\Shared.csproj"/>
     </ItemGroup>
 

src/Services/Catalog/Catalog.API/Common/HealthChecksExtension.cs

@@ -1,4 +1,6 @@
-namespace Catalog.API.Common;
+using eshop.Shared.HealthChecks;
+
+namespace Catalog.API.Common;
 
 public static class HealthChecksExtension
 {

src/Services/Catalog/Catalog.API/Dockerfile

@@ -10,7 +10,6 @@ FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["Services/Catalog/Catalog.API/Catalog.API.csproj", "Services/Catalog/Catalog.API/"]
-COPY ["BuildingBlocks/BuildingBlocks/BuildingBlocks.csproj", "BuildingBlocks/BuildingBlocks/"]
 COPY ["Services/Shared/Shared.csproj", "Services/Shared/"]
 COPY ["Directory.Packages.props", "/"]
 RUN dotnet restore "./Services/Catalog/Catalog.API/Catalog.API.csproj"

src/Services/Catalog/Catalog.API/Exceptions/ProductNotFoundException.cs

@@ -1,4 +1,6 @@
-namespace Catalog.API.Exceptions;
+using eshop.Shared.Exceptions;
+
+namespace Catalog.API.Exceptions;
 
 public class ProductNotFoundException(Ulid id) : NotFoundException("Product", id)
 {

src/Services/Catalog/Catalog.API/Features/Products/CreateProduct/CreateProductHandler.cs

@@ -1,4 +1,6 @@
-namespace Catalog.API.Features.Products.CreateProduct;
+using eshop.Shared.CQRS.Command;
+
+namespace Catalog.API.Features.Products.CreateProduct;
 
 public record CreateProductCommand(
     string Id,

src/Services/Catalog/Catalog.API/Features/Products/DeleteProduct/DeleteProductHandler.cs

@@ -1,4 +1,6 @@
-namespace Catalog.API.Features.Products.DeleteProduct;
+using eshop.Shared.CQRS.Command;
+
+namespace Catalog.API.Features.Products.DeleteProduct;
 
 public record DeleteProductCommand(string? Id) : ICommand<DeleteProductResult>;
 

src/Services/Catalog/Catalog.API/Features/Products/GetProductById/GetProductByIdHandler.cs

@@ -1,4 +1,6 @@
-namespace Catalog.API.Features.Products.GetProductById;
+using eshop.Shared.CQRS.Query;
+
+namespace Catalog.API.Features.Products.GetProductById;
 
 public record GetProductByIdQuery(string Id) : IQuery<Result>;
 

src/Services/Catalog/Catalog.API/Features/Products/GetProducts/GetProductsEndpoint.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProducts;
 

src/Services/Catalog/Catalog.API/Features/Products/GetProducts/GetProductsHandler.cs

@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
-using BuildingBlocks.Pagination;
+using eshop.Shared.CQRS.Query;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProducts;
 
@@ -24,7 +25,7 @@
 
         var result = MapToResult(products);
 
         return new GetProductsResult(new PaginatedItems<ProductModule>(pageIndex, pageSize, totalItems, result));
     }
 
     private static ReadOnlyCollection<ProductModule>? MapToResult(IReadOnlyCollection<ProductDocument>? products)

src/Services/Catalog/Catalog.API/Features/Products/GetProducts/Models.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProducts;
 

src/Services/Catalog/Catalog.API/Features/Products/GetProductsByCategory/GetProductsByCategoryEndpoint.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProductsByCategory;
 

src/Services/Catalog/Catalog.API/Features/Products/GetProductsByCategory/GetProductsByCategoryHandler.cs

@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
-using BuildingBlocks.Pagination;
+using eshop.Shared.CQRS.Query;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProductsByCategory;
 
@@ -29,7 +30,7 @@
         var result = MapToResult(product);
 
         return new GetProductByCategoryResult(
             new PaginatedItems<ProductModule>(pageIndex, pageSize, totalItems, result));
     }
 
     private static ReadOnlyCollection<ProductModule>? MapToResult(IReadOnlyCollection<ProductDocument>? products)

src/Services/Catalog/Catalog.API/Features/Products/GetProductsByCategory/Models.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 
 namespace Catalog.API.Features.Products.GetProductsByCategory;
 

src/Services/Catalog/Catalog.API/Features/Products/UpdateProduct/UpdateProductsHandler.cs

@@ -1,4 +1,5 @@
-using Marten.Exceptions;
+using eshop.Shared.CQRS.Command;
+using Marten.Exceptions;
 using Exception = System.Exception;
 
 namespace Catalog.API.Features.Products.UpdateProduct;

src/Services/Catalog/Catalog.API/GlobalUsing.cs

@@ -1,12 +1,7 @@
-global using BuildingBlocks.CQRS.Command;
-global using BuildingBlocks.CQRS.Query;
-global using BuildingBlocks.Exceptions;
-global using Catalog.API.Exceptions;
+global using Catalog.API.Exceptions;
 global using Catalog.API.Models;
 global using FluentValidation;
 global using Marten;
 global using MediatR;
 global using Microsoft.AspNetCore.Http.HttpResults;
-global using System.Text.Json.Serialization;
-global using BuildingBlocks.HealthChecks;
-global using BuildingBlocks.CQRS.Extensions;
+global using System.Text.Json.Serialization;

src/Services/Catalog/Catalog.API/Program.cs

@@ -1,8 +1,10 @@
-using BuildingBlocks.Exceptions.Handler;
 using Catalog.API.Authorization;
 using Catalog.API.Common;
 using Catalog.API.Data;
 using eshop.Shared;
+using eshop.Shared.CQRS.Extensions;
+using eshop.Shared.Exceptions.Handler;
+using eshop.Shared.HealthChecks;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.AddDefaultOpenApi();

src/Services/Order.Command/Order.Command.API.IntegrationTests/Endpoints/GetOrders/GetOrdersTests.cs

@@ -1,3 +1,4 @@
+using eshop.Shared.Pagination;
 using IntegrationTests.Common;
 using Order.Command.API.Authorization;
 using Order.Command.API.Endpoints.GetOrders;

src/Services/Order.Command/Order.Command.API.IntegrationTests/Endpoints/GetOrdersByCustomer/GetOrdersByCustomerTests.cs

@@ -1,3 +1,4 @@
+using eshop.Shared.Pagination;
 using IntegrationTests.Common;
 using Order.Command.API.Authorization;
 using Order.Command.API.Endpoints.GetOrdersByCustomer;

src/Services/Order.Command/Order.Command.API.IntegrationTests/Endpoints/GetOrdersByName/GetOrdersByNameTests.cs

@@ -1,3 +1,4 @@
+using eshop.Shared.Pagination;
 using IntegrationTests.Common;
 using Order.Command.API.Authorization;
 using Order.Command.API.Endpoints.GetOrdersByName;

src/Services/Order.Command/Order.Command.API.IntegrationTests/GlobalUsing.cs

@@ -1,7 +1,6 @@
 global using Shouldly;
 global using System.Net.Http.Json;
 global using Microsoft.AspNetCore.Mvc;
-global using BuildingBlocks.Pagination;
 global using Microsoft.EntityFrameworkCore;
 global using Order.Command.API.IntegrationTests.Given.SqlGiven;
 global using Order.Command.Application.Data;

src/Services/Order.Command/Order.Command.API/Common/HealthChecksExtension.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.HealthChecks;
+using eshop.Shared.HealthChecks;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Order.Command.API.Common.SqlHealthCheck;
 

src/Services/Order.Command/Order.Command.API/Dockerfile

@@ -16,7 +16,6 @@ RUN apk add icu-libs
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 WORKDIR /src
 COPY ["Services/Order.Command/Order.Command.API/Order.Command.API.csproj", "Services/Order.Command/Order.Command.API/"]
-COPY ["BuildingBlocks/BuildingBlocks/BuildingBlocks.csproj", "BuildingBlocks/BuildingBlocks/"]
 COPY ["Services/Shared/Shared.csproj", "Services/Shared/"]
 COPY ["Services/Order.Command/Order.Command.Application/Order.Command.Application.csproj", "Services/Order.Command/Order.Command.Application/"]
 COPY ["Services/Order.Command/Order.Command.Domain/Order.Command.Domain.csproj", "Services/Order.Command/Order.Command.Domain/"]

src/Services/Order.Command/Order.Command.API/Endpoints/GetOrders/Endpoint.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 using Order.Command.Application.Orders.Queries.GetOrders;
 
 namespace Order.Command.API.Endpoints.GetOrders;

src/Services/Order.Command/Order.Command.API/Endpoints/GetOrders/Models.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 using Microsoft.AspNetCore.Mvc;
 using Order.Command.Application.Dtos;
 

src/Services/Order.Command/Order.Command.API/Endpoints/GetOrdersByCustomer/Endpoint.cs

@@ -1,4 +1,4 @@
-using BuildingBlocks.Pagination;
+using eshop.Shared.Pagination;
 using Order.Command.API.Authorization;
 using Order.Command.Application.Orders.Queries.GetOrderByCustomer;