From 36118ede1ca6d57d2d4e4f8402fbf8ba9ec3a47d Mon Sep 17 00:00:00 2001 From: ZMiguel Alves Date: Thu, 7 Mar 2019 18:27:14 +0000 Subject: [PATCH] cenas --- .../20190223232738_TeamsEvents.Designer.cs | 385 --------------- api/Migrations/20190223232738_TeamsEvents.cs | 417 ---------------- .../20190224020609_finos.Designer.cs | 452 ------------------ api/Migrations/20190306210633_team_fix.cs | 22 - ....cs => 20190307182012_teamsV1.Designer.cs} | 14 +- ...609_finos.cs => 20190307182012_teamsV1.cs} | 13 +- api/Migrations/DataContextModelSnapshot.cs | 10 +- api/Models/Team.cs | 1 - api/Models/User.cs | 3 +- api/obj/Debug/netcoreapp2.1/api.assets.cache | Bin 130703 -> 130703 bytes 10 files changed, 20 insertions(+), 1297 deletions(-) delete mode 100644 api/Migrations/20190223232738_TeamsEvents.Designer.cs delete mode 100644 api/Migrations/20190223232738_TeamsEvents.cs delete mode 100644 api/Migrations/20190224020609_finos.Designer.cs delete mode 100644 api/Migrations/20190306210633_team_fix.cs rename api/Migrations/{20190306210633_team_fix.Designer.cs => 20190307182012_teamsV1.Designer.cs} (98%) rename api/Migrations/{20190224020609_finos.cs => 20190307182012_teamsV1.cs} (98%) diff --git a/api/Migrations/20190223232738_TeamsEvents.Designer.cs b/api/Migrations/20190223232738_TeamsEvents.Designer.cs deleted file mode 100644 index ac20d2b6..00000000 --- a/api/Migrations/20190223232738_TeamsEvents.Designer.cs +++ /dev/null @@ -1,385 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using api.Data; - -namespace api.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20190223232738_TeamsEvents")] - partial class TeamsEvents - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("api.Models.Event", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Desc"); - - b.Property("Nome"); - - b.HasKey("Id"); - - b.ToTable("Events"); - }); - - modelBuilder.Entity("api.Models.EventLoc", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Desc"); - - b.Property("EventId"); - - b.Property("ImgId"); - - b.Property("Lat"); - - b.Property("Long"); - - b.Property("Nome"); - - b.HasKey("Id"); - - b.HasIndex("ImgId"); - - b.ToTable("EventLocs"); - }); - - modelBuilder.Entity("api.Models.EventLocVisited", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("LocationId"); - - b.Property("TeamId"); - - b.Property("timestamp"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("TeamId"); - - b.ToTable("EventLocsVisited"); - }); - - modelBuilder.Entity("api.Models.Photo", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DateAdded"); - - b.Property("Description"); - - b.Property("IsMain"); - - b.Property("Url"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("Photos"); - }); - - modelBuilder.Entity("api.Models.Role", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasMaxLength(256); - - b.Property("NormalizedName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("api.Models.Team", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("CapId"); - - b.Property("EventId"); - - b.Property("NMembros"); - - b.Property("Nome"); - - b.Property("Pontos"); - - b.Property("QRcode"); - - b.HasKey("Id"); - - b.HasIndex("CapId"); - - b.ToTable("Teams"); - }); - - modelBuilder.Entity("api.Models.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("QRcode"); - - b.Property("SecurityStamp"); - - b.Property("TeamId"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasName("UserNameIndex"); - - b.HasIndex("TeamId"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("api.Models.UserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("api.Models.Value", b => - { - b.Property("id") - .ValueGeneratedOnAdd(); - - b.Property("Name"); - - b.HasKey("id"); - - b.ToTable("Values"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("api.Models.Role") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("api.Models.EventLoc", b => - { - b.HasOne("api.Models.Photo", "Img") - .WithMany() - .HasForeignKey("ImgId"); - }); - - modelBuilder.Entity("api.Models.EventLocVisited", b => - { - b.HasOne("api.Models.EventLoc", "Location") - .WithMany() - .HasForeignKey("LocationId"); - - b.HasOne("api.Models.Team", "Team") - .WithMany() - .HasForeignKey("TeamId"); - }); - - modelBuilder.Entity("api.Models.Photo", b => - { - b.HasOne("api.Models.User", "User") - .WithMany("Photos") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("api.Models.Team", b => - { - b.HasOne("api.Models.User", "Cap") - .WithMany() - .HasForeignKey("CapId"); - }); - - modelBuilder.Entity("api.Models.User", b => - { - b.HasOne("api.Models.Team") - .WithMany("Membros") - .HasForeignKey("TeamId"); - }); - - modelBuilder.Entity("api.Models.UserRole", b => - { - b.HasOne("api.Models.Role", "Role") - .WithMany("UserRoles") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("api.Models.User", "User") - .WithMany("UserRoles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/api/Migrations/20190223232738_TeamsEvents.cs b/api/Migrations/20190223232738_TeamsEvents.cs deleted file mode 100644 index 23f1b84e..00000000 --- a/api/Migrations/20190223232738_TeamsEvents.cs +++ /dev/null @@ -1,417 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace api.Migrations -{ - public partial class TeamsEvents : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AspNetRoles", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Name = table.Column(maxLength: 256, nullable: true), - NormalizedName = table.Column(maxLength: 256, nullable: true), - ConcurrencyStamp = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Events", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Nome = table.Column(nullable: true), - Desc = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Events", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Values", - columns: table => new - { - id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Name = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Values", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "AspNetRoleClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - RoleId = table.Column(nullable: false), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserRoles", - columns: table => new - { - UserId = table.Column(nullable: false), - RoleId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - UserId = table.Column(nullable: false), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserLogins", - columns: table => new - { - LoginProvider = table.Column(nullable: false), - ProviderKey = table.Column(nullable: false), - ProviderDisplayName = table.Column(nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserTokens", - columns: table => new - { - UserId = table.Column(nullable: false), - LoginProvider = table.Column(nullable: false), - Name = table.Column(nullable: false), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - }); - - migrationBuilder.CreateTable( - name: "Photos", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Url = table.Column(nullable: true), - Description = table.Column(nullable: true), - DateAdded = table.Column(nullable: false), - IsMain = table.Column(nullable: false), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Photos", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "EventLocs", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - EventId = table.Column(nullable: false), - Lat = table.Column(nullable: false), - Long = table.Column(nullable: false), - Nome = table.Column(nullable: true), - Desc = table.Column(nullable: true), - ImgId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_EventLocs", x => x.Id); - table.ForeignKey( - name: "FK_EventLocs_Photos_ImgId", - column: x => x.ImgId, - principalTable: "Photos", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "Teams", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - QRcode = table.Column(nullable: true), - EventId = table.Column(nullable: false), - Nome = table.Column(nullable: true), - CapId = table.Column(nullable: true), - NMembros = table.Column(nullable: false), - Pontos = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Teams", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUsers", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - UserName = table.Column(maxLength: 256, nullable: true), - NormalizedUserName = table.Column(maxLength: 256, nullable: true), - Email = table.Column(maxLength: 256, nullable: true), - NormalizedEmail = table.Column(maxLength: 256, nullable: true), - EmailConfirmed = table.Column(nullable: false), - PasswordHash = table.Column(nullable: true), - SecurityStamp = table.Column(nullable: true), - ConcurrencyStamp = table.Column(nullable: true), - PhoneNumber = table.Column(nullable: true), - PhoneNumberConfirmed = table.Column(nullable: false), - TwoFactorEnabled = table.Column(nullable: false), - LockoutEnd = table.Column(nullable: true), - LockoutEnabled = table.Column(nullable: false), - AccessFailedCount = table.Column(nullable: false), - QRcode = table.Column(nullable: true), - TeamId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUsers", x => x.Id); - table.ForeignKey( - name: "FK_AspNetUsers_Teams_TeamId", - column: x => x.TeamId, - principalTable: "Teams", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "EventLocsVisited", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - TeamId = table.Column(nullable: true), - LocationId = table.Column(nullable: true), - timestamp = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_EventLocsVisited", x => x.Id); - table.ForeignKey( - name: "FK_EventLocsVisited_EventLocs_LocationId", - column: x => x.LocationId, - principalTable: "EventLocs", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_EventLocsVisited_Teams_TeamId", - column: x => x.TeamId, - principalTable: "Teams", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_AspNetRoleClaims_RoleId", - table: "AspNetRoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserClaims_UserId", - table: "AspNetUserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserLogins_UserId", - table: "AspNetUserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_RoleId", - table: "AspNetUserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "AspNetUsers", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName", - unique: true); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUsers_TeamId", - table: "AspNetUsers", - column: "TeamId"); - - migrationBuilder.CreateIndex( - name: "IX_EventLocs_ImgId", - table: "EventLocs", - column: "ImgId"); - - migrationBuilder.CreateIndex( - name: "IX_EventLocsVisited_LocationId", - table: "EventLocsVisited", - column: "LocationId"); - - migrationBuilder.CreateIndex( - name: "IX_EventLocsVisited_TeamId", - table: "EventLocsVisited", - column: "TeamId"); - - migrationBuilder.CreateIndex( - name: "IX_Photos_UserId", - table: "Photos", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_Teams_CapId", - table: "Teams", - column: "CapId"); - - migrationBuilder.AddForeignKey( - name: "FK_AspNetUserRoles_AspNetUsers_UserId", - table: "AspNetUserRoles", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_AspNetUserClaims_AspNetUsers_UserId", - table: "AspNetUserClaims", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_AspNetUserLogins_AspNetUsers_UserId", - table: "AspNetUserLogins", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_AspNetUserTokens_AspNetUsers_UserId", - table: "AspNetUserTokens", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Photos_AspNetUsers_UserId", - table: "Photos", - column: "UserId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - - migrationBuilder.AddForeignKey( - name: "FK_Teams_AspNetUsers_CapId", - table: "Teams", - column: "CapId", - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Teams_AspNetUsers_CapId", - table: "Teams"); - - migrationBuilder.DropTable( - name: "AspNetRoleClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserLogins"); - - migrationBuilder.DropTable( - name: "AspNetUserRoles"); - - migrationBuilder.DropTable( - name: "AspNetUserTokens"); - - migrationBuilder.DropTable( - name: "EventLocsVisited"); - - migrationBuilder.DropTable( - name: "Events"); - - migrationBuilder.DropTable( - name: "Values"); - - migrationBuilder.DropTable( - name: "AspNetRoles"); - - migrationBuilder.DropTable( - name: "EventLocs"); - - migrationBuilder.DropTable( - name: "Photos"); - - migrationBuilder.DropTable( - name: "AspNetUsers"); - - migrationBuilder.DropTable( - name: "Teams"); - } - } -} diff --git a/api/Migrations/20190224020609_finos.Designer.cs b/api/Migrations/20190224020609_finos.Designer.cs deleted file mode 100644 index ff88151c..00000000 --- a/api/Migrations/20190224020609_finos.Designer.cs +++ /dev/null @@ -1,452 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using api.Data; - -namespace api.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20190224020609_finos")] - partial class finos - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.0-rtm-35687") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("api.Models.Event", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Desc"); - - b.Property("Nome"); - - b.HasKey("Id"); - - b.ToTable("Events"); - }); - - modelBuilder.Entity("api.Models.EventLoc", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Desc"); - - b.Property("EventId"); - - b.Property("ImgId"); - - b.Property("Lat"); - - b.Property("Long"); - - b.Property("Nome"); - - b.HasKey("Id"); - - b.HasIndex("ImgId"); - - b.ToTable("EventLocs"); - }); - - modelBuilder.Entity("api.Models.EventLocVisited", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("LocationId"); - - b.Property("TeamId"); - - b.Property("timestamp"); - - b.HasKey("Id"); - - b.HasIndex("LocationId"); - - b.HasIndex("TeamId"); - - b.ToTable("EventLocsVisited"); - }); - - modelBuilder.Entity("api.Models.Log", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("UserId"); - - b.Property("UserId1"); - - b.Property("amount"); - - b.Property("available"); - - b.Property("logType"); - - b.Property("productId"); - - b.Property("transactionId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.HasIndex("UserId1"); - - b.HasIndex("productId"); - - b.ToTable("Logs"); - }); - - modelBuilder.Entity("api.Models.Photo", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("DateAdded"); - - b.Property("Description"); - - b.Property("IsMain"); - - b.Property("Url"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("Photos"); - }); - - modelBuilder.Entity("api.Models.Product", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("basePrice"); - - b.Property("name"); - - b.Property("revenue"); - - b.Property("sold"); - - b.HasKey("Id"); - - b.ToTable("Products"); - }); - - modelBuilder.Entity("api.Models.Role", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasMaxLength(256); - - b.Property("NormalizedName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("api.Models.Team", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("CapId"); - - b.Property("EventId"); - - b.Property("NMembros"); - - b.Property("Nome"); - - b.Property("Pontos"); - - b.Property("QRcode"); - - b.HasKey("Id"); - - b.HasIndex("CapId"); - - b.ToTable("Teams"); - }); - - modelBuilder.Entity("api.Models.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("QRcode"); - - b.Property("SecurityStamp"); - - b.Property("TeamId"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasMaxLength(256); - - b.Property("drinks"); - - b.Property("food"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasName("UserNameIndex"); - - b.HasIndex("TeamId"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("api.Models.UserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("api.Models.Value", b => - { - b.Property("id") - .ValueGeneratedOnAdd(); - - b.Property("Name"); - - b.HasKey("id"); - - b.ToTable("Values"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("api.Models.Role") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("api.Models.User") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("api.Models.EventLoc", b => - { - b.HasOne("api.Models.Photo", "Img") - .WithMany() - .HasForeignKey("ImgId"); - }); - - modelBuilder.Entity("api.Models.EventLocVisited", b => - { - b.HasOne("api.Models.EventLoc", "Location") - .WithMany() - .HasForeignKey("LocationId"); - - b.HasOne("api.Models.Team", "Team") - .WithMany() - .HasForeignKey("TeamId"); - }); - - modelBuilder.Entity("api.Models.Log", b => - { - b.HasOne("api.Models.User") - .WithMany("logsFebrada") - .HasForeignKey("UserId"); - - b.HasOne("api.Models.User") - .WithMany("logsFestarola") - .HasForeignKey("UserId1"); - - b.HasOne("api.Models.Product", "product") - .WithMany() - .HasForeignKey("productId"); - }); - - modelBuilder.Entity("api.Models.Photo", b => - { - b.HasOne("api.Models.User", "User") - .WithMany("Photos") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("api.Models.Team", b => - { - b.HasOne("api.Models.User", "Cap") - .WithMany() - .HasForeignKey("CapId"); - }); - - modelBuilder.Entity("api.Models.User", b => - { - b.HasOne("api.Models.Team") - .WithMany("Membros") - .HasForeignKey("TeamId"); - }); - - modelBuilder.Entity("api.Models.UserRole", b => - { - b.HasOne("api.Models.Role", "Role") - .WithMany("UserRoles") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("api.Models.User", "User") - .WithMany("UserRoles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/api/Migrations/20190306210633_team_fix.cs b/api/Migrations/20190306210633_team_fix.cs deleted file mode 100644 index f20f449a..00000000 --- a/api/Migrations/20190306210633_team_fix.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace api.Migrations -{ - public partial class team_fix : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "QRcode", - table: "Teams"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "QRcode", - table: "Teams", - nullable: true); - } - } -} diff --git a/api/Migrations/20190306210633_team_fix.Designer.cs b/api/Migrations/20190307182012_teamsV1.Designer.cs similarity index 98% rename from api/Migrations/20190306210633_team_fix.Designer.cs rename to api/Migrations/20190307182012_teamsV1.Designer.cs index ad4dd097..9d4890f1 100644 --- a/api/Migrations/20190306210633_team_fix.Designer.cs +++ b/api/Migrations/20190307182012_teamsV1.Designer.cs @@ -9,8 +9,8 @@ using api.Data; namespace api.Migrations { [DbContext(typeof(DataContext))] - [Migration("20190306210633_team_fix")] - partial class team_fix + [Migration("20190307182012_teamsV1")] + partial class teamsV1 { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -295,8 +295,6 @@ namespace api.Migrations b.Property("SecurityStamp"); - b.Property("TeamId"); - b.Property("TwoFactorEnabled"); b.Property("UserName") @@ -306,6 +304,8 @@ namespace api.Migrations b.Property("food"); + b.Property("teamId"); + b.HasKey("Id"); b.HasIndex("NormalizedEmail") @@ -315,7 +315,7 @@ namespace api.Migrations .IsUnique() .HasName("UserNameIndex"); - b.HasIndex("TeamId"); + b.HasIndex("teamId"); b.ToTable("AspNetUsers"); }); @@ -427,9 +427,9 @@ namespace api.Migrations modelBuilder.Entity("api.Models.User", b => { - b.HasOne("api.Models.Team") + b.HasOne("api.Models.Team", "team") .WithMany("Membros") - .HasForeignKey("TeamId"); + .HasForeignKey("teamId"); }); modelBuilder.Entity("api.Models.UserRole", b => diff --git a/api/Migrations/20190224020609_finos.cs b/api/Migrations/20190307182012_teamsV1.cs similarity index 98% rename from api/Migrations/20190224020609_finos.cs rename to api/Migrations/20190307182012_teamsV1.cs index 493d3c7f..2ef87021 100644 --- a/api/Migrations/20190224020609_finos.cs +++ b/api/Migrations/20190307182012_teamsV1.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace api.Migrations { - public partial class finos : Migration + public partial class teamsV1 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -220,7 +220,6 @@ namespace api.Migrations { Id = table.Column(nullable: false) .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - QRcode = table.Column(nullable: true), EventId = table.Column(nullable: false), Nome = table.Column(nullable: true), CapId = table.Column(nullable: true), @@ -255,14 +254,14 @@ namespace api.Migrations QRcode = table.Column(nullable: true), drinks = table.Column(nullable: false), food = table.Column(nullable: false), - TeamId = table.Column(nullable: true) + teamId = table.Column(nullable: true) }, constraints: table => { table.PrimaryKey("PK_AspNetUsers", x => x.Id); table.ForeignKey( - name: "FK_AspNetUsers_Teams_TeamId", - column: x => x.TeamId, + name: "FK_AspNetUsers_Teams_teamId", + column: x => x.teamId, principalTable: "Teams", principalColumn: "Id", onDelete: ReferentialAction.Restrict); @@ -333,9 +332,9 @@ namespace api.Migrations unique: true); migrationBuilder.CreateIndex( - name: "IX_AspNetUsers_TeamId", + name: "IX_AspNetUsers_teamId", table: "AspNetUsers", - column: "TeamId"); + column: "teamId"); migrationBuilder.CreateIndex( name: "IX_EventLocs_ImgId", diff --git a/api/Migrations/DataContextModelSnapshot.cs b/api/Migrations/DataContextModelSnapshot.cs index b9c18848..175112d0 100644 --- a/api/Migrations/DataContextModelSnapshot.cs +++ b/api/Migrations/DataContextModelSnapshot.cs @@ -293,8 +293,6 @@ namespace api.Migrations b.Property("SecurityStamp"); - b.Property("TeamId"); - b.Property("TwoFactorEnabled"); b.Property("UserName") @@ -304,6 +302,8 @@ namespace api.Migrations b.Property("food"); + b.Property("teamId"); + b.HasKey("Id"); b.HasIndex("NormalizedEmail") @@ -313,7 +313,7 @@ namespace api.Migrations .IsUnique() .HasName("UserNameIndex"); - b.HasIndex("TeamId"); + b.HasIndex("teamId"); b.ToTable("AspNetUsers"); }); @@ -425,9 +425,9 @@ namespace api.Migrations modelBuilder.Entity("api.Models.User", b => { - b.HasOne("api.Models.Team") + b.HasOne("api.Models.Team", "team") .WithMany("Membros") - .HasForeignKey("TeamId"); + .HasForeignKey("teamId"); }); modelBuilder.Entity("api.Models.UserRole", b => diff --git a/api/Models/Team.cs b/api/Models/Team.cs index 44f28f7d..f37efe2a 100755 --- a/api/Models/Team.cs +++ b/api/Models/Team.cs @@ -10,7 +10,6 @@ namespace api.Models public int EventId{get;set;} //equipa para o evento ID public string Nome{get;set;} //Nome da equipa public User Cap{get;set;} //Capitao da equipa - public List Membros {get;set;} //Membros da equipa public int NMembros {get;set;} //Numero de Membros na equipa public int Pontos {get;set;} //Postos da equipa } diff --git a/api/Models/User.cs b/api/Models/User.cs index 6a90fdff..318e6345 100755 --- a/api/Models/User.cs +++ b/api/Models/User.cs @@ -15,7 +15,8 @@ namespace api.Models public ICollection Photos {get;set;} public int drinks{get;set;} public int food{get;set;} - + + public Team team{get;set;} } } \ No newline at end of file diff --git a/api/obj/Debug/netcoreapp2.1/api.assets.cache b/api/obj/Debug/netcoreapp2.1/api.assets.cache index 49137001effbd5c8397b707dcd3afba682fbd7a9..59e77d25bf802ff8bfcc6a5cb9a155d8309534a8 100755 GIT binary patch delta 63 zcmV-F0Kor`{RfZz2Q5%bM?nGr000~;PWI~S0f}RK*r#b2Tx|*xG&gSbJ5NEK3+%rF Vk^=|M0RRM(k3KtrXtihoC;sX87fS#D delta 63 zcmV-F0Kor`{RfZz2Q5%bM?nGr004EO3y`Zq5y}_NkoM1$<|x@vN!etcoE2jI|C7b% VX7UHl0RRM(k3KtrXtihoC;n;>9AW?f