Merge remote-tracking branch 'origin/develop'

equipognoss · Oct 5, 2023 · ec55bac · ec55bac
2 parents 0a8e755 + 10918a1
commit ec55bac
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Gnoss.BackgroundTask.Replication/ControladorReplicas.cs b/Gnoss.BackgroundTask.Replication/ControladorReplicas.cs
@@ -87,9 +87,13 @@ public bool ProcesarItem(string pConsulta)
             using (var scope = ScopedFactory.CreateScope())
             {
                 EntityContext entityContext = scope.ServiceProvider.GetRequiredService<EntityContext>();
+                entityContext.SetTrackingFalse();
                 UtilidadesVirtuoso utilidadesVirtuoso = scope.ServiceProvider.GetRequiredService<UtilidadesVirtuoso>();
                 LoggingService loggingService = scope.ServiceProvider.GetRequiredService<LoggingService>();
+                RedisCacheWrapper redisCacheWrapper = scope.ServiceProvider.GetRequiredService<RedisCacheWrapper>();
+                ConfigService configService = scope.ServiceProvider.GetRequiredService<ConfigService>();
                 IServicesUtilVirtuosoAndReplication servicesUtilVirtuosoAndReplication = scope.ServiceProvider.GetRequiredService<IServicesUtilVirtuosoAndReplication>();
+                ComprobarTraza("Replication", entityContext, loggingService, redisCacheWrapper, configService, servicesUtilVirtuosoAndReplication);
                 try
                 {
 
@@ -105,7 +109,7 @@ public bool ProcesarItem(string pConsulta)
 
                         if (datosReplicacion.Key.Count > 1)
                         {
-                            VirtuosoAD virtuosoAD = new VirtuosoAD(loggingService, entityContext, mConfigService, servicesUtilVirtuosoAndReplication);
+                            VirtuosoAD virtuosoAD = new VirtuosoAD(loggingService, entityContext, mConfigService, servicesUtilVirtuosoAndReplication, mCadenaConexionVirtuoso);
                             virtuosoAD.IniciarTransaccion();
 
                             try
@@ -143,6 +147,10 @@ public bool ProcesarItem(string pConsulta)
                 {
                     return false;
                 }
+                finally
+                {
+                    GuardarTraza(loggingService);
+                }
                 return true;
             }
         }
@@ -443,7 +451,7 @@ private void InsertarEnVirtuoso(string pConexionVirtuoso, string pConsulta, bool
                         Thread.Sleep(2000);
                     }
 
-                    virtuosoAD = new VirtuosoAD(loggingService, entityContext, mConfigService, servicesUtilVirtuosoAndReplication);
+                    virtuosoAD = new VirtuosoAD(loggingService, entityContext, mConfigService, servicesUtilVirtuosoAndReplication, pConexionVirtuoso);
                     //Insertar en virtuoso
                     if (pUsarHttpPost)
                     {

diff --git a/Gnoss.BackgroundTask.Replication/Gnoss.BackgroundTask.Replication.csproj b/Gnoss.BackgroundTask.Replication/Gnoss.BackgroundTask.Replication.csproj
@@ -6,13 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.20" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-    <PackageReference Include="Npgsql" Version="5.0.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
+    <PackageReference Include="Npgsql" Version="6.0.9" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.8" />
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.90" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Gnoss.BackgroundTask.Replication/Program.cs b/Gnoss.BackgroundTask.Replication/Program.cs
@@ -3,6 +3,7 @@
 using Es.Riam.Gnoss.AD.EntityModelBASE;
 using Es.Riam.Gnoss.AD.Virtuoso;
 using Es.Riam.Gnoss.CL;
+using Es.Riam.Gnoss.CL.RelatedVirtuoso;
 using Es.Riam.Gnoss.Servicios;
 using Es.Riam.Gnoss.Util.Configuracion;
 using Es.Riam.Gnoss.Util.General;
@@ -47,6 +48,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     services.AddScoped(typeof(LoggingService));
                     services.AddScoped(typeof(GnossCache));
                     services.AddScoped<IServicesUtilVirtuosoAndReplication, ServicesVirtuosoAndBidirectionalReplicationOpen>();
+                    services.AddScoped(typeof(RelatedVirtuosoCL));
                     string bdType = "";
                     IDictionary environmentVariables = Environment.GetEnvironmentVariables();
                     if (environmentVariables.Contains("connectionType"))