Add PostgreSQL database connection (with secrets support 🤞)

connorads · Nov 1, 2018 · 1fde88c · 1fde88c
1 parent 5671cae
commit 1fde88c
Show file tree

Hide file tree

Showing 15 changed files with 225 additions and 20 deletions.
diff --git a/charts/happy-birthday-world/templates/deployment.yaml b/charts/happy-birthday-world/templates/deployment.yaml
@@ -25,3 +25,11 @@ spec:
         - containerPort: {{ .Values.service.internalPort }}
         resources:
 {{ toYaml .Values.resources | indent 12 }}
+        volumeMounts:
+          - name: secrets
+            mountPath: /app/secrets
+            readOnly: true
+      volumes:
+      - name: secrets
+        secret:
+          secretName: secret-appsettings
diff --git a/src/Controllers/HelloController.cs b/src/Controllers/HelloController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using HappyBirthdayWorld.Api.Domain;
+using HappyBirthdayWorld.Api.Dto;
 using HappyBirthdayWorld.Api.Models;
 using HappyBirthdayWorld.Api.Repositories;
 using Microsoft.AspNetCore.Mvc;
@@ -47,7 +48,7 @@ public ActionResult Put(
             [FromBody, Required] DateOfBirth dateOfBirth)
         {
             if (!ModelState.IsValid || name == null || DobIsInFuture(dateOfBirth)) return BadRequest(ModelState);
-            birthdayRepository.PutDateOfBirth(name.Trim(), dateOfBirth.dateOfBirth.Date);
+            birthdayRepository.PutDateOfBirth(new BirthRecord(name.Trim(), dateOfBirth.dateOfBirth.Date));
             return NoContent();
         }
 

diff --git a/src/Models/DateOfBirth.cs → src/Dto/DateOfBirth.cs b/src/Models/DateOfBirth.cs → src/Dto/DateOfBirth.cs
@@ -1,8 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-
-namespace HappyBirthdayWorld.Api.Models
+namespace HappyBirthdayWorld.Api.Dto
 {
     public class DateOfBirth
     {

diff --git a/src/HappyBirthdayWorld.Api.csproj b/src/HappyBirthdayWorld.Api.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.1.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/src/Migrations/20181031212649_Initial.Designer.cs b/src/Migrations/20181031212649_Initial.Designer.cs
diff --git a/src/Migrations/20181031212649_Initial.cs b/src/Migrations/20181031212649_Initial.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace HappyBirthdayWorld.Api.Migrations
+{
+    public partial class Initial : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "BirthRecords",
+                columns: table => new
+                {
+                    Name = table.Column<string>(nullable: false),
+                    DateOfBirth = table.Column<DateTime>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BirthRecords", x => x.Name);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "BirthRecords");
+        }
+    }
+}
diff --git a/src/Migrations/BirthdayContextModelSnapshot.cs b/src/Migrations/BirthdayContextModelSnapshot.cs
@@ -0,0 +1,36 @@
+// <auto-generated />
+using System;
+using HappyBirthdayWorld.Api.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace HappyBirthdayWorld.Api.Migrations
+{
+    [DbContext(typeof(BirthdayContext))]
+    partial class BirthdayContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("HappyBirthdayWorld.Api.Models.BirthRecord", b =>
+                {
+                    b.Property<string>("Name")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("DateOfBirth");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("BirthRecords");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Models/BirthRecord.cs b/src/Models/BirthRecord.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace HappyBirthdayWorld.Api.Models
+{
+    public class BirthRecord
+    {
+        public BirthRecord(string name, DateTime dateOfBirth)
+        {
+            Name = name;
+            DateOfBirth = dateOfBirth;
+        }
+
+        [Key]
+        public string Name { get; set; }
+
+        public DateTime DateOfBirth { get; set; }
+    }
+}
diff --git a/src/Program.cs b/src/Program.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace HappyBirthdayWorld.Api
@@ -7,14 +7,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
-
-            host.Run();
-        }
     }
 }
diff --git a/src/Repositories/DatabaseBirthdayRepository.cs b/src/Repositories/DatabaseBirthdayRepository.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using HappyBirthdayWorld.Api.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace HappyBirthdayWorld.Api.Repositories
+{
+    public class DatabaseBirthdayRepository : IBirthdayRepository
+    {
+        private readonly ILogger<DatabaseBirthdayRepository> logger;
+
+        private readonly BirthdayContext birthdayContext;
+
+        public DatabaseBirthdayRepository(ILogger<DatabaseBirthdayRepository> logger, BirthdayContext birthdayContext)
+        {
+            this.logger = logger;
+            this.birthdayContext = birthdayContext;
+        }
+
+        public bool TryGetDateOfBirth(string name, out DateTime dateOfBirth)
+        {
+            try
+            {
+                dateOfBirth = birthdayContext.BirthRecords.First(br => br.Name == name).DateOfBirth;
+                return true;
+            }
+            catch (Exception e)
+            {
+                logger.LogInformation(e, "Failed to retrieve date of birth");
+            }
+            dateOfBirth = new DateTime();
+            return false;
+        }
+
+        public void PutDateOfBirth(BirthRecord birthRecord)
+        {
+            var existingRecord = birthdayContext.Find<BirthRecord>(birthRecord.Name);
+
+            if (existingRecord == null)
+            {
+                birthdayContext.Add(birthRecord);
+            }
+            else
+            {
+                if (existingRecord.DateOfBirth == birthRecord.DateOfBirth) return;
+                existingRecord.DateOfBirth = birthRecord.DateOfBirth;
+            }
+
+            birthdayContext.SaveChanges();
+        }
+    }
+
+    public class BirthdayContext : DbContext
+    {
+        public BirthdayContext(DbContextOptions options) : base(options)
+        {
+        }
+
+        public DbSet<BirthRecord> BirthRecords { get; set; }
+    }
+}
diff --git a/src/Repositories/IBirthdayRepository.cs b/src/Repositories/IBirthdayRepository.cs
@@ -1,11 +1,13 @@
 using System;
+using HappyBirthdayWorld.Api.Models;
 
 namespace HappyBirthdayWorld.Api.Repositories
 {
+
     public interface IBirthdayRepository
     {
         bool TryGetDateOfBirth(string name, out DateTime dateOfBirth);
 
-        void PutDateOfBirth(string name, DateTime dateOfBirth);
+        void PutDateOfBirth(BirthRecord birthRecord);
     }
 }
diff --git a/src/Repositories/InMemoryBirthdayRepo.cs b/src/Repositories/InMemoryBirthdayRepo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using HappyBirthdayWorld.Api.Models;
 
 namespace HappyBirthdayWorld.Api.Repositories
 {
@@ -14,10 +15,10 @@ public bool TryGetDateOfBirth(string name, out DateTime dateOfBirth)
             return false;
         }
 
-        public void PutDateOfBirth(string name, DateTime dateOfBirth)
+        public void PutDateOfBirth(BirthRecord birthRecord)
         {
-            if (name == null) throw new ArgumentNullException(nameof(name));
-            birthdays[name] = dateOfBirth;
+            if (birthRecord.Name == null) throw new ArgumentNullException(nameof(birthRecord.Name));
+            birthdays[birthRecord.Name] = birthRecord.DateOfBirth;
         }
     }
 }
diff --git a/src/Startup.cs b/src/Startup.cs
@@ -3,6 +3,8 @@
 using HappyBirthdayWorld.Api.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -18,6 +20,7 @@ public Startup(IHostingEnvironment env)
                 .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
+                .AddJsonFile("secrets/appsettings.secrets.json", optional: true)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
         }
@@ -26,9 +29,15 @@ public Startup(IHostingEnvironment env)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
-            services.AddSingleton<IBirthdayRepository>(new InMemoryBirthdayRepo());
-            services.AddSingleton<IBirthdayCalculator>(new BirthdayCalculator(new DateService()));
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+
+            var connectionString = Configuration.GetConnectionString("BirthdayContext");
+            services.AddEntityFrameworkNpgsql().AddDbContext<BirthdayContext>
+                (options => options.UseNpgsql(connectionString));
+
+            services.AddScoped<IBirthdayRepository, DatabaseBirthdayRepository>();
+            services.AddScoped<IBirthdayCalculator, BirthdayCalculator>();
+            services.AddScoped<IDateService, DateService>();
 
             services.AddSwaggerGen(c =>
             {

diff --git a/src/appsettings.Development.json b/src/appsettings.Development.json
@@ -6,5 +6,7 @@
       "System": "Information",
       "Microsoft": "Information"
     }
-  }
+  },
+
+  "ConnectionStrings": { "BirthdayContext": "Server=localhost; Database=hbw; User Id=postgres; Password=mysecretpassword" }
 }
diff --git a/test/HelloControllerTests.cs b/test/HelloControllerTests.cs
@@ -1,7 +1,7 @@
 using System;
 using HappyBirthdayWorld.Api.Controllers;
 using HappyBirthdayWorld.Api.Domain;
-using HappyBirthdayWorld.Api.Models;
+using HappyBirthdayWorld.Api.Dto;
 using HappyBirthdayWorld.Api.Repositories;
 using Microsoft.AspNetCore.Mvc;
 using Moq;