Merge pull request 'fix update packages' (#1) from fix/CR-1.0.1-alineación-actualizacion-de-dependencias into develop

Reviewed-on: #1

.gitignore

@@ -379,3 +379,5 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 .idea
+/.ollamassist/conversations
+/write_readme.py

adas-core.Application/adas-core.Application.csproj

@@ -21,20 +21,30 @@
 
         <PackageReference Include="AutoMapper" Version="16.1.1" />
 
-        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.11" />
-
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.9" />
+
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.9" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
         <PackageReference Include="MongoDB.Driver" Version="3.9.0" />
         <PackageReference Include="Quartz" Version="3.18.1" />
         <PackageReference Include="StackExchange.Redis" Version="3.0.0" />
+        <PackageReference Include="System.Text.Json" Version="10.0.9" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="Microsoft.AspNetCore.Http.Features">
+            <HintPath>..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\7.0.10\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+        </Reference>
     </ItemGroup>
 
 </Project>

adas-core.Authentication/adas-core.Authentication.csproj

@@ -10,12 +10,12 @@
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
         <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.11" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.11" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.11" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.28" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.9" />
         <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.19.1" />

adas-core.Domain/adas-core.Domain.csproj

@@ -10,11 +10,15 @@
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
         <PackageReference Include="BCrypt.Net-Next" Version="4.2.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.11" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.11" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.28" />
         <PackageReference Include="MongoDB.Bson" Version="3.9.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
         <PackageReference Include="Serilog" Version="4.3.1" />
+        <PackageReference Include="SharpCompress" Version="0.49.1" />
+        <PackageReference Include="Snappier" Version="1.3.1" />
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.19.1" />
         <PackageReference Include="System.Text.Json" Version="10.0.9" />
         <PackageReference Include="TagLibSharp" Version="2.3.0" />

adas-core.Infrastructure/adas-core.Infrastructure.csproj

@@ -14,6 +14,8 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.9" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
         <PackageReference Include="MongoMigrations.Core" Version="4.0.15" />
         <PackageReference Include="StackExchange.Redis" Version="3.0.0" />

adas-core.LdapLogin/LdapLoginService.cs

@@ -5,12 +5,11 @@ using adas_core.Domain.Models.MongoModels;
 using adas_core.LdapLogin.Configuration;
 using FluentValidation;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MongoDB.Bson;
-using System.DirectoryServices.Protocols;
-using System.Net;
-using Authorization = adas_core.Domain.Models.MongoModels.Authorization;
+using Novell.Directory.Ldap;
 
 namespace adas_core.LdapLogin;
 
@@ -40,128 +39,157 @@ public class LdapLoginService : ILoginService
 
     public async Task<User> Login(string username, string password)
     {
-        if (_ldapConfig.Server == null)
-            throw new LoginServicesException("LDAP Config not found");
-
-        var identifier = new LdapDirectoryIdentifier(_ldapConfig.Server, _ldapConfig.Port ?? 389);
-        var connection = new LdapConnection(identifier);
-
+        // Check for LDAP config
+        if (_ldapConfig.Server == null) throw new LoginServicesException("LDAP Config not found");
+        var conn = new LdapConnection();
         try
         {
-            if (_ldapConfig.LdapUser != null)
-            {
-                _logger.LogInformation("[LDAP] Using configured LDAP user {LdapUser}", _ldapConfig.LdapUser);
-                connection.Credential = new NetworkCredential(_ldapConfig.LdapUser, _ldapConfig.LdapPassword);
-            }
-            else
-            {
-                var ldapUser = (!string.IsNullOrEmpty(_ldapConfig.UserDomainName)
-                    ? _ldapConfig.UserDomainName + @"\"
-                    : "") + username;
-
-                connection.Credential = new NetworkCredential(ldapUser, password);
-            }
-
-            connection.AuthType = AuthType.Basic;
-            connection.Bind();
+            await conn.ConnectAsync(_ldapConfig.Server, _ldapConfig.Port ?? 389);
         }
-        catch (LdapException e)
+        catch (Exception e)
         {
-            _logger.LogError("[LDAP] Error binding user {username}", username);
-            throw new UserNotFoundException(username, e);
+            _logger.LogError("[LDAP] Error connecting to {server}, port {port}, Exception: {e}", _ldapConfig.Server,
+                _ldapConfig.Port, e.Message);
+            throw;
         }
 
-        SearchResultEntry? entry = null;
-
-        try
+        if (_ldapConfig.LdapUser != null)
         {
-            var request = new SearchRequest(
-                _ldapConfig.SearchBase,
-                $"({_ldapConfig.UserNameProperty}={username})",
-                SearchScope.Subtree
-            );
+            _logger.LogInformation("[LDAP] _ldapConfig.LdapUser is enabled with {LdapUser}", _ldapConfig.LdapUser);
+            await conn.BindAsync(_ldapConfig.LdapUser, _ldapConfig.LdapPassword);
+        }
+        else
+        {
+            var ldapUser = (!string.IsNullOrEmpty(_ldapConfig.UserDomainName)
+                ? _ldapConfig.UserDomainName + @"\"
+                : "") + username;
 
-            var response = (SearchResponse)connection.SendRequest(request);
+            try
+            {
+                await conn.BindAsync(ldapUser, password);
+            }
+            catch (LdapException e)
+            {
+                _logger.LogError("[LDAP] Error binding ldapUser: {LdapUser} and password", ldapUser);
 
-            foreach (SearchResultEntry current in response.Entries)
+                throw new UserNotFoundException(username, e);
+            }
+        }
+
+        var results = await conn.SearchAsync(
+            _ldapConfig.SearchBase,
+            LdapConnection.ScopeSub,
+            $"({_ldapConfig.UserNameProperty}={username})",
+            null,
+            false);
+
+
+        LdapEntry? entry = null;
+
+        while (await results.HasMoreAsync())
+        {
+            LdapEntry? current = null;
+
+            try
+            {
+                current = await results.NextAsync();
+            }
+            catch (LdapException ex)
+            {
+                _logger.LogWarning("[LDAP] Skipping invalid entry: {error}", ex.Message);
+                continue;
+            }
+
+            if (current != null)
             {
                 entry = current;
                 break;
             }
         }
-        catch (Exception e)
-        {
-            _logger.LogError("[LDAP] Search error for user {username}: {error}", username, e.Message);
-            throw;
-        }
 
-        if (entry == null)
-            throw new LoginServicesException("LDAP User not found");
 
+        if (entry == null) throw new LoginServicesException("LDAP User not found");
         var userEntryLdap = GetUser(entry);
         var user = await GetOrCreateUser(userEntryLdap, entry);
-
-        _logger.LogInformation("[LDAP] entry found and user {user}", user);
-
-        connection.Dispose();
-
+        _logger.LogInformation("[LDAP] entry is {entry} and user {user}", entry, user);
+        // user.Authorization.AddRange(GetAuthorities(entry));
+        conn.Disconnect();
         return user ?? throw new LoginServicesException("LDAP User not found");
     }
 
     public Task<User> Login(HttpContext context)
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
     public Task<User> Authenticate(string username, string password)
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
     public Task<User?> GetById(ObjectId id)
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
     public Task<User?> GetByEmail(string email)
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
     public Task<User?> GetByUsername(string username)
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
     public Task<List<User>> GetAllUsers()
-        => throw new LoginServicesException("Not implemented");
+    {
+        throw new LoginServicesException("Not implemented");
+    }
 
-    private async Task<User?> GetOrCreateUser(User userEntryLdap, SearchResultEntry entry)
+    private async Task<User?> GetOrCreateUser(User userEntryLdap, LdapEntry entry)
     {
         var userToReturn = (await _userService.Value.GetUserByUserName(userEntryLdap.UserName) ??
                             await _userService.Value.GetUserByName(userEntryLdap.Name)) ??
                            await _userService.Value.CreateUser(userEntryLdap);
 
         if (userToReturn == null) return userToReturn;
-
         userToReturn.Authorization = [];
 
         var authorities = await CheckAuthorities(userToReturn, entry);
-        userToReturn.Authorization.AddRange(authorities);
 
+        userToReturn.Authorization.AddRange(authorities);
+        //foreach (var authorization in userToReturn.Authorization)
+        //{
+        //    Enum.TryParse<RolesType>(authorization.Rol, out var compareRole);
+        //    if (compareRole == RolesType.Admin) userToReturn.Rol = RolesType.Admin;
+        //}
         return userToReturn;
     }
 
-    private async Task<List<Authorization>> CheckAuthorities(User user, SearchResultEntry entry)
+    private async Task<List<Authorization>> CheckAuthorities(User user, LdapEntry entry)
     {
         try
         {
             var authorizationMap = GetAuthoritiesMap(entry, user);
             var authorizationWhiteList = GetAuthoritiesWhiteList(entry, user);
+            _logger.LogInformation(
+                "[LDAP] user {user} authorizationMap count is {authorizationMap}, authorizationWhiteList count is {authorizationWhiteList}",
+                user.UserName, authorizationMap.Count, authorizationWhiteList.Count);
 
+            // Primero, creamos un HashSet con los DisplayID de la lista blanca para búsqueda eficiente
             var whiteListDisplayIds = new HashSet<string?>(authorizationWhiteList.Select(a => a.DisplayId));
 
-            var uniqueMapAuthorizations = authorizationMap
-                .Where(a => !whiteListDisplayIds.Contains(a.DisplayId));
+            // Filtramos los elementos de authorizationMap que no están en la lista blanca, basándonos en DisplayID
+            var uniqueMapAuthorizations = authorizationMap.Where(a => !whiteListDisplayIds.Contains(a.DisplayId));
 
+            // Finalmente, combinamos los elementos únicos de authorizationMap con los de authorizationWhiteList
             var combinedList = authorizationWhiteList.Concat(uniqueMapAuthorizations).ToList();
 
             var userAuthorities = await _authorityService.GetUserAuthorities(user.Id);
-
             foreach (var auth in combinedList)
             {
                 var authFound = userAuthorities.Find(c => c.DisplayId == auth.DisplayId);
-
                 if (authFound is { CanUpdate: true })
                 {
                     authFound.Rol = auth.Rol;
@@ -177,32 +205,36 @@ public class LdapLoginService : ILoginService
         }
         catch (Exception e)
         {
-            _logger.LogError("[LDAP] CheckAuthorities error for user {user}: {error}",
-                user.UserName, e.Message);
+            _logger.LogError("[LDAP] CheckAuthorities for user {user} has exception {ex}", user.UserName, e.Message);
 
             return [];
         }
     }
 
-    private List<Authorization> GetAuthoritiesWhiteList(SearchResultEntry entry, User user)
+    private List<Authorization> GetAuthoritiesWhiteList(LdapEntry entry, User user)
     {
         try
         {
-            var result = new List<Authorization>();
+            var userWhiteList = new List<Authorization>();
+            var userNameProperty = _ldapConfig.UserNameProperty;
 
             var whiteList = _ldapConfig.WhiteList.FindAll(u =>
-                (u.Name != null && entry.DistinguishedName.Contains(u.Name, StringComparison.CurrentCultureIgnoreCase)) ||
+                (u.Name != null && entry.Dn.Contains(u.Name, StringComparison.CurrentCultureIgnoreCase)) ||
                 (u.Username != null &&
-                 entry.Attributes[_ldapConfig.UserNameProperty]?[0]?.ToString()
-                     ?.Equals(u.Username, StringComparison.CurrentCultureIgnoreCase) == true)
+                 userNameProperty != null &&
+                 entry.GetAttributeSet().TryGetValue(userNameProperty, out var attr) &&
+                 attr.StringValue != null &&
+                 attr.StringValue.Equals(u.Username, StringComparison.CurrentCultureIgnoreCase))
             );
 
+            if (whiteList.Count == 0) return userWhiteList;
+
             foreach (var authorityMap in whiteList)
             {
                 if (!Enum.TryParse<PermissionEnum.RolesType>(authorityMap.Rol, out _))
                     continue;
 
-                result.Add(new Authorization
+                userWhiteList.Add(new Authorization
                 {
                     UserId = user.Id,
                     DisplayId = authorityMap.DisplayId,
@@ -210,42 +242,59 @@ public class LdapLoginService : ILoginService
                 });
             }
 
-            return result;
+            return userWhiteList;
         }
         catch (Exception e)
         {
-            _logger.LogError("[LDAP] GetAuthoritiesWhiteList error: {error}", e.Message);
+            _logger.LogError("[LDAP] GetAuthoritiesWhiteList for user {user} has exception {ex}", user.UserName,
+                e.Message);
+
             return [];
         }
     }
 
-    private User GetUser(SearchResultEntry entry)
+    private User GetUser(LdapEntry ldapEntry)
     {
-        var user = new User
-        {
-            UserName = entry.Attributes[_ldapConfig.UserNameProperty]?[0]?.ToString() ?? ""
-        };
+        var attributes = ldapEntry.GetAttributeSet();
 
-        if (!string.IsNullOrWhiteSpace(_ldapConfig.FirstNameProperty))
+        var user = new User();
+
+        // UserName
+        if (!string.IsNullOrWhiteSpace(_ldapConfig.UserNameProperty) &&
+            attributes.TryGetValue(_ldapConfig.UserNameProperty, out var userAttr) &&
+            userAttr?.StringValue != null)
         {
-            var first = entry.Attributes[_ldapConfig.FirstNameProperty]?[0]?.ToString();
-            if (first != null)
-                user.Name = first;
+            user.UserName = userAttr.StringValue;
+        }
+        else
+        {
+            user.UserName = "";
         }
 
-        if (!string.IsNullOrWhiteSpace(_ldapConfig.LastNameProperty))
+        _logger.LogInformation("[LDAP] GetUser UserName is {UserName} ", user.UserName);
+
+        // First name
+        if (!string.IsNullOrWhiteSpace(_ldapConfig.FirstNameProperty) &&
+            attributes.TryGetValue(_ldapConfig.FirstNameProperty, out var firstNameAttr) &&
+            firstNameAttr?.StringValue != null)
         {
-            var last = entry.Attributes[_ldapConfig.LastNameProperty]?[0]?.ToString();
-            if (last != null)
-                user.Name = string.IsNullOrEmpty(user.Name)
-                    ? last
-                    : $"{user.Name} {last}";
+            user.Name = firstNameAttr.StringValue;
+        }
+
+        // Last name
+        if (!string.IsNullOrWhiteSpace(_ldapConfig.LastNameProperty) &&
+            attributes.TryGetValue(_ldapConfig.LastNameProperty, out var lastNameAttr) &&
+            lastNameAttr?.StringValue != null)
+        {
+            user.Name = string.IsNullOrEmpty(user.Name)
+                ? lastNameAttr.StringValue
+                : $"{user.Name} {lastNameAttr.StringValue}";
         }
 
         return user;
     }
 
-    private List<Authorization> GetAuthoritiesMap(SearchResultEntry entry, User user)
+    private List<Authorization> GetAuthoritiesMap(LdapEntry ldapEntry, User user)
     {
         try
         {
@@ -254,14 +303,16 @@ public class LdapLoginService : ILoginService
             if (!_ldapConfig.AuthoritiesMap.Any())
                 return authorities;
 
-            var groupAttr = entry.Attributes[_ldapConfig.GroupsProperty];
+            var attributes = ldapEntry.GetAttributeSet();
 
-            if (groupAttr == null)
+            if (!string.IsNullOrWhiteSpace(_ldapConfig.GroupsProperty) ||
+                !attributes.TryGetValue(_ldapConfig.GroupsProperty!, out var groupsAttr) ||
+                groupsAttr?.StringValueArray == null)
+            {
                 return authorities;
+            }
 
-            var groups = groupAttr.GetValues(typeof(string))
-                .Cast<string>()
-                .ToList();
+            var groups = groupsAttr.StringValueArray.ToList();
 
             foreach (var authorityMap in _ldapConfig.AuthoritiesMap)
             {
@@ -284,7 +335,7 @@ public class LdapLoginService : ILoginService
         }
         catch (Exception e)
         {
-            _logger.LogError("[LDAP] GetAuthoritiesMap error: {error}", e.Message);
+            _logger.LogError("Error getting Authorities Map. Return new empty list. Exception: {e}", e);
             return [];
         }
     }

adas-core.LdapLogin/adas-core.LdapLogin.csproj

@@ -14,12 +14,12 @@
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
         <PackageReference Include="FluentValidation" Version="12.1.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.11" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.DirectoryServices.Protocols" Version="10.0.9" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+        <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
     </ItemGroup>
 
 </Project>

adas-core.LocalLogin/adas-core.LocalLogin.csproj

@@ -14,11 +14,12 @@
 
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
-        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.11" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+        <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     </ItemGroup>
 
 </Project>

adas-core.Test/adas-core.Test.csproj

@@ -25,8 +25,9 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.28" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.9" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+        <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="18.1.1" />
         <PackageReference Include="Mongo2Go" Version="4.1.0" />
         <PackageReference Include="MongoMigrations.Core" Version="4.0.15" />
         <PackageReference Include="Moq" Version="4.20.72" />

adas-core.module.LightBeacons/adas-core.module.LightBeacons.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -18,6 +18,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
     </ItemGroup>
 
 </Project>

adas-core.module.ProxyDevices/adas-core.module.ProxyDevices.csproj

@@ -15,7 +15,11 @@
 
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
         <PackageReference Include="Serilog" Version="4.3.1" />
+        <PackageReference Include="SharpCompress" Version="0.49.1" />
+        <PackageReference Include="Snappier" Version="1.3.1" />
     </ItemGroup>
 
 

adas-core.module.Relays/adas-core.module.Relays.csproj

@@ -9,6 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="AuditLogs" Version="1.0.59" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
     </ItemGroup>
 
     <ItemGroup>

adas-core/adas-core.csproj

@@ -30,11 +30,15 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.28" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.28" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.9" />
         <PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.19.1" />
+        <PackageReference Include="Microsoft.OpenApi" Version="3.7.0" />
         <PackageReference Include="MongoDB.Driver" Version="3.9.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
+        <PackageReference Include="Quartz" Version="3.18.1" />
         <PackageReference Include="Serilog" Version="4.3.1" />
         <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
         <PackageReference Include="Serilog.Enrichers.Dynamic" Version="1.0.9" />
@@ -44,6 +48,12 @@
         <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
         <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+        
+        <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.9" />
+        <PackageReference Include="System.Management" Version="10.0.9" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
+        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
         <PackageReference Include="WebPush" Version="1.0.13" />
     </ItemGroup>
 

adas-core/appsettings.NursePlan.json

@@ -20,7 +20,7 @@
     //"ConnectionString": "mongodb://smartuci:!H12o2020@localhost:27017/?authSource=smartuci",
     //"ConnectionString": "mongodb://admin:4q*pHca@10.0.20.78:22007",
     //"ConnectionString": "mongodb://smacsuci:2(R*aQpu2r@sumo.julianrojas.xyz:27017/?authSource=admin",
-    "DatabaseName": "adas"
+    "DatabaseName": "adasDevNewStandard"
   },
   "DatabaseConfigurationAudit": {
     "ConnectionString": "mongodb://smacsuci:2(R*aQpu2r@julianrojas.xyz:27017/?authSource=admin",