Change the structure of the repository

InvisibleSafe · Oct 23, 2024 · 6318238 · 6318238
1 parent 2cc04ba
commit 6318238
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 39 deletions.
diff --git a/.github/workflows/post.yml b/.github/workflows/post.yml
@@ -3,7 +3,7 @@ name: Post Service CI/CD Pipeline
 on:
   push:
     paths:
-      - 'backend/src/PostService/**'
+      - 'backend/services/PostService/**'
       - '.github/workflows/post.yml'
   pull_request:
     branches:
@@ -23,13 +23,13 @@ jobs:
         dotnet-version: '8.0.x'
 
     - name: Restore dependencies
-      run: dotnet restore ./backend/src/PostService/PostService.sln
+      run: dotnet restore ./backend/services/PostService/PostService.sln
 
     - name: Build project
-      run: dotnet build --configuration Release ./backend/src/PostService/PostService.sln --no-restore
+      run: dotnet build --configuration Release ./backend/services/PostService/PostService.sln --no-restore
 
     - name: Run tests
-      run: dotnet test ./backend/src/PostService/PostService.sln --no-restore --verbosity normal
+      run: dotnet test ./backend/services/PostService/PostService.sln --no-restore --verbosity normal
 
   docker:
     needs: build
@@ -43,7 +43,7 @@ jobs:
       run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
 
     - name: Build Docker image
-      run: docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/post-service:latest ./backend/src/PostService
+      run: docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/post-service:latest ./backend/services/PostService
 
     - name: Push Docker image to Docker Hub
       run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/post-service:latest
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+.env
diff --git a/backend/services/PostService/Dockerfile b/backend/services/PostService/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 8082
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /src
+
+COPY ["PostService.sln", "./"]
+COPY ["src/PostService.Api/PostService.Api.csproj", "src/PostService.Api/"]
+COPY ["src/PostService.Application/PostService.Application.csproj", "src/PostService.Application/"]
+COPY ["src/PostService.Domain/PostService.Domain.csproj", "src/PostService.Domain/"]
+COPY ["src/PostService.Infrastructure/PostService.Infrastructure.csproj", "src/PostService.Infrastructure/"]
+COPY ["src/PostService.Persistence/PostService.Persistence.csproj", "src/PostService.Persistence/"]
+
+RUN dotnet restore "src/PostService.Api/PostService.Api.csproj"
+
+COPY . .
+
+WORKDIR "/src/src/PostService.Api"
+RUN dotnet build -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+
+ENTRYPOINT ["dotnet", "PostService.Api.dll"]
diff --git a/backend/src/PostService/PostService.sln → backend/services/PostService/PostService.sln b/backend/src/PostService/PostService.sln → backend/services/PostService/PostService.sln
@@ -1,14 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Api", "PostService.Api\PostService.Api.csproj", "{2E44C019-ED30-4671-A878-D2F7B6071024}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Domain", "PostService.Domain\PostService.Domain.csproj", "{BC83A789-36C2-42E7-B630-6BC503375C30}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Api", "src\PostService.Api\PostService.Api.csproj", "{2E44C019-ED30-4671-A878-D2F7B6071024}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Infrastructure", "PostService.Infrastructure\PostService.Infrastructure.csproj", "{49301846-33F7-4C75-A1F9-6A0FEBA5EADD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Domain", "src\PostService.Domain\PostService.Domain.csproj", "{BC83A789-36C2-42E7-B630-6BC503375C30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Persistence", "PostService.Persistence\PostService.Persistence.csproj", "{0E631CB2-47C2-458A-B163-43CE50473B8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Infrastructure", "src\PostService.Infrastructure\PostService.Infrastructure.csproj", "{49301846-33F7-4C75-A1F9-6A0FEBA5EADD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Application", "PostService.Application\PostService.Application.csproj", "{4FD56528-F5F1-4BF8-AC46-A5E54D158AA2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Persistence", "src\PostService.Persistence\PostService.Persistence.csproj", "{0E631CB2-47C2-458A-B163-43CE50473B8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostService.Application", "src\PostService.Application\PostService.Application.csproj", "{4FD56528-F5F1-4BF8-AC46-A5E54D158AA2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,4 +39,11 @@ Global
 		{4FD56528-F5F1-4BF8-AC46-A5E54D158AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FD56528-F5F1-4BF8-AC46-A5E54D158AA2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{2E44C019-ED30-4671-A878-D2F7B6071024} = {84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}
+		{4FD56528-F5F1-4BF8-AC46-A5E54D158AA2} = {84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}
+		{BC83A789-36C2-42E7-B630-6BC503375C30} = {84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}
+		{49301846-33F7-4C75-A1F9-6A0FEBA5EADD} = {84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}
+		{0E631CB2-47C2-458A-B163-43CE50473B8A} = {84AE3F00-9A59-4A8D-A737-67AB74E5D1FD}
+	EndGlobalSection
 EndGlobal
diff --git a/...tService.Api/GraphQL/Mutation/Mutation.cs → ...tService.Api/GraphQL/Mutation/Mutation.cs b/...tService.Api/GraphQL/Mutation/Mutation.cs → ...tService.Api/GraphQL/Mutation/Mutation.cs
diff --git a/...ce/PostService.Api/GraphQL/Query/Query.cs → ...rc/PostService.Api/GraphQL/Query/Query.cs b/...ce/PostService.Api/GraphQL/Query/Query.cs → ...rc/PostService.Api/GraphQL/Query/Query.cs
diff --git a/...ce/PostService.Api/PostService.Api.csproj → ...rc/PostService.Api/PostService.Api.csproj b/...ce/PostService.Api/PostService.Api.csproj → ...rc/PostService.Api/PostService.Api.csproj
diff --git a/...rc/PostService/PostService.Api/Program.cs → ...ostService/src/PostService.Api/Program.cs b/...rc/PostService/PostService.Api/Program.cs → ...ostService/src/PostService.Api/Program.cs
diff --git a/...ervice.Api/Properties/launchSettings.json → ...ervice.Api/Properties/launchSettings.json b/...ervice.Api/Properties/launchSettings.json → ...ervice.Api/Properties/launchSettings.json
diff --git a/...tService.Api/appsettings.Development.json → ...tService.Api/appsettings.Development.json b/...tService.Api/appsettings.Development.json → ...tService.Api/appsettings.Development.json
diff --git a/...tService/PostService.Api/appsettings.json → ...vice/src/PostService.Api/appsettings.json b/...tService/PostService.Api/appsettings.json → ...vice/src/PostService.Api/appsettings.json
diff --git a/...ervice.Application/DependencyInjection.cs → ...ervice.Application/DependencyInjection.cs b/...ervice.Application/DependencyInjection.cs → ...ervice.Application/DependencyInjection.cs
diff --git a/...pplication/PostService.Application.csproj → ...pplication/PostService.Application.csproj b/...pplication/PostService.Application.csproj → ...pplication/PostService.Application.csproj
diff --git a/...tService.Domain/PostService.Domain.csproj → ...tService.Domain/PostService.Domain.csproj b/...tService.Domain/PostService.Domain.csproj → ...tService.Domain/PostService.Domain.csproj
diff --git a/...ice.Infrastructure/DependencyInjection.cs → ...ice.Infrastructure/DependencyInjection.cs b/...ice.Infrastructure/DependencyInjection.cs → ...ice.Infrastructure/DependencyInjection.cs
diff --git a/...ructure/PostService.Infrastructure.csproj → ...ructure/PostService.Infrastructure.csproj b/...ructure/PostService.Infrastructure.csproj → ...ructure/PostService.Infrastructure.csproj
diff --git a/...ervice.Persistence/DependencyInjection.cs → ...ervice.Persistence/DependencyInjection.cs b/...ervice.Persistence/DependencyInjection.cs → ...ervice.Persistence/DependencyInjection.cs
diff --git a/...ersistence/PostService.Persistence.csproj → ...ersistence/PostService.Persistence.csproj b/...ersistence/PostService.Persistence.csproj → ...ersistence/PostService.Persistence.csproj
diff --git a/backend/src/PostService/Dockerfile b/backend/src/PostService/Dockerfile