diff --git a/OFBButte.Api/Program.cs b/OFBButte.Api/Program.cs index c697c08..b84d916 100644 --- a/OFBButte.Api/Program.cs +++ b/OFBButte.Api/Program.cs @@ -16,10 +16,18 @@ namespace OFBButte.Api { public static void Main(string[] args) { - CreateWebHostBuilder(args).Run(); + CreateWebHostBuilder(args, false).Run(); } - - public static IWebHost CreateWebHostBuilder(string[] args) + /// + /// This method is for entity framework + /// + /// + /// + public static IWebHost BuildWebHost(string[] args) + { + return CreateWebHostBuilder(args, true); + } + public static IWebHost CreateWebHostBuilder(string[] args, bool fromEF) { var hostBuilder = WebHost.CreateDefaultBuilder(args) .UseStartup(); @@ -31,7 +39,10 @@ namespace OFBButte.Api var host = hostBuilder.Build(); - using(var scope = host.Services.CreateScope()) + if (fromEF) + return host; + + using (var scope = host.Services.CreateScope()) { var db = scope.ServiceProvider.GetService(); db.Database.Migrate(); diff --git a/OFBButte.Api/Startup.cs b/OFBButte.Api/Startup.cs index c6b57e8..c716582 100644 --- a/OFBButte.Api/Startup.cs +++ b/OFBButte.Api/Startup.cs @@ -18,6 +18,8 @@ namespace OFBButte.Api { public class Startup { + private readonly string CorsPolicy = "OFBCorsPolicy"; + public Startup(IConfiguration configuration) { Configuration = configuration; @@ -28,6 +30,18 @@ namespace OFBButte.Api // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { + // CORS - This needs to be before services.AddMvc + services.AddCors(options => + { + options.AddPolicy(CorsPolicy, policy => + { + policy.WithOrigins("http://localhost:4200", "https://test.ofbbutte.com", "https://ofbbutte.com") + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + }); + services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); // App Settings @@ -53,7 +67,7 @@ namespace OFBButte.Api // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); } - + app.UseCors(CorsPolicy); app.UseHttpsRedirection(); app.UseMvc(); } diff --git a/OFBButte.Database/Migrations/20190717032510_Initial.Designer.cs b/OFBButte.Database/Migrations/20190717032510_Initial.Designer.cs deleted file mode 100644 index e548fbb..0000000 --- a/OFBButte.Database/Migrations/20190717032510_Initial.Designer.cs +++ /dev/null @@ -1,318 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using OFBButte.Database; - -namespace OFBButte.Database.Migrations -{ - [DbContext(typeof(OFBContext))] - [Migration("20190717032510_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("OFBButte.Entities.EmailVerificationCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("EmailVerificationCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryChild", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("MissionarySupportId"); - - b.Property("Name"); - - b.HasKey("Id"); - - b.HasIndex("MissionarySupportId"); - - b.ToTable("MissionaryChild"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryCollegeRecommendation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("MissionarySupportId"); - - b.Property("Name"); - - b.HasKey("Id"); - - b.HasIndex("MissionarySupportId"); - - b.ToTable("MissionaryCollegeRecommendation"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionarySupport", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AdmittedWrong"); - - b.Property("Alcohol"); - - b.Property("AloneOrTeam"); - - b.Property("BibleVersionOpinion"); - - b.Property("BibleVersionsUsed"); - - b.Property("BillsOnTime"); - - b.Property("CallToField"); - - b.Property("CellPhone"); - - b.Property("Charasmaticism"); - - b.Property("ChildrenSchool"); - - b.Property("ContemporaryMusic"); - - b.Property("CorrectWrongOfAnotherMissionary"); - - b.Property("CurrentMonthlySupport"); - - b.Property("DailyBible"); - - b.Property("Dance"); - - b.Property("Divorced"); - - b.Property("EvaluationOfNationals"); - - b.Property("FellowshipAssociation"); - - b.Property("FemaleDressStandard"); - - b.Property("FemaleShorts"); - - b.Property("FemaleSlacks"); - - b.Property("FieldOfService"); - - b.Property("FieldPhone"); - - b.Property("FinancialStatementPrevYear"); - - b.Property("Fundamentalist"); - - b.Property("GroundsForRemarry"); - - b.Property("HomePhone"); - - b.Property("LateBillActionTaken"); - - b.Property("LateBills"); - - b.Property("MaleHair"); - - b.Property("MarryADivorcee"); - - b.Property("MasonicLodge"); - - b.Property("MonthlySupportNeeded"); - - b.Property("MovieTheaters"); - - b.Property("Name"); - - b.Property("NumberLedToChrist"); - - b.Property("NumberWeeklyTracts"); - - b.Property("NumberWitnessedTo"); - - b.Property("Plans"); - - b.Property("PotentialHarvest"); - - b.Property("Predestination"); - - b.Property("RateOfSuccess"); - - b.Property("RepentanceDefinition"); - - b.Property("RepentanceNecessary"); - - b.Property("RestAndRelaxation"); - - b.Property("SendingChurch"); - - b.Property("Smoking"); - - b.Property("SwimmingClothing"); - - b.Property("Television"); - - b.Property("Testimony"); - - b.Property("TimeInCountry"); - - b.Property("Tongues"); - - b.Property("WifesName"); - - b.Property("WorldlyMusic"); - - b.HasKey("Id"); - - b.ToTable("MissionarySupportForms"); - }); - - modelBuilder.Entity("OFBButte.Entities.PasswordResetCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("PasswordResetCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.Profile", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("City"); - - b.Property("Country"); - - b.Property("FirstName"); - - b.Property("LastName"); - - b.Property("ModifiedDate"); - - b.Property("ProfileFederationCodeId"); - - b.Property("State"); - - b.Property("Street"); - - b.Property("Zip"); - - b.HasKey("Id"); - - b.HasIndex("ProfileFederationCodeId"); - - b.ToTable("Profiles"); - }); - - modelBuilder.Entity("OFBButte.Entities.ProfileFederationCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("ProfileFederationCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("CreatedDate"); - - b.Property("DeletedDate"); - - b.Property("Email") - .IsRequired(); - - b.Property("EmailVerificationCodeId"); - - b.Property("EmailVerifiedDate"); - - b.Property("PassswordResetCodeId"); - - b.Property("Password") - .IsRequired(); - - b.Property("ProfileId"); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("EmailVerificationCodeId"); - - b.HasIndex("PassswordResetCodeId"); - - b.HasIndex("ProfileId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryChild", b => - { - b.HasOne("OFBButte.Entities.MissionarySupport") - .WithMany("Children") - .HasForeignKey("MissionarySupportId"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryCollegeRecommendation", b => - { - b.HasOne("OFBButte.Entities.MissionarySupport") - .WithMany("CollegeRecommendations") - .HasForeignKey("MissionarySupportId"); - }); - - modelBuilder.Entity("OFBButte.Entities.Profile", b => - { - b.HasOne("OFBButte.Entities.ProfileFederationCode", "ProfileFederationCode") - .WithMany() - .HasForeignKey("ProfileFederationCodeId"); - }); - - modelBuilder.Entity("OFBButte.Entities.User", b => - { - b.HasOne("OFBButte.Entities.EmailVerificationCode", "EmailVerificationCode") - .WithMany() - .HasForeignKey("EmailVerificationCodeId"); - - b.HasOne("OFBButte.Entities.PasswordResetCode", "PassswordResetCode") - .WithMany() - .HasForeignKey("PassswordResetCodeId"); - - b.HasOne("OFBButte.Entities.Profile", "Profile") - .WithMany() - .HasForeignKey("ProfileId"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/OFBButte.Database/Migrations/20190717032510_Initial.cs b/OFBButte.Database/Migrations/20190717032510_Initial.cs deleted file mode 100644 index 670f398..0000000 --- a/OFBButte.Database/Migrations/20190717032510_Initial.cs +++ /dev/null @@ -1,287 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace OFBButte.Database.Migrations -{ - public partial class Initial : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "EmailVerificationCodes", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Code = table.Column(nullable: true), - CreatedDate = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_EmailVerificationCodes", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "MissionarySupportForms", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Name = table.Column(nullable: true), - HomePhone = table.Column(nullable: true), - CellPhone = table.Column(nullable: true), - FieldPhone = table.Column(nullable: true), - WifesName = table.Column(nullable: true), - Testimony = table.Column(nullable: true), - CallToField = table.Column(nullable: true), - SendingChurch = table.Column(nullable: true), - FieldOfService = table.Column(nullable: true), - Plans = table.Column(nullable: true), - EvaluationOfNationals = table.Column(nullable: true), - TimeInCountry = table.Column(nullable: true), - CorrectWrongOfAnotherMissionary = table.Column(nullable: true), - FinancialStatementPrevYear = table.Column(nullable: true), - CurrentMonthlySupport = table.Column(nullable: false), - MonthlySupportNeeded = table.Column(nullable: false), - RestAndRelaxation = table.Column(nullable: true), - AloneOrTeam = table.Column(nullable: true), - ChildrenSchool = table.Column(nullable: false), - Dance = table.Column(nullable: false), - WorldlyMusic = table.Column(nullable: false), - MovieTheaters = table.Column(nullable: false), - Alcohol = table.Column(nullable: false), - Smoking = table.Column(nullable: false), - MaleHair = table.Column(nullable: false), - FemaleSlacks = table.Column(nullable: false), - FemaleShorts = table.Column(nullable: false), - FemaleDressStandard = table.Column(nullable: false), - SwimmingClothing = table.Column(nullable: true), - Television = table.Column(nullable: true), - DailyBible = table.Column(nullable: false), - NumberLedToChrist = table.Column(nullable: false), - NumberWitnessedTo = table.Column(nullable: false), - NumberWeeklyTracts = table.Column(nullable: false), - RateOfSuccess = table.Column(nullable: true), - Predestination = table.Column(nullable: true), - FellowshipAssociation = table.Column(nullable: true), - AdmittedWrong = table.Column(nullable: true), - Divorced = table.Column(nullable: false), - GroundsForRemarry = table.Column(nullable: false), - MarryADivorcee = table.Column(nullable: false), - MasonicLodge = table.Column(nullable: false), - BibleVersionsUsed = table.Column(nullable: true), - BibleVersionOpinion = table.Column(nullable: true), - ContemporaryMusic = table.Column(nullable: false), - Charasmaticism = table.Column(nullable: true), - Tongues = table.Column(nullable: false), - RepentanceNecessary = table.Column(nullable: false), - RepentanceDefinition = table.Column(nullable: true), - Fundamentalist = table.Column(nullable: false), - BillsOnTime = table.Column(nullable: true), - LateBills = table.Column(nullable: true), - LateBillActionTaken = table.Column(nullable: true), - PotentialHarvest = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_MissionarySupportForms", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "PasswordResetCodes", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Code = table.Column(nullable: true), - CreatedDate = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_PasswordResetCodes", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "ProfileFederationCodes", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Code = table.Column(nullable: true), - CreatedDate = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_ProfileFederationCodes", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "MissionaryChild", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Name = table.Column(nullable: true), - MissionarySupportId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_MissionaryChild", x => x.Id); - table.ForeignKey( - name: "FK_MissionaryChild_MissionarySupportForms_MissionarySupportId", - column: x => x.MissionarySupportId, - principalTable: "MissionarySupportForms", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "MissionaryCollegeRecommendation", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Name = table.Column(nullable: true), - MissionarySupportId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_MissionaryCollegeRecommendation", x => x.Id); - table.ForeignKey( - name: "FK_MissionaryCollegeRecommendation_MissionarySupportForms_Missi~", - column: x => x.MissionarySupportId, - principalTable: "MissionarySupportForms", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "Profiles", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - ModifiedDate = table.Column(nullable: false), - FirstName = table.Column(nullable: true), - LastName = table.Column(nullable: true), - Street = table.Column(nullable: true), - City = table.Column(nullable: true), - State = table.Column(nullable: true), - Zip = table.Column(nullable: true), - Country = table.Column(nullable: true), - ProfileFederationCodeId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Profiles", x => x.Id); - table.ForeignKey( - name: "FK_Profiles_ProfileFederationCodes_ProfileFederationCodeId", - column: x => x.ProfileFederationCodeId, - principalTable: "ProfileFederationCodes", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "Users", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn), - Email = table.Column(nullable: false), - Password = table.Column(nullable: false), - EmailVerifiedDate = table.Column(nullable: true), - CreatedDate = table.Column(nullable: false), - DeletedDate = table.Column(nullable: true), - ProfileId = table.Column(nullable: true), - EmailVerificationCodeId = table.Column(nullable: true), - PassswordResetCodeId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Users", x => x.Id); - table.ForeignKey( - name: "FK_Users_EmailVerificationCodes_EmailVerificationCodeId", - column: x => x.EmailVerificationCodeId, - principalTable: "EmailVerificationCodes", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_Users_PasswordResetCodes_PassswordResetCodeId", - column: x => x.PassswordResetCodeId, - principalTable: "PasswordResetCodes", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_Users_Profiles_ProfileId", - column: x => x.ProfileId, - principalTable: "Profiles", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_MissionaryChild_MissionarySupportId", - table: "MissionaryChild", - column: "MissionarySupportId"); - - migrationBuilder.CreateIndex( - name: "IX_MissionaryCollegeRecommendation_MissionarySupportId", - table: "MissionaryCollegeRecommendation", - column: "MissionarySupportId"); - - migrationBuilder.CreateIndex( - name: "IX_Profiles_ProfileFederationCodeId", - table: "Profiles", - column: "ProfileFederationCodeId"); - - migrationBuilder.CreateIndex( - name: "IX_Users_Email", - table: "Users", - column: "Email"); - - migrationBuilder.CreateIndex( - name: "IX_Users_EmailVerificationCodeId", - table: "Users", - column: "EmailVerificationCodeId"); - - migrationBuilder.CreateIndex( - name: "IX_Users_PassswordResetCodeId", - table: "Users", - column: "PassswordResetCodeId"); - - migrationBuilder.CreateIndex( - name: "IX_Users_ProfileId", - table: "Users", - column: "ProfileId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "MissionaryChild"); - - migrationBuilder.DropTable( - name: "MissionaryCollegeRecommendation"); - - migrationBuilder.DropTable( - name: "Users"); - - migrationBuilder.DropTable( - name: "MissionarySupportForms"); - - migrationBuilder.DropTable( - name: "EmailVerificationCodes"); - - migrationBuilder.DropTable( - name: "PasswordResetCodes"); - - migrationBuilder.DropTable( - name: "Profiles"); - - migrationBuilder.DropTable( - name: "ProfileFederationCodes"); - } - } -} diff --git a/OFBButte.Database/Migrations/OFBContextModelSnapshot.cs b/OFBButte.Database/Migrations/OFBContextModelSnapshot.cs deleted file mode 100644 index 431169d..0000000 --- a/OFBButte.Database/Migrations/OFBContextModelSnapshot.cs +++ /dev/null @@ -1,316 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using OFBButte.Database; - -namespace OFBButte.Database.Migrations -{ - [DbContext(typeof(OFBContext))] - partial class OFBContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("OFBButte.Entities.EmailVerificationCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("EmailVerificationCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryChild", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("MissionarySupportId"); - - b.Property("Name"); - - b.HasKey("Id"); - - b.HasIndex("MissionarySupportId"); - - b.ToTable("MissionaryChild"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryCollegeRecommendation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("MissionarySupportId"); - - b.Property("Name"); - - b.HasKey("Id"); - - b.HasIndex("MissionarySupportId"); - - b.ToTable("MissionaryCollegeRecommendation"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionarySupport", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AdmittedWrong"); - - b.Property("Alcohol"); - - b.Property("AloneOrTeam"); - - b.Property("BibleVersionOpinion"); - - b.Property("BibleVersionsUsed"); - - b.Property("BillsOnTime"); - - b.Property("CallToField"); - - b.Property("CellPhone"); - - b.Property("Charasmaticism"); - - b.Property("ChildrenSchool"); - - b.Property("ContemporaryMusic"); - - b.Property("CorrectWrongOfAnotherMissionary"); - - b.Property("CurrentMonthlySupport"); - - b.Property("DailyBible"); - - b.Property("Dance"); - - b.Property("Divorced"); - - b.Property("EvaluationOfNationals"); - - b.Property("FellowshipAssociation"); - - b.Property("FemaleDressStandard"); - - b.Property("FemaleShorts"); - - b.Property("FemaleSlacks"); - - b.Property("FieldOfService"); - - b.Property("FieldPhone"); - - b.Property("FinancialStatementPrevYear"); - - b.Property("Fundamentalist"); - - b.Property("GroundsForRemarry"); - - b.Property("HomePhone"); - - b.Property("LateBillActionTaken"); - - b.Property("LateBills"); - - b.Property("MaleHair"); - - b.Property("MarryADivorcee"); - - b.Property("MasonicLodge"); - - b.Property("MonthlySupportNeeded"); - - b.Property("MovieTheaters"); - - b.Property("Name"); - - b.Property("NumberLedToChrist"); - - b.Property("NumberWeeklyTracts"); - - b.Property("NumberWitnessedTo"); - - b.Property("Plans"); - - b.Property("PotentialHarvest"); - - b.Property("Predestination"); - - b.Property("RateOfSuccess"); - - b.Property("RepentanceDefinition"); - - b.Property("RepentanceNecessary"); - - b.Property("RestAndRelaxation"); - - b.Property("SendingChurch"); - - b.Property("Smoking"); - - b.Property("SwimmingClothing"); - - b.Property("Television"); - - b.Property("Testimony"); - - b.Property("TimeInCountry"); - - b.Property("Tongues"); - - b.Property("WifesName"); - - b.Property("WorldlyMusic"); - - b.HasKey("Id"); - - b.ToTable("MissionarySupportForms"); - }); - - modelBuilder.Entity("OFBButte.Entities.PasswordResetCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("PasswordResetCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.Profile", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("City"); - - b.Property("Country"); - - b.Property("FirstName"); - - b.Property("LastName"); - - b.Property("ModifiedDate"); - - b.Property("ProfileFederationCodeId"); - - b.Property("State"); - - b.Property("Street"); - - b.Property("Zip"); - - b.HasKey("Id"); - - b.HasIndex("ProfileFederationCodeId"); - - b.ToTable("Profiles"); - }); - - modelBuilder.Entity("OFBButte.Entities.ProfileFederationCode", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Code"); - - b.Property("CreatedDate"); - - b.HasKey("Id"); - - b.ToTable("ProfileFederationCodes"); - }); - - modelBuilder.Entity("OFBButte.Entities.User", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("CreatedDate"); - - b.Property("DeletedDate"); - - b.Property("Email") - .IsRequired(); - - b.Property("EmailVerificationCodeId"); - - b.Property("EmailVerifiedDate"); - - b.Property("PassswordResetCodeId"); - - b.Property("Password") - .IsRequired(); - - b.Property("ProfileId"); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("EmailVerificationCodeId"); - - b.HasIndex("PassswordResetCodeId"); - - b.HasIndex("ProfileId"); - - b.ToTable("Users"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryChild", b => - { - b.HasOne("OFBButte.Entities.MissionarySupport") - .WithMany("Children") - .HasForeignKey("MissionarySupportId"); - }); - - modelBuilder.Entity("OFBButte.Entities.MissionaryCollegeRecommendation", b => - { - b.HasOne("OFBButte.Entities.MissionarySupport") - .WithMany("CollegeRecommendations") - .HasForeignKey("MissionarySupportId"); - }); - - modelBuilder.Entity("OFBButte.Entities.Profile", b => - { - b.HasOne("OFBButte.Entities.ProfileFederationCode", "ProfileFederationCode") - .WithMany() - .HasForeignKey("ProfileFederationCodeId"); - }); - - modelBuilder.Entity("OFBButte.Entities.User", b => - { - b.HasOne("OFBButte.Entities.EmailVerificationCode", "EmailVerificationCode") - .WithMany() - .HasForeignKey("EmailVerificationCodeId"); - - b.HasOne("OFBButte.Entities.PasswordResetCode", "PassswordResetCode") - .WithMany() - .HasForeignKey("PassswordResetCodeId"); - - b.HasOne("OFBButte.Entities.Profile", "Profile") - .WithMany() - .HasForeignKey("ProfileId"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/OFBButte.Entities/Enums/ChildrenSchool.cs b/OFBButte.Entities/Enums/ChildrenSchool.cs index 89e6df8..fea788b 100644 --- a/OFBButte.Entities/Enums/ChildrenSchool.cs +++ b/OFBButte.Entities/Enums/ChildrenSchool.cs @@ -5,6 +5,6 @@ Christian = 1, Public = 2, Home = 3, - Other = 5 + Other = 4 } } diff --git a/OFBButte.Entities/MissionaryCollegeRecommendation.cs b/OFBButte.Entities/MissionaryCollegeRecommendation.cs index 759d0c5..40a38e2 100644 --- a/OFBButte.Entities/MissionaryCollegeRecommendation.cs +++ b/OFBButte.Entities/MissionaryCollegeRecommendation.cs @@ -8,5 +8,7 @@ namespace OFBButte.Entities { public int Id { get; set; } public string Name { get; set; } + public string City { get; set; } + public string State { get; set; } } } diff --git a/OFBButte.Entities/MissionarySupport.cs b/OFBButte.Entities/MissionarySupport.cs index 6bf6d28..4cdc532 100644 --- a/OFBButte.Entities/MissionarySupport.cs +++ b/OFBButte.Entities/MissionarySupport.cs @@ -22,8 +22,8 @@ namespace OFBButte.Entities public string TimeInCountry { get; set; } public string CorrectWrongOfAnotherMissionary { get; set; } public string FinancialStatementPrevYear { get; set; } - public decimal CurrentMonthlySupport { get; set; } - public decimal MonthlySupportNeeded { get; set; } + public string CurrentMonthlySupport { get; set; } + public string MonthlySupportNeeded { get; set; } public string RestAndRelaxation { get; set; } public string AloneOrTeam { get; set; } public ChildrenSchool ChildrenSchool { get; set; }