From 3166d5116ff20dc6e80dcdd816a7129d6aa5cf9f Mon Sep 17 00:00:00 2001 From: "Dario F. Gomez Z" Date: Thu, 29 Jun 2023 09:33:06 -0500 Subject: [PATCH] Ajuste de bloqueo usuario y correos por area --- .../MsUsuarios/Context/CORREOSAREAMS.cs | 20 +++++++++++++++++++ .../MsUsuarios/Context/CorreosArea.cs | 13 ------------ .../MsUsuarios/Context/ModelContext.cs | 6 +++--- Microservicios/MsUsuarios/Context/USUARIO.cs | 4 ++-- .../Controllers/CorreosAreaController.cs | 8 ++++---- .../Controllers/PerfilesController.cs | 1 + .../Controllers/UsuariosController.cs | 2 +- Microservicios/MsUsuarios/Dto/UsuarioDTO.cs | 1 + .../MsUsuarios/appsettings.Development.json | 6 +++--- 9 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 Microservicios/MsUsuarios/Context/CORREOSAREAMS.cs delete mode 100644 Microservicios/MsUsuarios/Context/CorreosArea.cs diff --git a/Microservicios/MsUsuarios/Context/CORREOSAREAMS.cs b/Microservicios/MsUsuarios/Context/CORREOSAREAMS.cs new file mode 100644 index 0000000..ec22b6b --- /dev/null +++ b/Microservicios/MsUsuarios/Context/CORREOSAREAMS.cs @@ -0,0 +1,20 @@ +namespace MSAdminUsuarios.Context +{ + public class CORREOSAREAMS + { + /*public int NU_PK_CORA { get; set; } + public int? NU_MODULO_CORA { get; set; } + public int? NU_AREA_CORA { get; set; } + public int? NU_SEDE_CORA { get; set; } + public int? BL_ESTADO_CORA { get; set; } + public string? TX_FKDOC_USUMS { get; set; } + public string? TX_CORREOS_CORA { get; set; }*/ + public int NU_PK_CRRMS { get; set; } + public string? TX_AREA_CRRMS { get; set; } + public int? NU_FK_MS { get; set; } + public string? TX_FKDOC_USUMS { get; set; } + public string? TX_SEDES_CRRMS { get; set; } + public string? TX_CORREOS_CRRMS { get; set; } + public int? NU_ESTADO_CRRMS { get; set; } + } +} diff --git a/Microservicios/MsUsuarios/Context/CorreosArea.cs b/Microservicios/MsUsuarios/Context/CorreosArea.cs deleted file mode 100644 index 16d3141..0000000 --- a/Microservicios/MsUsuarios/Context/CorreosArea.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace MSAdminUsuarios.Context -{ - public class CorreosArea - { - public int NU_PK_CORA { get; set; } - public int? NU_MODULO_CORA { get; set; } - public int? NU_AREA_CORA { get; set; } - public int? NU_SEDE_CORA { get; set; } - public int? BL_ESTADO_CORA { get; set; } - public string? TX_FKDOC_USUMS { get; set; } - public string? TX_CORREOS_CORA { get; set; } - } -} diff --git a/Microservicios/MsUsuarios/Context/ModelContext.cs b/Microservicios/MsUsuarios/Context/ModelContext.cs index 95cb594..33f85b9 100644 --- a/Microservicios/MsUsuarios/Context/ModelContext.cs +++ b/Microservicios/MsUsuarios/Context/ModelContext.cs @@ -22,7 +22,7 @@ namespace MSAdminUsuarios.Context public virtual DbSet PERFILESMs { get; set; } = null!; public virtual DbSet PERFILESPORUSUARIOs { get; set; } = null!; public virtual DbSet USUARIOSMs { get; set; } = null!; - public virtual DbSet CORREOSAREAMS { get; set; } = null!; + public virtual DbSet CORREOSAREAMS { get; set; } = null!; protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { @@ -97,9 +97,9 @@ namespace MSAdminUsuarios.Context entity.Property(e => e.CL_FIRMA_USUMS).HasColumnType("CLOB"); }); - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { - entity.HasKey(e => e.NU_PK_CORA); + entity.HasKey(e => e.NU_PK_CRRMS); entity.ToTable("CORREOSAREAMS"); diff --git a/Microservicios/MsUsuarios/Context/USUARIO.cs b/Microservicios/MsUsuarios/Context/USUARIO.cs index c0ec80b..e6fb642 100644 --- a/Microservicios/MsUsuarios/Context/USUARIO.cs +++ b/Microservicios/MsUsuarios/Context/USUARIO.cs @@ -28,7 +28,7 @@ namespace MSAdminUsuarios.Context public int? NU_GRUPO_USUMS { get; set; } public int? NU_CARGO_USUMS { get; set; } public int? NU_MODALIDADCTT_USUMS { get; set; } - public string? TX_SEDES_USUMS { get; set; } - + public string? TX_SEDES_USUMS { get; set; } + public int? NU_BLOQUEO_USUMS { get; set; } = 1; } } diff --git a/Microservicios/MsUsuarios/Controllers/CorreosAreaController.cs b/Microservicios/MsUsuarios/Controllers/CorreosAreaController.cs index 6e4a418..c44a273 100644 --- a/Microservicios/MsUsuarios/Controllers/CorreosAreaController.cs +++ b/Microservicios/MsUsuarios/Controllers/CorreosAreaController.cs @@ -20,7 +20,7 @@ namespace MSAdminUsuarios.Controllers { try { - List lista = this._context.CORREOSAREAMS.ToList(); + List lista = this._context.CORREOSAREAMS.ToList(); return Ok(lista); } catch (Exception ex) @@ -30,7 +30,7 @@ namespace MSAdminUsuarios.Controllers } [HttpPost] - public IActionResult post([FromBody] CorreosArea nuevo) + public IActionResult post([FromBody] CORREOSAREAMS nuevo) { try @@ -47,12 +47,12 @@ namespace MSAdminUsuarios.Controllers } [HttpPatch] - public IActionResult patch([FromBody] CorreosArea actualizar) + public IActionResult patch([FromBody] CORREOSAREAMS actualizar) { try { - CorreosArea? existente = this._context.CORREOSAREAMS.FirstOrDefault(c => c.NU_PK_CORA == actualizar.NU_PK_CORA); + CORREOSAREAMS? existente = this._context.CORREOSAREAMS.FirstOrDefault(c => c.NU_PK_CRRMS == actualizar.NU_PK_CRRMS); if (existente == null) return BadRequest("Registro inexistente"); this._context.Entry(existente).CurrentValues.SetValues(actualizar); diff --git a/Microservicios/MsUsuarios/Controllers/PerfilesController.cs b/Microservicios/MsUsuarios/Controllers/PerfilesController.cs index c4e7901..9e1a6a4 100644 --- a/Microservicios/MsUsuarios/Controllers/PerfilesController.cs +++ b/Microservicios/MsUsuarios/Controllers/PerfilesController.cs @@ -60,6 +60,7 @@ namespace MSAdminUsuarios.Controllers var existe = _context.PERFILESMs.Find(editado.NU_PK_PFL); existe.TX_PERFIL_PFL = editado.TX_PERFIL_PFL; + existe.NU_ROL_PFL = editado.NU_ROL_PFL; existe.BL_ESTADO_PFL = editado.BL_ESTADO_PFL; _context.PERFILESMs.Update(existe); diff --git a/Microservicios/MsUsuarios/Controllers/UsuariosController.cs b/Microservicios/MsUsuarios/Controllers/UsuariosController.cs index 2525b76..a4319ac 100644 --- a/Microservicios/MsUsuarios/Controllers/UsuariosController.cs +++ b/Microservicios/MsUsuarios/Controllers/UsuariosController.cs @@ -255,7 +255,7 @@ namespace MSAdminUsuarios.Controllers existe.NU_CARGO_USUMS = editado.NU_CARGO_USUMS; existe.NU_MODALIDADCTT_USUMS = editado.NU_MODALIDADCTT_USUMS; existe.TX_SEDES_USUMS = editado.TX_SEDES_USUMS; - + existe.NU_BLOQUEO_USUMS = editado.NU_BLOQUEO_USUMS; ErrorModel errorPFLxUSUMS = await ActualizarRelaciones(existe.TX_PKDOC_USUMS, editado.TX_PKDOC_USUMS); diff --git a/Microservicios/MsUsuarios/Dto/UsuarioDTO.cs b/Microservicios/MsUsuarios/Dto/UsuarioDTO.cs index 4be874f..2d30b4a 100644 --- a/Microservicios/MsUsuarios/Dto/UsuarioDTO.cs +++ b/Microservicios/MsUsuarios/Dto/UsuarioDTO.cs @@ -37,5 +37,6 @@ namespace MSAdminUsuarios.Dto public int? NU_CARGO_USUMS { get; set; } public int? NU_MODALIDADCTT_USUMS { get; set; } public string? TX_SEDES_USUMS { get; set; } + public int? NU_BLOQUEO_USUMS { get; set; } } } diff --git a/Microservicios/MsUsuarios/appsettings.Development.json b/Microservicios/MsUsuarios/appsettings.Development.json index c013fc0..e41d9e6 100644 --- a/Microservicios/MsUsuarios/appsettings.Development.json +++ b/Microservicios/MsUsuarios/appsettings.Development.json @@ -3,9 +3,9 @@ "ConString": "user id=HIMSCAP;password=ITTASA2017;data source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=181.129.245.90)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=PROYECTOS)))" }, "RabbitMQConfig": { - "HostName": "192.168.1.69", - "UserName": "user", - "Password": "password" + "HostName": "localhost", + "UserName": "guest", + "Password": "guest" }, "Logging": { "LogLevel": {