gordon-cs · ArabellaJi · Jun 23, 2023
diff --git a/Gordon360/Models/CCT/Context/CCTContext.cs b/Gordon360/Models/CCT/Context/CCTContext.cs
@@ -44,6 +44,9 @@ public CCTContext(DbContextOptions<CCTContext> options)
         public virtual DbSet<ERROR_LOG> ERROR_LOG { get; set; }
         public virtual DbSet<EmergencyContact> EmergencyContact { get; set; }
         public virtual DbSet<FacStaff> FacStaff { get; set; }
+        public virtual DbSet<FacStaff_Field_Type> FacStaff_Field_Type { get; set; }
+        public virtual DbSet<FacStaff_Privacy> FacStaff_Privacy { get; set; }
+        public virtual DbSet<FacStaff_Viewer_Type> FacStaff_Viewer_Type { get; set; }
         public virtual DbSet<Graduation> Graduation { get; set; }
         public virtual DbSet<Health_Question> Health_Question { get; set; }
         public virtual DbSet<Health_Status> Health_Status { get; set; }
@@ -295,6 +298,23 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.Property(e => e.BuildingDescription).IsFixedLength();
             });
 
+            modelBuilder.Entity<FacStaff_Field_Type>(entity =>
+            {
+                entity.Property(e => e.ID).ValueGeneratedOnAdd();
+            });
+
+            modelBuilder.Entity<FacStaff_Privacy>(entity =>
+            {
+                entity.Property(e => e.Field).HasDefaultValueSql("((0))");
+
+                entity.Property(e => e.Viewer).HasDefaultValueSql("((0))");
+            });
+
+            modelBuilder.Entity<FacStaff_Viewer_Type>(entity =>
+            {
+                entity.Property(e => e.ID).ValueGeneratedOnAdd();
+            });
+
             modelBuilder.Entity<Graduation>(entity =>
             {
                 entity.ToView("Graduation", "dbo");
@@ -509,10 +529,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<Participant>(entity =>
             {
-                entity.HasKey(e => e.Username)
-                    .HasName("PK__Particip__536C85E53B50E910");
+                entity.Property(e => e.AllowEmails).HasDefaultValueSql("((1))");
 
                 entity.Property(e => e.ID).ValueGeneratedOnAdd();
+
+                entity.Property(e => e.SpecifiedGender).IsFixedLength();
             });
 
             modelBuilder.Entity<ParticipantActivity>(entity =>
@@ -525,6 +546,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.HasOne(d => d.ParticipantUsernameNavigation)
                     .WithMany(p => p.ParticipantActivity)
                     .HasForeignKey(d => d.ParticipantUsername)
+                    .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ParticipantActivity_Participant");
 
                 entity.HasOne(d => d.PrivType)
@@ -540,7 +562,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                     .WithMany(p => p.ParticipantNotification)
                     .HasForeignKey(d => d.ParticipantUsername)
                     .OnDelete(DeleteBehavior.ClientSetNull)
-                    .HasConstraintName("FK_PartipantNotification_Participant");
+                    .HasConstraintName("FK_ParticipantNotification_Participant");
             });
 
             modelBuilder.Entity<ParticipantStatusHistory>(entity =>
@@ -563,6 +585,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.HasOne(d => d.ParticipantUsernameNavigation)
                     .WithMany(p => p.ParticipantTeam)
                     .HasForeignKey(d => d.ParticipantUsername)
+                    .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ParticipantTeam_Participant");
 
                 entity.HasOne(d => d.RoleType)

diff --git a/Gordon360/Models/CCT/Context/DbContextExtensions.cs b/Gordon360/Models/CCT/Context/DbContextExtensions.cs
@@ -1,5 +1,4 @@
 // <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
-using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -31,12 +30,6 @@ public static async Task<List<T>> SqlQueryAsync<T>(this DbContext db, string sql
                 return default;
             }
         }
-        public static async Task<int> GetNextValueForSequence(this DbContext _context, Sequence sequence)
-        {
-            SqlParameter result = new SqlParameter("@result", System.Data.SqlDbType.Int) { Direction = System.Data.ParameterDirection.Output };
-            await _context.Database.ExecuteSqlRawAsync($"SELECT @result = (NEXT VALUE FOR [{CCTSequenceEnum.GetDescription(sequence)}])", result);
-            return (int)result.Value;
-        }
     }
 
     public class OutputParameter<TValue>

diff --git a/Gordon360/Models/CCT/Context/efpt.CCT.config.json b/Gordon360/Models/CCT/Context/efpt.CCT.config.json
@@ -38,6 +38,18 @@
          "Name": "[dbo].[ERROR_LOG]",
          "ObjectType": 0
       },
+      {
+         "Name": "[dbo].[FacStaff_Field_Type]",
+         "ObjectType": 0
+      },
+      {
+         "Name": "[dbo].[FacStaff_Privacy]",
+         "ObjectType": 0
+      },
+      {
+         "Name": "[dbo].[FacStaff_Viewer_Type]",
+         "ObjectType": 0
+      },
       {
          "Name": "[dbo].[Health_Question]",
          "ObjectType": 0
@@ -799,7 +811,7 @@
          "ObjectType": 1
       }
    ],
-   "UiHint": "SQLTrain1.CCT",
+   "UiHint": "sqltrain1.CCT.dbo",
    "UseBoolPropertiesWithoutDefaultSql": false,
    "UseDatabaseNames": true,
    "UseDbContextSplitting": false,

diff --git a/Gordon360/Models/CCT/RecIM/Participant.cs b/Gordon360/Models/CCT/RecIM/Participant.cs
@@ -9,6 +9,7 @@
 namespace Gordon360.Models.CCT
 {
     [Table("Participant", Schema = "RecIM")]
+    [Index("Username", "IsCustom", Name = "Unique_Participant", IsUnique = true)]
     public partial class Participant
     {
         public Participant()
@@ -26,6 +27,13 @@ public Participant()
         public string Username { get; set; }
         public bool IsAdmin { get; set; }
         public int ID { get; set; }
+        [Required]
+        [StringLength(1)]
+        [Unicode(false)]
+        public string SpecifiedGender { get; set; }
+        [Required]
+        public bool? AllowEmails { get; set; }
+        public bool IsCustom { get; set; }
 
         [InverseProperty("ParticipantUsernameNavigation")]
         public virtual ICollection<MatchParticipant> MatchParticipant { get; set; }

diff --git a/Gordon360/Models/CCT/dbo/Alumni.cs b/Gordon360/Models/CCT/dbo/Alumni.cs
@@ -11,13 +11,10 @@ namespace Gordon360.Models.CCT
     [Keyless]
     public partial class Alumni
     {
-        [Required]
-        [StringLength(25)]
+        [StringLength(9)]
         [Unicode(false)]
         public string ID { get; set; }
-        [StringLength(25)]
-        [Unicode(false)]
-        public string WebUpdate { get; set; }
+        public int? WebUpdate { get; set; }
         [StringLength(50)]
         [Unicode(false)]
         public string Title { get; set; }
@@ -111,6 +108,7 @@ public partial class Alumni
         [StringLength(15)]
         [Unicode(false)]
         public string Barcode { get; set; }
+        [Required]
         [StringLength(50)]
         [Unicode(false)]
         public string AD_Username { get; set; }
@@ -121,9 +119,9 @@ public partial class Alumni
         public string Country { get; set; }
         [StringLength(50)]
         [Unicode(false)]
-        public string Major2Description { get; set; }
+        public string Major1Description { get; set; }
         [StringLength(50)]
         [Unicode(false)]
-        public string Major1Description { get; set; }
+        public string Major2Description { get; set; }
     }
 }
diff --git a/Gordon360/Models/CCT/dbo/FINALIZATION_MARK_AS_CURRENTLY_COMPLETEDResult.cs b/Gordon360/Models/CCT/dbo/FINALIZATION_MARK_AS_CURRENTLY_COMPLETEDResult.cs
@@ -7,15 +7,5 @@ namespace Gordon360.Models.CCT
 {
     public partial class FINALIZATION_MARK_AS_CURRENTLY_COMPLETEDResult
     {
-        public string UserID { get; set; }
-        public string Period { get; set; }
-        public bool FinalizationCompleted { get; set; }
-        public string RootQuery { get; set; }
-        public string BypassApprover { get; set; }
-        public DateTime? DateFinalized { get; set; }
-        public string IgnoreHoldsApprover { get; set; }
-        public DateTime DateInserted { get; set; }
-        public DateTime DateUpdated { get; set; }
-        public string HeadcountsAsOfDateFinalized { get; set; }
     }
 }
diff --git a/Gordon360/Models/CCT/dbo/FINALIZATION_UPDATECELLPHONEResult.cs b/Gordon360/Models/CCT/dbo/FINALIZATION_UPDATECELLPHONEResult.cs
@@ -7,7 +7,5 @@ namespace Gordon360.Models.CCT
 {
     public partial class FINALIZATION_UPDATECELLPHONEResult
     {
-        public bool? Success { get; set; }
-        public string Message { get; set; }
     }
 }
diff --git a/Gordon360/Models/CCT/dbo/FacStaff.cs b/Gordon360/Models/CCT/dbo/FacStaff.cs
@@ -11,8 +11,7 @@ namespace Gordon360.Models.CCT
     [Keyless]
     public partial class FacStaff
     {
-        [Required]
-        [StringLength(10)]
+        [StringLength(9)]
         [Unicode(false)]
         public string ID { get; set; }
         [StringLength(5)]
@@ -75,6 +74,9 @@ public partial class FacStaff
         [StringLength(15)]
         [Unicode(false)]
         public string HomePhone { get; set; }
+        [StringLength(15)]
+        [Unicode(false)]
+        public string MobilePhone { get; set; }
         [StringLength(1)]
         [Unicode(false)]
         public string HomeFax { get; set; }

diff --git a/Gordon360/Models/CCT/dbo/FacStaff_Field_Type.cs b/Gordon360/Models/CCT/dbo/FacStaff_Field_Type.cs
@@ -0,0 +1,20 @@
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+#nullable disable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Gordon360.Models.CCT
+{
+    [Table("FacStaff_Field_Type", Schema = "dbo")]
+    public partial class FacStaff_Field_Type
+    {
+        public int ID { get; set; }
+        [Key]
+        [StringLength(50)]
+        [Unicode(false)]
+        public string Field { get; set; }
+    }
+}
diff --git a/Gordon360/Models/CCT/dbo/FacStaff_Privacy.cs b/Gordon360/Models/CCT/dbo/FacStaff_Privacy.cs
@@ -0,0 +1,27 @@
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+#nullable disable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Gordon360.Models.CCT
+{
+    [Table("FacStaff_Privacy", Schema = "dbo")]
+    public partial class FacStaff_Privacy
+    {
+        [Key]
+        [StringLength(10)]
+        [Unicode(false)]
+        public string gordon_id { get; set; }
+        [Required]
+        [StringLength(50)]
+        [Unicode(false)]
+        public string Field { get; set; }
+        [Required]
+        [StringLength(50)]
+        [Unicode(false)]
+        public string Viewer { get; set; }
+    }
+}
diff --git a/Gordon360/Models/CCT/dbo/FacStaff_Viewer_Type.cs b/Gordon360/Models/CCT/dbo/FacStaff_Viewer_Type.cs
@@ -0,0 +1,20 @@
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+#nullable disable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Gordon360.Models.CCT
+{
+    [Table("FacStaff_Viewer_Type", Schema = "dbo")]
+    public partial class FacStaff_Viewer_Type
+    {
+        public int ID { get; set; }
+        [Key]
+        [StringLength(50)]
+        [Unicode(false)]
+        public string Viewer { get; set; }
+    }
+}
diff --git a/Gordon360/Models/CCT/dbo/GET_AA_ADMINResults.cs b/Gordon360/Models/CCT/dbo/GET_AA_ADMINResults.cs
diff --git a/Gordon360/Models/CCT/dbo/Housing_HallChoices.cs b/Gordon360/Models/CCT/dbo/Housing_HallChoices.cs
@@ -8,6 +8,7 @@
 
 namespace Gordon360.Models.CCT
 {
+    [Table("Housing_HallChoices", Schema = "dbo")]
     [Index("HousingAppID", Name = "IX_Housing_HallChoices")]
     public partial class Housing_HallChoices
     {

diff --git a/Gordon360/Models/CCT/dbo/STUDENT_JOBS_PER_ID_NUMResult.cs b/Gordon360/Models/CCT/dbo/STUDENT_JOBS_PER_ID_NUMResult.cs
@@ -7,11 +7,5 @@ namespace Gordon360.Models.CCT
 {
     public partial class STUDENT_JOBS_PER_ID_NUMResult
     {
-        public string Job_Title { get; set; }
-        public string Job_Department { get; set; }
-        public string Job_Department_Name { get; set; }
-        public DateTime? Job_Start_Date { get; set; }
-        public DateTime? Job_End_Date { get; set; }
-        public DateTime? Job_Expected_End_Date { get; set; }
     }
 }
diff --git a/Gordon360/Models/CCT/dbo/Student.cs b/Gordon360/Models/CCT/dbo/Student.cs
@@ -11,8 +11,7 @@ namespace Gordon360.Models.CCT
     [Keyless]
     public partial class Student
     {
-        [Required]
-        [StringLength(10)]
+        [StringLength(9)]
         [Unicode(false)]
         public string ID { get; set; }
         [StringLength(3)]

diff --git a/Gordon360/Models/CCT/dbo/UPDATE_CELL_PHONEResult.cs b/Gordon360/Models/CCT/dbo/UPDATE_CELL_PHONEResult.cs
@@ -7,7 +7,5 @@ namespace Gordon360.Models.CCT
 {
     public partial class UPDATE_CELL_PHONEResult
     {
-        public bool? Success { get; set; }
-        public string Message { get; set; }
     }
 }