cuqmbr/netxml2kml
1
0
Fork 0
Code Issues Pull Requests Activity

refactor: remake database model classes

Browse Source 
It allowed to make possible flexible manipulations on database data
This commit is contained in:
cuqmbr 2022-08-12 21:30:17 +03:00
parent 676ec839ac
commit 386516df00
8 changed files with 249 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netxml2kml/Data/DatabaseContext.cs
View File

@ -7,6 +7,7 @@ public sealed class DatabaseContext : DbContext
{ {
public DbSet<WirelessNetwork> WirelessNetworks { get; set; } = null!; public DbSet<WirelessNetwork> WirelessNetworks { get; set; } = null!;
public DbSet<WirelessClient> WirelessClients { get; set; } = null!; public DbSet<WirelessClient> WirelessClients { get; set; } = null!;
public DbSet<WirelessConnection> WirelessConnections { get; set; } = null!;
private string DbPath { get; } private string DbPath { get; }
@ -23,6 +24,12 @@ public sealed class DatabaseContext : DbContext
DbPath = Path.Join(path, "netxml2kml.sqlite3.db"); DbPath = Path.Join(path, "netxml2kml.sqlite3.db");
} }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<WirelessConnection>().HasKey(wc =>
new {wc.WirelessNetworkBssid, wc.WirelessClientMac});
}
protected override void OnConfiguring(DbContextOptionsBuilder options) protected override void OnConfiguring(DbContextOptionsBuilder options)
=> options.UseSqlite($"Data Source={DbPath}"); => options.UseSqlite($"Data Source={DbPath}");
} }

75
netxml2kml/Migrations/20220810152156_InitialCreate.cs
View File

@ -1,75 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace netxml2kml.Migrations
{
public partial class InitialCreate : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "WirelessClients",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Mac = table.Column<string>(type: "TEXT", nullable: false),
Manufacturer = table.Column<string>(type: "TEXT", nullable: false),
TotalPackets = table.Column<int>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WirelessClients", x => x.Id);
});
migrationBuilder.CreateTable(
name: "WirelessNetworks",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Ssid = table.Column<string>(type: "TEXT", nullable: false),
IsCloaked = table.Column<bool>(type: "INTEGER", nullable: false),
Encryption = table.Column<string>(type: "TEXT", nullable: false),
Bssid = table.Column<string>(type: "TEXT", nullable: false),
Manufacturer = table.Column<string>(type: "TEXT", nullable: false),
Channel = table.Column<int>(type: "INTEGER", nullable: false),
FrequencyMhz = table.Column<int>(type: "INTEGER", nullable: false),
MaxSignalDbm = table.Column<int>(type: "INTEGER", nullable: false),
MaxLatitude = table.Column<double>(type: "REAL", nullable: false),
MaxLongitude = table.Column<double>(type: "REAL", nullable: false),
MaxAltitude = table.Column<double>(type: "REAL", nullable: false),
FirstSeen = table.Column<DateTime>(type: "TEXT", nullable: false),
LastUpdate = table.Column<DateTime>(type: "TEXT", nullable: false),
TotalPackets = table.Column<int>(type: "INTEGER", nullable: false),
WirelessClientId = table.Column<int>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WirelessNetworks", x => x.Id);
table.ForeignKey(
name: "FK_WirelessNetworks_WirelessClients_WirelessClientId",
column: x => x.WirelessClientId,
principalTable: "WirelessClients",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_WirelessNetworks_WirelessClientId",
table: "WirelessNetworks",
column: "WirelessClientId");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "WirelessNetworks");
migrationBuilder.DropTable(
name: "WirelessClients");
}
}
}

98
netxml2kml/Migrations/20220810152156_InitialCreate.Designer.cs → netxml2kml/Migrations/20220812182106_InitialCreate.Designer.cs generated
View File

@ -11,7 +11,7 @@ using netxml2kml.Data;
namespace netxml2kml.Migrations namespace netxml2kml.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20220810152156_InitialCreate")] [Migration("20220812182106_InitialCreate")]
partial class InitialCreate partial class InitialCreate
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -21,53 +21,63 @@ namespace netxml2kml.Migrations
modelBuilder.Entity("netxml2kml.Models.WirelessClient", b => modelBuilder.Entity("netxml2kml.Models.WirelessClient", b =>
{ {
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Mac") b.Property<string>("Mac")
.IsRequired() .HasColumnType("TEXT");
b.Property<DateTime>("FirstSeenDate")
.HasColumnType("TEXT");
b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Manufacturer") b.Property<string>("Manufacturer")
.IsRequired() .IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("TotalPackets") b.HasKey("Mac");
.HasColumnType("INTEGER");
b.HasKey("Id");
b.ToTable("WirelessClients"); b.ToTable("WirelessClients");
}); });
modelBuilder.Entity("netxml2kml.Models.WirelessConnection", b =>
{
b.Property<string>("WirelessNetworkBssid")
.HasColumnType("TEXT");
b.Property<string>("WirelessClientMac")
.HasColumnType("TEXT");
b.Property<DateTime>("FirstSeenDate")
.HasColumnType("TEXT");
b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT");
b.HasKey("WirelessNetworkBssid", "WirelessClientMac");
b.HasIndex("WirelessClientMac");
b.ToTable("WirelessConnections");
});
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b => modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b =>
{ {
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Bssid") b.Property<string>("Bssid")
.IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("Channel")
.HasColumnType("INTEGER");
b.Property<string>("Encryption") b.Property<string>("Encryption")
.IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<DateTime>("FirstSeen") b.Property<string>("Essid")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("FrequencyMhz") b.Property<DateTime>("FirstSeenDate")
.HasColumnType("INTEGER"); .HasColumnType("TEXT");
b.Property<bool>("IsCloaked") b.Property<double>("FrequencyMhz")
.HasColumnType("INTEGER"); .HasColumnType("REAL");
b.Property<DateTime>("LastUpdate") b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Manufacturer") b.Property<string>("Manufacturer")
@ -86,32 +96,38 @@ namespace netxml2kml.Migrations
b.Property<int>("MaxSignalDbm") b.Property<int>("MaxSignalDbm")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<string>("Ssid") b.HasKey("Bssid");
.IsRequired()
.HasColumnType("TEXT");
b.Property<int>("TotalPackets")
.HasColumnType("INTEGER");
b.Property<int>("WirelessClientId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("WirelessClientId");
b.ToTable("WirelessNetworks"); b.ToTable("WirelessNetworks");
}); });
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b => modelBuilder.Entity("netxml2kml.Models.WirelessConnection", b =>
{ {
b.HasOne("netxml2kml.Models.WirelessClient", "WirelessClient") b.HasOne("netxml2kml.Models.WirelessClient", "WirelessClient")
.WithMany() .WithMany("WirelessConnections")
.HasForeignKey("WirelessClientId") .HasForeignKey("WirelessClientMac")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("netxml2kml.Models.WirelessNetwork", "WirelessNetwork")
.WithMany("WirelessConnections")
.HasForeignKey("WirelessNetworkBssid")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.Navigation("WirelessClient"); b.Navigation("WirelessClient");
b.Navigation("WirelessNetwork");
});
modelBuilder.Entity("netxml2kml.Models.WirelessClient", b =>
{
b.Navigation("WirelessConnections");
});
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b =>
{
b.Navigation("WirelessConnections");
}); });
#pragma warning restore 612, 618 #pragma warning restore 612, 618
} }

91
netxml2kml/Migrations/20220812182106_InitialCreate.cs Normal file
View File

@ -0,0 +1,91 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace netxml2kml.Migrations
{
public partial class InitialCreate : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "WirelessClients",
columns: table => new
{
Mac = table.Column<string>(type: "TEXT", nullable: false),
Manufacturer = table.Column<string>(type: "TEXT", nullable: false),
FirstSeenDate = table.Column<DateTime>(type: "TEXT", nullable: false),
LastUpdateDate = table.Column<DateTime>(type: "TEXT", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WirelessClients", x => x.Mac);
});
migrationBuilder.CreateTable(
name: "WirelessNetworks",
columns: table => new
{
Bssid = table.Column<string>(type: "TEXT", nullable: false),
Essid = table.Column<string>(type: "TEXT", nullable: true),
Manufacturer = table.Column<string>(type: "TEXT", nullable: false),
Encryption = table.Column<string>(type: "TEXT", nullable: true),
FrequencyMhz = table.Column<double>(type: "REAL", nullable: false),
MaxSignalDbm = table.Column<int>(type: "INTEGER", nullable: false),
MaxLatitude = table.Column<double>(type: "REAL", nullable: false),
MaxLongitude = table.Column<double>(type: "REAL", nullable: false),
MaxAltitude = table.Column<double>(type: "REAL", nullable: false),
FirstSeenDate = table.Column<DateTime>(type: "TEXT", nullable: false),
LastUpdateDate = table.Column<DateTime>(type: "TEXT", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WirelessNetworks", x => x.Bssid);
});
migrationBuilder.CreateTable(
name: "WirelessConnections",
columns: table => new
{
WirelessNetworkBssid = table.Column<string>(type: "TEXT", nullable: false),
WirelessClientMac = table.Column<string>(type: "TEXT", nullable: false),
FirstSeenDate = table.Column<DateTime>(type: "TEXT", nullable: false),
LastUpdateDate = table.Column<DateTime>(type: "TEXT", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WirelessConnections", x => new { x.WirelessNetworkBssid, x.WirelessClientMac });
table.ForeignKey(
name: "FK_WirelessConnections_WirelessClients_WirelessClientMac",
column: x => x.WirelessClientMac,
principalTable: "WirelessClients",
principalColumn: "Mac",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_WirelessConnections_WirelessNetworks_WirelessNetworkBssid",
column: x => x.WirelessNetworkBssid,
principalTable: "WirelessNetworks",
principalColumn: "Bssid",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_WirelessConnections_WirelessClientMac",
table: "WirelessConnections",
column: "WirelessClientMac");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "WirelessConnections");
migrationBuilder.DropTable(
name: "WirelessClients");
migrationBuilder.DropTable(
name: "WirelessNetworks");
}
}
}

96
netxml2kml/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -19,53 +19,63 @@ namespace netxml2kml.Migrations
modelBuilder.Entity("netxml2kml.Models.WirelessClient", b => modelBuilder.Entity("netxml2kml.Models.WirelessClient", b =>
{ {
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Mac") b.Property<string>("Mac")
.IsRequired() .HasColumnType("TEXT");
b.Property<DateTime>("FirstSeenDate")
.HasColumnType("TEXT");
b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Manufacturer") b.Property<string>("Manufacturer")
.IsRequired() .IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("TotalPackets") b.HasKey("Mac");
.HasColumnType("INTEGER");
b.HasKey("Id");
b.ToTable("WirelessClients"); b.ToTable("WirelessClients");
}); });
modelBuilder.Entity("netxml2kml.Models.WirelessConnection", b =>
{
b.Property<string>("WirelessNetworkBssid")
.HasColumnType("TEXT");
b.Property<string>("WirelessClientMac")
.HasColumnType("TEXT");
b.Property<DateTime>("FirstSeenDate")
.HasColumnType("TEXT");
b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT");
b.HasKey("WirelessNetworkBssid", "WirelessClientMac");
b.HasIndex("WirelessClientMac");
b.ToTable("WirelessConnections");
});
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b => modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b =>
{ {
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Bssid") b.Property<string>("Bssid")
.IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("Channel")
.HasColumnType("INTEGER");
b.Property<string>("Encryption") b.Property<string>("Encryption")
.IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<DateTime>("FirstSeen") b.Property<string>("Essid")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<int>("FrequencyMhz") b.Property<DateTime>("FirstSeenDate")
.HasColumnType("INTEGER"); .HasColumnType("TEXT");
b.Property<bool>("IsCloaked") b.Property<double>("FrequencyMhz")
.HasColumnType("INTEGER"); .HasColumnType("REAL");
b.Property<DateTime>("LastUpdate") b.Property<DateTime>("LastUpdateDate")
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("Manufacturer") b.Property<string>("Manufacturer")
@ -84,32 +94,38 @@ namespace netxml2kml.Migrations
b.Property<int>("MaxSignalDbm") b.Property<int>("MaxSignalDbm")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
b.Property<string>("Ssid") b.HasKey("Bssid");
.IsRequired()
.HasColumnType("TEXT");
b.Property<int>("TotalPackets")
.HasColumnType("INTEGER");
b.Property<int>("WirelessClientId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("WirelessClientId");
b.ToTable("WirelessNetworks"); b.ToTable("WirelessNetworks");
}); });
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b => modelBuilder.Entity("netxml2kml.Models.WirelessConnection", b =>
{ {
b.HasOne("netxml2kml.Models.WirelessClient", "WirelessClient") b.HasOne("netxml2kml.Models.WirelessClient", "WirelessClient")
.WithMany() .WithMany("WirelessConnections")
.HasForeignKey("WirelessClientId") .HasForeignKey("WirelessClientMac")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("netxml2kml.Models.WirelessNetwork", "WirelessNetwork")
.WithMany("WirelessConnections")
.HasForeignKey("WirelessNetworkBssid")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Cascade)
.IsRequired(); .IsRequired();
b.Navigation("WirelessClient"); b.Navigation("WirelessClient");
b.Navigation("WirelessNetwork");
});
modelBuilder.Entity("netxml2kml.Models.WirelessClient", b =>
{
b.Navigation("WirelessConnections");
});
modelBuilder.Entity("netxml2kml.Models.WirelessNetwork", b =>
{
b.Navigation("WirelessConnections");
}); });
#pragma warning restore 612, 618 #pragma warning restore 612, 618
} }

11
netxml2kml/Models/WirelessClient.cs
View File

@ -1,10 +1,15 @@
using System.ComponentModel.DataAnnotations;
namespace netxml2kml.Models; namespace netxml2kml.Models;
public class WirelessClient public class WirelessClient
{ {
public int Id { get; set; } [Key]
public string Mac { get; set; } = null!; public string Mac { get; set; } = null!;
public string Manufacturer { get; set; } = null!; public string Manufacturer { get; set; } = null!;
public int TotalPackets { get; set; }
public DateTime FirstSeenDate { get; set; }
public DateTime LastUpdateDate { get; set; }
public List<WirelessConnection> WirelessConnections { get; set; } = null!;
} }

17
netxml2kml/Models/WirelessConnection.cs Normal file
View File

@ -0,0 +1,17 @@
using System.ComponentModel.DataAnnotations.Schema;
namespace netxml2kml.Models;
public class WirelessConnection
{
[ForeignKey("WirelessNetwork")]
public string WirelessNetworkBssid { get; set; } = null!;
public WirelessNetwork WirelessNetwork { get; set; } = null!;
[ForeignKey("WirelessClient")]
public string WirelessClientMac { get; set; } = null!;
public WirelessClient WirelessClient { get; set; } = null!;
public DateTime FirstSeenDate { get; set; }
public DateTime LastUpdateDate { get; set; }
}

29
netxml2kml/Models/WirelessNetwork.cs
View File

@ -1,19 +1,16 @@
using System.ComponentModel.DataAnnotations;
namespace netxml2kml.Models; namespace netxml2kml.Models;
public class WirelessNetwork public class WirelessNetwork
{ {
public int Id { get; set; } [Key]
public string Ssid { get; set; } = null!;
public bool IsCloaked { get; set; }
public string Encryption { get; set; } = null!;
public string Bssid { get; set; } = null!; public string Bssid { get; set; } = null!;
public string Manufacturer { get; set; } = null!;
public int Channel { get; set; } public string? Essid { get; set; }
public int FrequencyMhz { get; set; } public string Manufacturer { get; set; } = null!;
public string? Encryption { get; set; }
public double FrequencyMhz { get; set; }
public int MaxSignalDbm { get; set; } public int MaxSignalDbm { get; set; }
@ -21,10 +18,10 @@ public class WirelessNetwork
public double MaxLongitude { get; set; } public double MaxLongitude { get; set; }
public double MaxAltitude { get; set; } public double MaxAltitude { get; set; }
public DateTime FirstSeen { get; set; } public DateTime FirstSeenDate { get; set; }
public DateTime LastUpdate { get; set; } public DateTime LastUpdateDate { get; set; }
public int TotalPackets { get; set; } public List<WirelessConnection>? WirelessConnections { get; set; }
public WirelessClient WirelessClient { get; set; } = null!; public bool IsCloaked => Essid == null;
} }