Merge pull request #71 from nixhantb/feature/nishantb/postgress/migra…

…tions migrate SQL DB to PostgresSQL
nixhantb · Oct 24, 2024 · 4b2a15b · 4b2a15b
2 parents 6bf2b74 + 5b77b66
commit 4b2a15b
Show file tree

Hide file tree

Showing 15 changed files with 471 additions and 1,229 deletions.
diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Accounts/V1/RoleRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Accounts/V1/RoleRepository.cs
@@ -3,7 +3,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Accounts.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Accounts.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using System.Data.Common;
@@ -53,7 +52,7 @@ public async Task<List<RoleModel>> GetAllAsync()
                     }).ToListAsync();
                     return results;
                 }
-                catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+                catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
                 {
                     throw new Exception("Error while fetching data from the database. Please try again later.");
                 }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/AddressRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/AddressRepository.cs
@@ -3,7 +3,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Common.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Common.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using System.Data.Common;
@@ -60,7 +59,7 @@ public async Task<List<AddressModel>> GetAllAsync()
                     return results;
 
                 }
-                catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+                catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
                 {
                     throw new Exception("Error while fetching data from the database. Please try again later.");
                 }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/EducationRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/EducationRepository.cs
@@ -3,7 +3,7 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Common.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Common.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using System.Data.Common;
@@ -58,7 +58,7 @@ public async Task<List<EducationModel>> GetAllAsync()
                     return results;
 
                 }
-                catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+                catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
                 {
                     throw new Exception("Error while fetching data from the database. Please try again later.");
                 }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/ExperienceRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/ExperienceRepository.cs
@@ -3,7 +3,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Common.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Common.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using System.Data.Common;
@@ -54,7 +53,7 @@ public async Task<List<ExperienceModel>> GetAllAsync()
 
                     return results;
                 }
-                catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+                catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
                 {
                     throw new Exception("Error while fetching data from the database. Please try again later.");
                 }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/PersonNameRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/PersonNameRepository.cs
@@ -2,7 +2,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Common.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Common.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using System.Data.Common;
 
@@ -37,7 +36,7 @@ public async Task<List<PersonNameModel>> GetAllAsync()
                      }).ToListAsync();
                 return result;
             }
-            catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+            catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
             {
                 throw new Exception("Error while fetching data from the database. Please try again later.");
             }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/PhoneRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Common/V1/PhoneRepository.cs
@@ -2,7 +2,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Common.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Common.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using System.Data.Common;
 namespace JobLeet.WebApi.JobLeet.Infrastructure.Repositories.Common.V1
@@ -43,7 +42,7 @@ public async Task<List<PhoneModel>> GetAllAsync()
                     }).ToListAsync();
                 return result;
             }
-            catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+            catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
             {
                 throw new Exception("Error while fetching data from the database. Please try again later.");
             }

diff --git a/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Jobs/V1/JobRepository.cs b/JobLeet.WebApi/JobLeet.Infrastructure/Repositories/Jobs/V1/JobRepository.cs
@@ -4,7 +4,6 @@
 using JobLeet.WebApi.JobLeet.Core.Entities.Jobs.V1;
 using JobLeet.WebApi.JobLeet.Core.Interfaces.Jobs.V1;
 using JobLeet.WebApi.JobLeet.Infrastructure.Data.Contexts;
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace JobLeet.WebApi.JobLeet.Infrastructure.Repositories.Jobs.V1
@@ -281,7 +280,7 @@ public async Task<List<JobModel>> GetAllAsync()
                     return results;
 
                 }
-                catch (Exception ex) when (ex is DbUpdateException || ex is DbException || ex is SqlException)
+                catch (Exception ex) when (ex is DbUpdateException || ex is DbException)
                 {
                     throw new Exception("Error while fetching data from the database. Please try again later.");
                 }

diff --git a/JobLeet.WebApi/JobLeet.WebApi.csproj b/JobLeet.WebApi/JobLeet.WebApi.csproj
@@ -8,28 +8,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="JobLeet.Api\Middlewares\NewFolder\**" />
-    <Compile Remove="JobLeet.Core\Constants\**" />
-    <Content Remove="JobLeet.Api\Middlewares\NewFolder\**" />
-    <Content Remove="JobLeet.Core\Constants\**" />
-    <EmbeddedResource Remove="JobLeet.Api\Middlewares\NewFolder\**" />
-    <EmbeddedResource Remove="JobLeet.Core\Constants\**" />
-    <None Remove="JobLeet.Api\Middlewares\NewFolder\**" />
-    <None Remove="JobLeet.Core\Constants\**" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="8.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.12" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <!-- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" /> -->
     <PackageReference Include="Newtonsoft.json" Version="13.0.3" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <!-- <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" /> -->
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
+    <!-- <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" /> -->
     <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />