From a74d080d02e0f4ca6044c215bc12ec6eb536b5d7 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sun, 23 Sep 2018 21:01:59 +0200 Subject: [PATCH] Add UserBankAccount --- Model/DatabaseContext.cs | 1 + Server/Commands/Admin.cs | 3 ++- Server/Entities/UserBankAccount.cs | 32 ++++++++++++++++++++++++++++++ Server/Entities/UserVehicle.cs | 4 +++- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Server/Entities/UserBankAccount.cs diff --git a/Model/DatabaseContext.cs b/Model/DatabaseContext.cs index 9849697f..ac8d3c94 100644 --- a/Model/DatabaseContext.cs +++ b/Model/DatabaseContext.cs @@ -38,6 +38,7 @@ namespace reallife_gamemode.Model public DbSet Users { get; set; } public DbSet UserVehicles { get; set; } + public DbSet BankAccounts { get; set; } public DbSet Blips { get; set; } public DbSet Markers { get; set; } diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index b1894b4d..041d5e27 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -303,7 +303,7 @@ namespace reallife_gamemode.Server.Commands { var dataSet = new Entities.UserVehicle { - UserId = ClientExtension.GetUser(player).Id, + UserId = player.GetUser().Id, Model = (VehicleHash) playerVehicle.Model, PositionX = playerVehicle.Position.X, PositionY = playerVehicle.Position.Y, @@ -350,6 +350,7 @@ namespace reallife_gamemode.Server.Commands } } } + /* [Command("restart")] public void CmdAdminRestart(Client player) diff --git a/Server/Entities/UserBankAccount.cs b/Server/Entities/UserBankAccount.cs new file mode 100644 index 00000000..ba295a39 --- /dev/null +++ b/Server/Entities/UserBankAccount.cs @@ -0,0 +1,32 @@ +using GTANetworkAPI; +using reallife_gamemode.Server.Util; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; + +/** +* @overview Life of German Reallife - Entities UserVehicle (UserVehicle.cs) +* @author VegaZ +* @copyright (c) 2008 - 2018 Life of German +*/ + +namespace reallife_gamemode.Server.Entities +{ + public class UserBankAccount + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public int Id { get; set; } + [ForeignKey("User")] + public int UserId { get; set; } + public User User { get; set; } + [StringLength(12)] + public string bic { get; set; } + [StringLength(32)] + public string Iban { get; set; } + public float Money { get; set; } + public bool Active { get; set; } + } +} \ No newline at end of file diff --git a/Server/Entities/UserVehicle.cs b/Server/Entities/UserVehicle.cs index 66daec9e..2c8be155 100644 --- a/Server/Entities/UserVehicle.cs +++ b/Server/Entities/UserVehicle.cs @@ -8,7 +8,7 @@ using System.Text; /** * @overview Life of German Reallife - Entities UserVehicle (UserVehicle.cs) -* @author VegaZ, hydrant +* @author VegaZ * @copyright (c) 2008 - 2018 Life of German */ @@ -21,6 +21,8 @@ namespace reallife_gamemode.Server.Entities public int Id { get; set; } [ForeignKey("User")] public int UserId { get; set; } + public User User { get; set; } + public VehicleHash Model { get; set; } public float PositionX { get; set; } public float PositionY { get; set; }