Add branch models to database

vicr123 · Jul 5, 2024 · 088bff8 · 088bff8
1 parent e065248
commit 088bff8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/Parlance.Database/Models/EditsPending.cs b/Parlance.Database/Models/EditsPending.cs
@@ -13,6 +13,7 @@ public class EditsPending
 
     public ulong UserId { get; set; }
     public string Project { get; set; } = null!;
+    public string Branch { get; set; } = null!;
     public string Subproject { get; set; } = null!;
     public string Language { get; set; } = null!;
 }
diff --git a/Parlance.Database/Models/IndexItem.cs b/Parlance.Database/Models/IndexItem.cs
@@ -21,6 +21,7 @@ public class IndexItem
     public Guid Id { get; set; }
 
     public string Project { get; set; } = null!;
+    public string Branch { get; set; } = null!;
     public string Subproject { get; set; } = null!;
     public string Language { get; set; } = null!;
     public string ItemIdentifier { get; set; } = null!;

diff --git a/Parlance.Database/Models/ProjectBranch.cs b/Parlance.Database/Models/ProjectBranch.cs
@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Parlance.Database.Models;
+
+public class ProjectBranch
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Key]
+    public Guid Id { get; set; }
+
+    public Guid? ProjectId { get; set; }
+    public Project? Project { get; set; }
+
+    public string BranchName { get; set; }
+
+    public string Worktree { get; set; }
+
+    public bool DefaultBranch { get; set; }
+}
diff --git a/Parlance.Database/Models/SourceStrings.cs b/Parlance.Database/Models/SourceStrings.cs
@@ -10,6 +10,7 @@ public class SourceStrings
     public Guid Id { get; set; }
 
     public string Project { get; set; }
+    public string Branch { get; set; }
     public string Subproject { get; set; }
     public string Language { get; set; }
     public string Key { get; set; }

diff --git a/Parlance.Database/ParlanceContext.cs b/Parlance.Database/ParlanceContext.cs
@@ -9,6 +9,7 @@ public class ParlanceContext(DbContextOptions options) : DbContext(options)
     public DbSet<SshTrustedServer> SshTrustedServers { get; set; } = null!;
     public DbSet<Superuser> Superusers { get; set; } = null!;
     public DbSet<Project> Projects { get; set; } = null!;
+    public DbSet<ProjectBranch> ProjectBranches { get; set; } = null!;
     public DbSet<Permission> Permissions { get; set; } = null!;
     public DbSet<IndexItem> Index { get; set; } = null!;
     public DbSet<Alert> Alerts { get; set; } = null!;
@@ -32,6 +33,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<Superuser>().ToTable("Superusers");
         modelBuilder.Entity<Project>().ToTable("Projects")
             .HasIndex(p => p.Name).IsUnique();
+        modelBuilder.Entity<ProjectBranch>().ToTable("ProjectBranches");
         modelBuilder.Entity<Permission>().ToTable("Permissions");
         modelBuilder.Entity<IndexItem>().ToTable("Index");
         modelBuilder.Entity<Alert>().ToTable("Alerts");

diff --git a/Parlance.Project/ParlanceProject.cs b/Parlance.Project/ParlanceProject.cs
@@ -14,7 +14,7 @@ public class ParlanceProject : IParlanceProject
 
     private readonly Database.Models.Project _project;
 
-    public ParlanceProject(Database.Models.Project project)
+    public ParlanceProject(Database.Models.Project project, string branch)
     {
         _project = project;
         using var file = File.OpenRead(Path.Combine(project.VcsDirectory, ".parlance.json"));