Merge pull request #14 from nbollis/Experiment

Experiment, DataFile, And MetaData Models
smith-chem-wisc · Jan 4, 2024 · b6442d1 · b6442d1
2 parents 1485495 + edae9e4
commit b6442d1
Show file tree

Hide file tree

Showing 21 changed files with 1,169 additions and 3 deletions.
diff --git a/MetaPAL.sln b/MetaPAL.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.6.33712.159
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaPAL", "MetaPAL\MetaPAL.csproj", "{FC18E2D7-18AD-4174-8C2A-6AF4B36F73ED}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{313F1135-D23E-495F-8CB4-85006847ECFD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{FC18E2D7-18AD-4174-8C2A-6AF4B36F73ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC18E2D7-18AD-4174-8C2A-6AF4B36F73ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC18E2D7-18AD-4174-8C2A-6AF4B36F73ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{313F1135-D23E-495F-8CB4-85006847ECFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{313F1135-D23E-495F-8CB4-85006847ECFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{313F1135-D23E-495F-8CB4-85006847ECFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{313F1135-D23E-495F-8CB4-85006847ECFD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MetaPAL/Data/ApplicationDbContext.cs b/MetaPAL/Data/ApplicationDbContext.cs
@@ -1,5 +1,7 @@
-using MetaPAL.Models;
+using System.Data.Common;
+using MetaPAL.Models;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Omics.Fragmentation;
 
@@ -17,8 +19,15 @@ protected override void OnModelCreating(ModelBuilder builder)
             base.OnModelCreating(builder);
         }
 
-        public DbSet<MetaPAL.Models.SpectrumMatch>? SpectrumMatch { get; set; }
+        public DbSet<SpectrumMatch>? SpectrumMatch { get; set; }
 
-        public DbSet<MsDataScanModel>? MsDataScans { get; set; }
+        public DbSet<MsDataScanModel> MsDataScans { get; set; }
+
+        public DbSet<DataFile> MsDataFiles { get; set; }
+        public DbSet<Experiment> Experiments { get; set; }
+        public DbSet<MetaData> MetaData { get; set; }
     }
+
+
+
 }