From fec17095a4a638d2e3411226e7fdea09ba2808d9 Mon Sep 17 00:00:00 2001
From: Greg Finzer <gfinzer@hotmail.com>
Date: Wed, 16 Sep 2026 08:14:06 -0400
Subject: [PATCH] Receive text and lookup Volunteer, ContactUs, SignUp,
 BedRequest, and User

---
 BedBrigade.Common/Models/SmsQueue.cs          |    9 +-
 ...5657_SmsQueueOtherLinkedTables.Designer.cs | 1994 +++++++++++++++++
 ...0260916115657_SmsQueueOtherLinkedTables.cs |   78 +
 .../Migrations/DataContextModelSnapshot.cs    |   22 +
 .../Services/ISignUpDataService.cs            |    1 +
 BedBrigade.Data/Services/SignUpDataService.cs |   29 +
 .../Services/SmsQueueDataService.cs           |   71 +-
 7 files changed, 2199 insertions(+), 5 deletions(-)
 create mode 100644 BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.Designer.cs
 create mode 100644 BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.cs

diff --git a/BedBrigade.Common/Models/SmsQueue.cs b/BedBrigade.Common/Models/SmsQueue.cs
index 370fa5d8..dc356ca9 100644
--- a/BedBrigade.Common/Models/SmsQueue.cs
+++ b/BedBrigade.Common/Models/SmsQueue.cs
@@ -75,9 +75,12 @@ public class SmsQueue : BaseEntity, ILocationId
         [Required, StringLength(50)]
         public string ContactName { get; set; } = string.Empty;
 
+        [ForeignKey("VolunteerId")]
+        public Int32? VolunteerId { get; set; }
+        public Volunteer? Volunteer { get; set; }
 
-
-
-
+        [ForeignKey("ContactUsId")]
+        public Int32? ContactUsId { get; set; }
+        public ContactUs? ContactUs { get; set; }
     }
 }
diff --git a/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.Designer.cs b/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.Designer.cs
new file mode 100644
index 00000000..a4f4cb1d
--- /dev/null
+++ b/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.Designer.cs
@@ -0,0 +1,1994 @@
+// <auto-generated />
+using System;
+using BedBrigade.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BedBrigade.Data.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20260916115657_SmsQueueOtherLinkedTables")]
+    partial class SmsQueueOtherLinkedTables
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BedBrigade.Common.Models.BedRequest", b =>
+                {
+                    b.Property<int>("BedRequestId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("BedRequestId"));
+
+                    b.Property<string>("BedType")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("City")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("Contacted")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("DeliveryDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("GenderAge")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("Group")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("LastName")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<decimal?>("Latitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<decimal?>("Longitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Names")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<int>("NumberOfBeds")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Phone")
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<string>("PostalCode")
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<string>("PrimaryLanguage")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SpeakEnglish")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.Property<string>("State")
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Street")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Team")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("BedRequestId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Phone");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("BedRequests");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Configuration", b =>
+                {
+                    b.Property<int>("ConfigurationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ConfigurationId"));
+
+                    b.Property<string>("ConfigurationKey")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ConfigurationValue")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<bool>("Encrypted")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("Section")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ConfigurationId");
+
+                    b.HasIndex("LocationId", "ConfigurationKey")
+                        .HasDatabaseName("IX_Configuration_LocationId_ConfigurationKey");
+
+                    b.ToTable("Configurations");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.ContactUs", b =>
+                {
+                    b.Property<int>("ContactUsId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ContactUsId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ContactUsId");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Phone");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ContactUs");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Content", b =>
+                {
+                    b.Property<int>("ContentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ContentId"));
+
+                    b.Property<string>("ContentHtml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MainImageFileName")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ContentId");
+
+                    b.HasIndex("ContentType");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Content");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.ContentHistory", b =>
+                {
+                    b.Property<int>("ContentHistoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ContentHistoryId"));
+
+                    b.Property<string>("ContentHtml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ContentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MainImageFileName")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ContentHistoryId");
+
+                    b.ToTable("ContentHistory");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.ContentTranslation", b =>
+                {
+                    b.Property<int>("ContentTranslationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ContentTranslationId"));
+
+                    b.Property<string>("ContentHtml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Culture")
+                        .IsRequired()
+                        .HasMaxLength(11)
+                        .HasColumnType("nvarchar(11)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ContentTranslationId");
+
+                    b.HasIndex("Culture");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("ContentTranslations");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.ContentTranslationQueue", b =>
+                {
+                    b.Property<int>("ContentTranslationQueueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ContentTranslationQueueId"));
+
+                    b.Property<int>("ContentId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Culture")
+                        .IsRequired()
+                        .HasMaxLength(11)
+                        .HasColumnType("nvarchar(11)");
+
+                    b.Property<string>("FailureMessage")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<DateTime?>("LockDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime>("QueueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("SentDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("ContentTranslationQueueId");
+
+                    b.ToTable("ContentTranslationQueue");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Donation", b =>
+                {
+                    b.Property<int>("DonationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DonationId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Currency")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("DonationCampaignId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DonationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("FirstName")
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<decimal?>("Gross")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("LastName")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("PaymentProcessor")
+                        .HasMaxLength(80)
+                        .HasColumnType("nvarchar(80)");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("TaxFormSent")
+                        .HasColumnType("bit");
+
+                    b.Property<decimal>("TransactionFee")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("TransactionId")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("DonationId");
+
+                    b.HasIndex("LocationId");
+
+                    b.ToTable("Donations");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.DonationCampaign", b =>
+                {
+                    b.Property<int>("DonationCampaignId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("DonationCampaignId"));
+
+                    b.Property<string>("CampaignName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("DonationCampaignId");
+
+                    b.ToTable("DonationCampaigns");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.EmailQueue", b =>
+                {
+                    b.Property<int>("EmailQueueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("EmailQueueId"));
+
+                    b.Property<int?>("BedRequestId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<int?>("ContactUsId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FailureMessage")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("FirstName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FromDisplayName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("HtmlBody")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("LockDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("QueueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ReplyToAddress")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("SentDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int?>("SignUpId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime>("TargetDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("ToDisplayName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("EmailQueueId");
+
+                    b.HasIndex("BedRequestId");
+
+                    b.HasIndex("ContactUsId");
+
+                    b.HasIndex("SignUpId");
+
+                    b.ToTable("EmailQueue");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.GeoLocationQueue", b =>
+                {
+                    b.Property<int>("GeoLocationQueueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("GeoLocationQueueId"));
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("CountryCode")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("nvarchar(2)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FailureMessage")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<decimal?>("Latitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<DateTime?>("LockDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal?>("Longitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("PostalCode")
+                        .IsRequired()
+                        .HasMaxLength(5)
+                        .HasColumnType("nvarchar(5)");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ProcessedDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("QueueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Street")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("TableId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("TableName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("GeoLocationQueueId");
+
+                    b.HasIndex("TableId", "TableName")
+                        .HasDatabaseName("IX_GeoLocation_TableId_TableName");
+
+                    b.ToTable("GeoLocationQueue");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Location", b =>
+                {
+                    b.Property<int>("LocationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("LocationId"));
+
+                    b.Property<string>("BuildAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("BuildCity")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("BuildPostalCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.Property<string>("BuildState")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("ExternalContactUs")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<bool>("ExternalContent")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ExternalDonate")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExternalHome")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExternalRequestABed")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ExternalVolunteer")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Group")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<decimal?>("Latitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<decimal?>("Longitude")
+                        .HasColumnType("decimal(18,10)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("MailingCity")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("MailingPostalCode")
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.Property<string>("MailingState")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<int?>("MetroAreaId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Route")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("ServiceZipCodes")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("TimeZoneId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("LocationId");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.MetroArea", b =>
+                {
+                    b.Property<int>("MetroAreaId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("MetroAreaId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("MetroAreaId");
+
+                    b.ToTable("MetroAreas");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Newsletter", b =>
+                {
+                    b.Property<int>("NewsletterId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("NewsletterId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("NewsletterId");
+
+                    b.HasIndex("LocationId");
+
+                    b.ToTable("Newsletters");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Role", b =>
+                {
+                    b.Property<int>("RoleId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("RoleId"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.HasKey("RoleId");
+
+                    b.ToTable("Roles");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Schedule", b =>
+                {
+                    b.Property<int>("ScheduleId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ScheduleId"));
+
+                    b.Property<string>("Address")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<int>("Beds")
+                        .HasColumnType("int");
+
+                    b.Property<string>("City")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("DeliveryVehiclesRegistered")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("EventDateScheduled")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("EventDurationHours")
+                        .HasColumnType("int");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("EventNote")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<int>("EventStatus")
+                        .HasColumnType("int");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("GroupName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("OrganizerEmail")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("OrganizerName")
+                        .HasMaxLength(45)
+                        .HasColumnType("nvarchar(45)");
+
+                    b.Property<string>("OrganizerPhone")
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<string>("PostalCode")
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.Property<bool>("PrivateEvent")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("State")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<int>("Teams")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("VolunteersMax")
+                        .HasColumnType("int");
+
+                    b.Property<int>("VolunteersRegistered")
+                        .HasColumnType("int");
+
+                    b.HasKey("ScheduleId");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("LocationId");
+
+                    b.ToTable("Schedules");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.SignUp", b =>
+                {
+                    b.Property<int>("SignUpId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("SignUpId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("NumberOfVolunteers")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ScheduleId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SignUpNote")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("VehicleType")
+                        .HasColumnType("int");
+
+                    b.Property<int>("VolunteerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("SignUpId");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.HasIndex("VolunteerId");
+
+                    b.ToTable("SignUps");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.SmsQueue", b =>
+                {
+                    b.Property<int>("SmsQueueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("SmsQueueId"));
+
+                    b.Property<int?>("BedRequestId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasMaxLength(1600)
+                        .HasColumnType("nvarchar(1600)");
+
+                    b.Property<string>("ContactName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<int?>("ContactUsId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FailureMessage")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("FromPhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsReply")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("LockDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("QueueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("SentDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int?>("SignUpId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime>("TargetDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ToPhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int?>("VolunteerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("SmsQueueId");
+
+                    b.HasIndex("BedRequestId");
+
+                    b.HasIndex("ContactUsId");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("SignUpId");
+
+                    b.HasIndex("ToPhoneNumber");
+
+                    b.HasIndex("VolunteerId");
+
+                    b.ToTable("SmsQueue");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.SpokenLanguage", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("SpokenLanguages");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Subscription", b =>
+                {
+                    b.Property<int>("SubscriptionId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("SubscriptionId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("NewsletterId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Subscribed")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("SubscriptionId");
+
+                    b.HasIndex("NewsletterId");
+
+                    b.ToTable("Subscriptions");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Template", b =>
+                {
+                    b.Property<int>("TemplateId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("TemplateId"));
+
+                    b.Property<string>("ContentHtml")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("TemplateId");
+
+                    b.ToTable("Templates");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Translation", b =>
+                {
+                    b.Property<int>("TranslationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("TranslationId"));
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Culture")
+                        .IsRequired()
+                        .HasMaxLength(11)
+                        .HasColumnType("nvarchar(11)");
+
+                    b.Property<string>("Hash")
+                        .IsRequired()
+                        .HasMaxLength(88)
+                        .HasColumnType("nvarchar(88)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int?>("ParentId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("TranslationId");
+
+                    b.HasIndex("Culture");
+
+                    b.ToTable("Translations");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.TranslationQueue", b =>
+                {
+                    b.Property<int>("TranslationQueueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("TranslationQueueId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Culture")
+                        .IsRequired()
+                        .HasMaxLength(11)
+                        .HasColumnType("nvarchar(11)");
+
+                    b.Property<string>("FailureMessage")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<DateTime?>("LockDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime>("QueueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("SentDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<int>("TranslationId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("TranslationQueueId");
+
+                    b.ToTable("TranslationQueue");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.User", b =>
+                {
+                    b.Property<string>("UserName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<int>("FailedLoginAttempts")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<int>("FkRole")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("LockoutEndUtc")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<bool>("MustChangePassword")
+                        .HasColumnType("bit");
+
+                    b.Property<byte[]>("PasswordHash")
+                        .HasMaxLength(255)
+                        .HasColumnType("varbinary(255)");
+
+                    b.Property<byte[]>("PasswordSalt")
+                        .HasMaxLength(255)
+                        .HasColumnType("varbinary(255)");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("UserName");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Phone");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.UserPersist", b =>
+                {
+                    b.Property<string>("UserName")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Grid")
+                        .HasColumnType("int")
+                        .HasColumnOrder(1);
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("UserName", "Grid");
+
+                    b.ToTable("UserPersist");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Volunteer", b =>
+                {
+                    b.Property<int>("VolunteerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("VolunteerId"));
+
+                    b.Property<bool>("AttendChurch")
+                        .HasColumnType("bit");
+
+                    b.Property<int?>("CanYouTranslate")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ChurchName")
+                        .HasMaxLength(80)
+                        .HasColumnType("nvarchar(80)");
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("Group")
+                        .HasMaxLength(80)
+                        .HasColumnType("nvarchar(80)");
+
+                    b.Property<bool>("IHaveVolunteeredBefore")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("LastName")
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.Property<int>("LocationId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Message")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("Organization")
+                        .HasMaxLength(80)
+                        .HasColumnType("nvarchar(80)");
+
+                    b.Property<string>("OtherArea")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("OtherLanguagesSpoken")
+                        .HasMaxLength(4000)
+                        .HasColumnType("nvarchar(4000)");
+
+                    b.Property<string>("Phone")
+                        .HasMaxLength(14)
+                        .HasColumnType("nvarchar(14)");
+
+                    b.Property<bool>("SubscribedEmail")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("SubscribedSms")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("VehicleDescription")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("VehicleType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("VolunteerArea")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("VolunteerId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("LocationId");
+
+                    b.HasIndex("Phone");
+
+                    b.ToTable("Volunteers");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.VolunteerFor", b =>
+                {
+                    b.Property<int>("VolunteerForId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("VolunteerForId"));
+
+                    b.Property<DateTime?>("CreateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("MachineName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("UpdateDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("UpdateUser")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("VolunteerForId");
+
+                    b.ToTable("VolunteersFor");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.BedRequest", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", "Location")
+                        .WithMany("BedRequests")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Location");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.ContactUs", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("ContactUs")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Content", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("Contents")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Donation", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("Donations")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.EmailQueue", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.BedRequest", "BedRequest")
+                        .WithMany()
+                        .HasForeignKey("BedRequestId");
+
+                    b.HasOne("BedBrigade.Common.Models.SignUp", "ContactUs")
+                        .WithMany()
+                        .HasForeignKey("ContactUsId");
+
+                    b.HasOne("BedBrigade.Common.Models.SignUp", "SignUp")
+                        .WithMany()
+                        .HasForeignKey("SignUpId");
+
+                    b.Navigation("BedRequest");
+
+                    b.Navigation("ContactUs");
+
+                    b.Navigation("SignUp");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Schedule", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("Schedules")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.SignUp", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Schedule", "Schedule")
+                        .WithMany()
+                        .HasForeignKey("ScheduleId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("BedBrigade.Common.Models.Volunteer", "Volunteer")
+                        .WithMany()
+                        .HasForeignKey("VolunteerId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Schedule");
+
+                    b.Navigation("Volunteer");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.SmsQueue", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.BedRequest", "BedRequest")
+                        .WithMany()
+                        .HasForeignKey("BedRequestId");
+
+                    b.HasOne("BedBrigade.Common.Models.ContactUs", "ContactUs")
+                        .WithMany()
+                        .HasForeignKey("ContactUsId");
+
+                    b.HasOne("BedBrigade.Common.Models.Location", "Location")
+                        .WithMany()
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BedBrigade.Common.Models.SignUp", "SignUp")
+                        .WithMany()
+                        .HasForeignKey("SignUpId");
+
+                    b.HasOne("BedBrigade.Common.Models.Volunteer", "Volunteer")
+                        .WithMany()
+                        .HasForeignKey("VolunteerId");
+
+                    b.Navigation("BedRequest");
+
+                    b.Navigation("ContactUs");
+
+                    b.Navigation("Location");
+
+                    b.Navigation("SignUp");
+
+                    b.Navigation("Volunteer");
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.User", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("Users")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Volunteer", b =>
+                {
+                    b.HasOne("BedBrigade.Common.Models.Location", null)
+                        .WithMany("Volunteers")
+                        .HasForeignKey("LocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BedBrigade.Common.Models.Location", b =>
+                {
+                    b.Navigation("BedRequests");
+
+                    b.Navigation("ContactUs");
+
+                    b.Navigation("Contents");
+
+                    b.Navigation("Donations");
+
+                    b.Navigation("Schedules");
+
+                    b.Navigation("Users");
+
+                    b.Navigation("Volunteers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.cs b/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.cs
new file mode 100644
index 00000000..2738dfbf
--- /dev/null
+++ b/BedBrigade.Data/Migrations/20260916115657_SmsQueueOtherLinkedTables.cs
@@ -0,0 +1,78 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BedBrigade.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class SmsQueueOtherLinkedTables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ContactUsId",
+                table: "SmsQueue",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "VolunteerId",
+                table: "SmsQueue",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SmsQueue_ContactUsId",
+                table: "SmsQueue",
+                column: "ContactUsId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SmsQueue_VolunteerId",
+                table: "SmsQueue",
+                column: "VolunteerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_SmsQueue_ContactUs_ContactUsId",
+                table: "SmsQueue",
+                column: "ContactUsId",
+                principalTable: "ContactUs",
+                principalColumn: "ContactUsId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_SmsQueue_Volunteers_VolunteerId",
+                table: "SmsQueue",
+                column: "VolunteerId",
+                principalTable: "Volunteers",
+                principalColumn: "VolunteerId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_SmsQueue_ContactUs_ContactUsId",
+                table: "SmsQueue");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_SmsQueue_Volunteers_VolunteerId",
+                table: "SmsQueue");
+
+            migrationBuilder.DropIndex(
+                name: "IX_SmsQueue_ContactUsId",
+                table: "SmsQueue");
+
+            migrationBuilder.DropIndex(
+                name: "IX_SmsQueue_VolunteerId",
+                table: "SmsQueue");
+
+            migrationBuilder.DropColumn(
+                name: "ContactUsId",
+                table: "SmsQueue");
+
+            migrationBuilder.DropColumn(
+                name: "VolunteerId",
+                table: "SmsQueue");
+        }
+    }
+}
diff --git a/BedBrigade.Data/Migrations/DataContextModelSnapshot.cs b/BedBrigade.Data/Migrations/DataContextModelSnapshot.cs
index d3fcf4a5..ed407fd3 100644
--- a/BedBrigade.Data/Migrations/DataContextModelSnapshot.cs
+++ b/BedBrigade.Data/Migrations/DataContextModelSnapshot.cs
@@ -1254,6 +1254,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");
 
+                    b.Property<int?>("ContactUsId")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("CreateDate")
                         .HasColumnType("datetime2");
 
@@ -1318,16 +1321,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
 
+                    b.Property<int?>("VolunteerId")
+                        .HasColumnType("int");
+
                     b.HasKey("SmsQueueId");
 
                     b.HasIndex("BedRequestId");
 
+                    b.HasIndex("ContactUsId");
+
                     b.HasIndex("LocationId");
 
                     b.HasIndex("SignUpId");
 
                     b.HasIndex("ToPhoneNumber");
 
+                    b.HasIndex("VolunteerId");
+
                     b.ToTable("SmsQueue");
                 });
 
@@ -1912,6 +1922,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .WithMany()
                         .HasForeignKey("BedRequestId");
 
+                    b.HasOne("BedBrigade.Common.Models.ContactUs", "ContactUs")
+                        .WithMany()
+                        .HasForeignKey("ContactUsId");
+
                     b.HasOne("BedBrigade.Common.Models.Location", "Location")
                         .WithMany()
                         .HasForeignKey("LocationId")
@@ -1922,11 +1936,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .WithMany()
                         .HasForeignKey("SignUpId");
 
+                    b.HasOne("BedBrigade.Common.Models.Volunteer", "Volunteer")
+                        .WithMany()
+                        .HasForeignKey("VolunteerId");
+
                     b.Navigation("BedRequest");
 
+                    b.Navigation("ContactUs");
+
                     b.Navigation("Location");
 
                     b.Navigation("SignUp");
+
+                    b.Navigation("Volunteer");
                 });
 
             modelBuilder.Entity("BedBrigade.Common.Models.User", b =>
diff --git a/BedBrigade.Data/Services/ISignUpDataService.cs b/BedBrigade.Data/Services/ISignUpDataService.cs
index b772c724..83e05565 100644
--- a/BedBrigade.Data/Services/ISignUpDataService.cs
+++ b/BedBrigade.Data/Services/ISignUpDataService.cs
@@ -13,5 +13,6 @@ public interface ISignUpDataService : IRepository<SignUp>
         Task<ServiceResponse<List<Volunteer>>> GetVolunteersNotSignedUpForAnEvent(int locationId, int scheduleId);
         Task<ServiceResponse<List<SignUp>>> GetAllForScheduleIdAsync(int scheduleId);
         Task<ServiceResponse<List<SignUp>>> GetFutureSignUpsForLocation(int locationId);
+        Task<ServiceResponse<List<SignUp>>> GetFutureSignUpsByPhone(string phone);
     }
 }
\ No newline at end of file
diff --git a/BedBrigade.Data/Services/SignUpDataService.cs b/BedBrigade.Data/Services/SignUpDataService.cs
index d34d79e1..522f0add 100644
--- a/BedBrigade.Data/Services/SignUpDataService.cs
+++ b/BedBrigade.Data/Services/SignUpDataService.cs
@@ -1,8 +1,12 @@
 using BedBrigade.Common.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Internal;
+using Stripe.Terminal;
 using System.Data.Common;
+using AKSoftware.Localization.MultiLanguages;
+using BedBrigade.Common.Logic;
 using Twilio.TwiML.Voice;
+using StringUtil = BedBrigade.Common.Logic.StringUtil;
 
 namespace BedBrigade.Data.Services;
 
@@ -159,6 +163,31 @@ public async Task<ServiceResponse<List<SignUp>>> GetFutureSignUpsForLocation(int
         return new ServiceResponse<List<SignUp>>($"Found {result.Count} sign-ups for location {locationId}", true, result);
     }
 
+    public async Task<ServiceResponse<List<SignUp>>> GetFutureSignUpsByPhone(string phone)
+    {
+        string cacheKey = _cachingService.BuildCacheKey(GetEntityName(), $"GetFutureSignUpsByPhone({phone})");
+        List<SignUp>? cachedContent = _cachingService.Get<List<SignUp>>(cacheKey);
+
+        if (cachedContent != null)
+        {
+            return new ServiceResponse<List<SignUp>>($"Found {cachedContent.Count} future sign-ups for phone {phone} in cache", true, cachedContent);
+        }
+
+        string phoneNumbersOnly = StringUtil.ExtractDigits(phone);
+        string formattedPhone = phoneNumbersOnly.FormatPhoneNumber();
+
+        using var ctx = _contextFactory.CreateDbContext();
+        List<SignUp> result = await ctx.SignUps
+            .Include(signUp => signUp.Volunteer)
+            .Include(signUp => signUp.Schedule)
+            .Where(signUp => (signUp.Volunteer.Phone == phoneNumbersOnly || signUp.Volunteer.Phone == formattedPhone)
+                             && signUp.Schedule.EventDateScheduled.Date >= DateTime.UtcNow.Date)
+            .ToListAsync();
+
+        _cachingService.Set(cacheKey, result);
+        return new ServiceResponse<List<SignUp>>($"Found {result.Count} future sign-ups for phone {phone}", true, result);
+    }
+
     public async Task<ServiceResponse<List<SignUp>>> GetAllForScheduleIdAsync(int scheduleId)
     {
         using (var ctx = _contextFactory.CreateDbContext())
diff --git a/BedBrigade.Data/Services/SmsQueueDataService.cs b/BedBrigade.Data/Services/SmsQueueDataService.cs
index 195c0673..812fe4dd 100644
--- a/BedBrigade.Data/Services/SmsQueueDataService.cs
+++ b/BedBrigade.Data/Services/SmsQueueDataService.cs
@@ -21,7 +21,9 @@ public class SmsQueueDataService : Repository<SmsQueue>, ISmsQueueDataService
     private IScheduleDataService _scheduleDataService;
     private readonly ITimezoneDataService _svcTimeZone;
     private readonly IBedRequestPhoneDataService _bedRequestPhoneDataService;
-    
+    private readonly ISignUpDataService _signUpDataService;
+
+
     public SmsQueueDataService(IDbContextFactory<DataContext> contextFactory, 
         ICachingService cachingService,
         IAuthService authService, 
@@ -33,7 +35,8 @@ public SmsQueueDataService(IDbContextFactory<DataContext> contextFactory,
         ITimezoneDataService svcTimeZone, 
         ILocationDataService locationDataService, 
         IScheduleDataService scheduleDataService,
-        IBedRequestPhoneDataService bedRequestPhoneDataService) : base(contextFactory, cachingService, authService)
+        IBedRequestPhoneDataService bedRequestPhoneDataService,
+        ISignUpDataService signUpDataService) : base(contextFactory, cachingService, authService)
     {
         _contextFactory = contextFactory;
         _cachingService = cachingService;
@@ -46,6 +49,7 @@ public SmsQueueDataService(IDbContextFactory<DataContext> contextFactory,
         _locationDataService = locationDataService;
         _scheduleDataService = scheduleDataService;
         _bedRequestPhoneDataService = bedRequestPhoneDataService;
+        _signUpDataService = signUpDataService;
     }
 
     public async Task<List<SmsQueue>> GetLockedMessages()
@@ -404,6 +408,69 @@ private async Task<bool> FillContactByPhoneNumberFromUser(SmsQueue smsQueue)
     }
 
     private async Task<string> FillLocationByFromPhoneNumber(SmsQueue smsQueue)
+    {
+        //Try to find by the Bed Requestor
+        var bedRequestorResult = await _bedRequestPhoneDataService.GetByPhone(smsQueue.ToPhoneNumber);
+
+        if (bedRequestorResult.Success && bedRequestorResult.Data != null)
+        {
+            smsQueue.LocationId = bedRequestorResult.Data.LocationId;
+            smsQueue.BedRequestId = bedRequestorResult.Data.BedRequestId;
+            return string.Empty;
+        }
+
+        //Try to find it by the SignUp
+        if (await FillSignUpIdByPhone(smsQueue))
+        {
+            return string.Empty;
+        }
+
+        //Try to find by the Volunteer
+        var volunteerResult = await _volunteerDataService.GetByPhone(smsQueue.ToPhoneNumber);
+
+        if (volunteerResult.Success && volunteerResult.Data != null)
+        {
+            smsQueue.LocationId = volunteerResult.Data.LocationId;
+            smsQueue.VolunteerId = volunteerResult.Data.VolunteerId;
+            return string.Empty;
+        }
+
+        //Try to find by Contact Us
+        var contactUsResult = await _contactUsDataService.GetByPhone(smsQueue.ToPhoneNumber);
+
+        if (contactUsResult.Success && contactUsResult.Data != null)
+        {
+            smsQueue.LocationId = contactUsResult.Data.LocationId;
+            smsQueue.ContactUsId = contactUsResult.Data.ContactUsId;
+            return string.Empty;
+        }
+
+        //Try to find by the User
+        var userResult = await _userDataService.GetByPhone(smsQueue.ToPhoneNumber);
+
+        if (userResult.Success && userResult.Data != null)
+        {
+            smsQueue.LocationId = userResult.Data.LocationId;
+            return string.Empty;
+        }
+
+        return await FillLocationPhoneNumberByConfig(smsQueue);
+    }
+
+    private async Task<bool> FillSignUpIdByPhone(SmsQueue smsQueue)
+    {
+        var result = await _signUpDataService.GetFutureSignUpsByPhone(smsQueue.ToPhoneNumber);
+        if (result.Success && result.Data != null)
+        {
+            smsQueue.SignUpId = result.Data.First().SignUpId;
+            smsQueue.VolunteerId = result.Data.First().VolunteerId;
+            return true;
+        }
+
+        return false;
+    }
+
+    private async Task<string> FillLocationPhoneNumberByConfig(SmsQueue smsQueue)
     {
         var result = await _configDataService.GetAllAsync(ConfigSection.Sms);
         if (!result.Success || result.Data == null || !result.Data.Any())