From c861a4b1943ff66ac17d8a53de15515e3fae78c1 Mon Sep 17 00:00:00 2001 From: fede Date: Mon, 28 Oct 2024 17:20:25 -0300 Subject: [PATCH] Actualizacion de las entidades --- Entidades/Alquilafacilcontext.cs | 59 +++++++++++++------------------- Entidades/Cliente.cs | 8 ++++- Entidades/Grupo.cs | 4 +-- Entidades/Usuario.cs | 19 ---------- 4 files changed, 32 insertions(+), 58 deletions(-) delete mode 100644 Entidades/Usuario.cs diff --git a/Entidades/Alquilafacilcontext.cs b/Entidades/Alquilafacilcontext.cs index c1d86b1..5fa3686 100644 --- a/Entidades/Alquilafacilcontext.cs +++ b/Entidades/Alquilafacilcontext.cs @@ -37,11 +37,10 @@ public partial class AlquilaFacilContext : DbContext public virtual DbSet Recibos { get; set; } - public virtual DbSet Usuarios { get; set; } - public virtual DbSet Ventas { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) +#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263. => optionsBuilder.UseMySQL("Server=fedesrv.ddns.net;Port=30006;Database=AlquilaFacil;Uid=AlquilaFacil;Pwd=.n@9c2ve*0,b1ETv].Kipa/~pR~V;Connection Timeout=5;SslMode=none"); protected override void OnModelCreating(ModelBuilder modelBuilder) @@ -75,14 +74,32 @@ public partial class AlquilaFacilContext : DbContext entity.Property(e => e.dni).HasColumnType("bigint(20)"); entity.Property(e => e.apellido).HasMaxLength(20); entity.Property(e => e.celular).HasMaxLength(40); + entity.Property(e => e.contraseña).HasMaxLength(128); entity.Property(e => e.domicilio).HasMaxLength(40); + entity.Property(e => e.email).HasMaxLength(50); entity.Property(e => e.idusuario).HasColumnType("int(11)"); entity.Property(e => e.nombre).HasMaxLength(20); + entity.Property(e => e.token).HasColumnType("text"); - entity.HasOne(d => d.idusuarioNavigation).WithMany(p => p.Clientes) - .HasForeignKey(d => d.idusuario) - .OnDelete(DeleteBehavior.Restrict) - .HasConstraintName("FK_PROP_USU"); + entity.HasMany(d => d.idgrupos).WithMany(p => p.idclientes) + .UsingEntity>( + "cliente_Grupo", + r => r.HasOne().WithMany() + .HasForeignKey("idgrupo") + .OnDelete(DeleteBehavior.Restrict) + .HasConstraintName("FK_GRU"), + l => l.HasOne().WithMany() + .HasForeignKey("idcliente") + .OnDelete(DeleteBehavior.Restrict) + .HasConstraintName("FK_CLII"), + j => + { + j.HasKey("idcliente", "idgrupo").HasName("PRIMARY"); + j.ToTable("cliente_Grupos"); + j.HasIndex(new[] { "idgrupo" }, "FK_GRU"); + j.IndexerProperty("idcliente").HasColumnType("bigint(20)"); + j.IndexerProperty("idgrupo").HasColumnType("int(11)"); + }); }); modelBuilder.Entity(entity => @@ -295,36 +312,6 @@ public partial class AlquilaFacilContext : DbContext entity.Property(e => e.monto).HasPrecision(12); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.id).HasName("PRIMARY"); - - entity.Property(e => e.id).HasColumnType("int(11)"); - entity.Property(e => e.contraseña).HasMaxLength(128); - entity.Property(e => e.email).HasMaxLength(50); - entity.Property(e => e.token).HasColumnType("text"); - - entity.HasMany(d => d.idgrupos).WithMany(p => p.idusuarios) - .UsingEntity>( - "usuario_Grupo", - r => r.HasOne().WithMany() - .HasForeignKey("idgrupo") - .OnDelete(DeleteBehavior.Restrict) - .HasConstraintName("FK_GRU"), - l => l.HasOne().WithMany() - .HasForeignKey("idusuario") - .OnDelete(DeleteBehavior.Restrict) - .HasConstraintName("FK_USU"), - j => - { - j.HasKey("idusuario", "idgrupo").HasName("PRIMARY"); - j.ToTable("usuario_Grupos"); - j.HasIndex(new[] { "idgrupo" }, "FK_GRU"); - j.IndexerProperty("idusuario").HasColumnType("int(11)"); - j.IndexerProperty("idgrupo").HasColumnType("int(11)"); - }); - }); - modelBuilder.Entity(entity => { entity.HasKey(e => e.id).HasName("PRIMARY"); diff --git a/Entidades/Cliente.cs b/Entidades/Cliente.cs index 915ef77..701d41b 100644 --- a/Entidades/Cliente.cs +++ b/Entidades/Cliente.cs @@ -17,6 +17,12 @@ public partial class Cliente public int? idusuario { get; set; } + public string email { get; set; } = null!; + + public byte[] contraseña { get; set; } = null!; + + public string? token { get; set; } + public virtual ICollection ContratodniinquilinoNavigations { get; set; } = new List(); public virtual ICollection ContratodnipropietarioNavigations { get; set; } = new List(); @@ -27,5 +33,5 @@ public partial class Cliente public virtual ICollection Ventaidprop_oldNavigations { get; set; } = new List(); - public virtual Usuario? idusuarioNavigation { get; set; } + public virtual ICollection idgrupos { get; set; } = new List(); } diff --git a/Entidades/Grupo.cs b/Entidades/Grupo.cs index 8d7d383..9ee51b4 100644 --- a/Entidades/Grupo.cs +++ b/Entidades/Grupo.cs @@ -9,7 +9,7 @@ public partial class Grupo public string nombre { get; set; } = null!; - public virtual ICollection idpermisos { get; set; } = new List(); + public virtual ICollection idclientes { get; set; } = new List(); - public virtual ICollection idusuarios { get; set; } = new List(); + public virtual ICollection idpermisos { get; set; } = new List(); } diff --git a/Entidades/Usuario.cs b/Entidades/Usuario.cs deleted file mode 100644 index 2d72efa..0000000 --- a/Entidades/Usuario.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Entidades; - -public partial class Usuario -{ - public int id { get; set; } - - public string email { get; set; } = null!; - - public byte[] contraseña { get; set; } = null!; - - public string? token { get; set; } - - public virtual ICollection Clientes { get; set; } = new List(); - - public virtual ICollection idgrupos { get; set; } = new List(); -}