mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed .xprr, closes #1608

Browse Source
This commit is contained in:
Master Kwoth 2017-09-23 03:32:12 +02:00
parent 3dfe5b8d55
commit 4f49b81dc1
5 changed files with 2048 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1985
src/NadekoBot/Migrations/20170923002439_xprr-fix.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

47
src/NadekoBot/Migrations/20170923002439_xprr-fix.cs Normal file
View File

@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
using System.Collections.Generic;
namespace NadekoBot.Migrations
{
public partial class xprrfix : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable("XpRoleReward");
migrationBuilder.CreateTable(
name: "XpRoleReward",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
Level = table.Column<int>(type: "INTEGER", nullable: false),
RoleId = table.Column<ulong>(type: "INTEGER", nullable: false),
XpSettingsId = table.Column<int>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_XpRoleReward", x => x.Id);
table.ForeignKey(
name: "FK_XpRoleReward_XpSettings_XpSettingsId",
column: x => x.XpSettingsId,
principalTable: "XpSettings",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_XpRoleReward_XpSettingsId_Level",
table: "XpRoleReward",
columns: new[] { "XpSettingsId", "Level" },
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

12
src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs
View File

@ -1559,13 +1559,12 @@ namespace NadekoBot.Migrations
b.Property<ulong>("RoleId");
b.Property<int?>("XpSettingsId");
b.Property<int>("XpSettingsId");
b.HasKey("Id");
b.HasAlternateKey("Level");
b.HasIndex("XpSettingsId");
b.HasIndex("XpSettingsId", "Level")
.IsUnique();
b.ToTable("XpRoleReward");
});
@ -1966,9 +1965,10 @@ namespace NadekoBot.Migrations
modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
{
b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
b.HasOne("NadekoBot.Services.Database.Models.XpSettings", "XpSettings")
.WithMany("RoleRewards")
.HasForeignKey("XpSettingsId");
.HasForeignKey("XpSettingsId")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>

7
src/NadekoBot/Services/Database/Models/XpSettings.cs
View File

@ -18,17 +18,20 @@ namespace NadekoBot.Services.Database.Models
public class XpRoleReward : DbEntity
{
public int XpSettingsId { get; set; }
public XpSettings XpSettings { get; set; }
public int Level { get; set; }
public ulong RoleId { get; set; }
public override int GetHashCode()
{
return Level.GetHashCode() ^ RoleId.GetHashCode();
return Level.GetHashCode() ^ XpSettingsId.GetHashCode();
}
public override bool Equals(object obj)
{
return obj is XpRoleReward xrr && xrr.Level == Level && xrr.RoleId == RoleId;
return obj is XpRoleReward xrr && xrr.Level == Level && xrr.XpSettingsId == XpSettingsId;
}
}

8
src/NadekoBot/Services/Database/NadekoContext.cs
View File

@ -277,7 +277,7 @@ namespace NadekoBot.Services.Database
modelBuilder.Entity<DiscordUser>()
.Property(x => x.LastLevelUp)
.HasDefaultValue(DateTime.Now);
.HasDefaultValue(new DateTime(2017, 9, 21, 20, 53, 13, 305, DateTimeKind.Local));
#endregion
@ -298,7 +298,8 @@ namespace NadekoBot.Services.Database
modelBuilder.Entity<UserXpStats>()
.Property(x => x.LastLevelUp)
.HasDefaultValue(DateTime.Now);
.HasDefaultValue(new DateTime(2017, 9, 21, 20, 53, 13, 307, DateTimeKind.Local));
#endregion
#region XpSettings
@ -310,7 +311,8 @@ namespace NadekoBot.Services.Database
//todo major bug
#region XpRoleReward
modelBuilder.Entity<XpRoleReward>()
.HasAlternateKey(x => x.Level);
.HasIndex(x => new { x.XpSettingsId, x.Level })
.IsUnique();
#endregion
#region Club