Merge pull request #172 from nationalarchives/feature/get_holiday_fro…

…m_linked_view

Moving the bank-holiday data fetch from record-copying to doris

book-a-reading-room-visit.api/Program.cs

@@ -6,7 +6,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;
 using NLog.Web;
-using System.Net.Http.Headers;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -34,19 +33,6 @@
 
 builder.Services.AddMemoryCache();
 
-string sRecordCopyingUrl = Environment.GetEnvironmentVariable("RecordCopying_WebApi_URL") ?? string.Empty;
-
-if (String.IsNullOrEmpty(sRecordCopyingUrl))
-{
-    throw new ApplicationException("RecordCopying WebApi URL must be provided via the RecordCopying_WebApi_URL environment variable.");
-}
-
-builder.Services.AddHttpClient<IBankHolidayAPI, BankHolidayAPI>(c =>
-{
-    c.BaseAddress = new Uri(sRecordCopyingUrl);
-    c.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-    c.DefaultRequestHeaders.Host = Environment.GetEnvironmentVariable("RecordCopying_Header");
-});
 builder.Services.AddScoped<IWorkingDayService, WorkingDayService>();
 builder.Services.AddScoped<IAvailabilityService, AvailabilityService>();
 builder.Services.AddScoped<IBookingService, BookingService>();

book-a-reading-room-visit.api/Properties/launchSettings.json

@@ -17,8 +17,6 @@
       "applicationUrl": "https://localhost:7140;http://localhost:5148",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "RecordCopying_WebApi_URL": "http://localhost:82/RecordCopyingServiceAPI/",
-        "RecordCopying_Header": "services.nationalarchives.web.local",
         "KewBookingConnection": "Data Source= (localdb)\\MSSQLLocalDB; Initial Catalog=KewBooking",
         "HomeURL": "https://dev-www.nationalarchives.gov.uk/book-a-reading-room-visit",
         "AWS_PROFILE": "dev",
@@ -33,8 +31,6 @@
       "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "RecordCopying_WebApi_URL": "http://localhost:82/RecordCopyingServiceAPI/",
-        "RecordCopying_Header": "services.nationalarchives.web.local",
         "KewBookingConnection": "Data Source= (localdb)\\MSSQLLocalDB; Initial Catalog=KewBooking",
         "HomeURL": "https://dev-www.nationalarchives.gov.uk/book-a-reading-room-visit",
         "AWS_PROFILE": "dev",

book-a-reading-room-visit.api/Service/Impl/WorkingDayService.cs

@@ -1,25 +1,23 @@
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using book_a_reading_room_visit.data;
+using book_a_reading_room_visit.domain;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace book_a_reading_room_visit.api.Service
 {
     public class WorkingDayService : IWorkingDayService
     {
         private IMemoryCache _cache;
         private readonly IConfiguration _configuration;
-        private readonly IBankHolidayAPI _bankHolidayAPI;
+        private readonly BookingContext _context;
         private readonly DayOfWeek[] WorkingWeekDays = new DayOfWeek[] { DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday };
         private readonly DayOfWeek[] OneDayOrderOpeningWeekDays = new DayOfWeek[] { DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday, DayOfWeek.Saturday };
         private readonly DayOfWeek[] TwoDayOrderOpeningWeekDays = new DayOfWeek[] { DayOfWeek.Tuesday, DayOfWeek.Thursday, };
 
-        public WorkingDayService(IConfiguration configuration, IBankHolidayAPI bankHolidayAPI, IMemoryCache memoryCache)
+        public WorkingDayService(IConfiguration configuration, BookingContext context, IMemoryCache memoryCache)
         {
             _configuration = configuration;
-            _bankHolidayAPI = bankHolidayAPI;
+            _context = context; 
             _cache = memoryCache;
         }
         public async Task<List<DateTime>> GetOneDayOrderAvailableDatesAsync()
@@ -69,7 +67,9 @@ public async Task<List<DateTime>> GetTwoDayOrderAvailableDatesAsync()
 
         public async Task<DateTime> GetNextWorkingDayAsync(DateTime dateTime, int daysToAdd)
         {
-            var holidays = await _bankHolidayAPI.GetBankHolidaysAsync();
+            var holidays = await (from holiday in _context.Set<TNAHoliday>()
+                                    select holiday.date_closed).ToListAsync();
+
             var dateToReturn = dateTime;
             while (daysToAdd > 0)
             {
@@ -82,7 +82,8 @@ public async Task<DateTime> GetNextWorkingDayAsync(DateTime dateTime, int daysTo
 
         public async Task<DateTime> GetNextOneDayOrderOpeningDayAsync(DateTime dateTime, int daysToAdd)
         {
-            var holidays = await _bankHolidayAPI.GetBankHolidaysAsync();
+            var holidays = await (from holiday in _context.Set<TNAHoliday>()
+                                  select holiday.date_closed).ToListAsync();
             var dateToReturn = dateTime;
             while (daysToAdd > 0)
             {
@@ -95,7 +96,8 @@ public async Task<DateTime> GetNextOneDayOrderOpeningDayAsync(DateTime dateTime,
 
         public async Task<DateTime> GetNextTwoDayOrderOpeningDayAsync(DateTime dateTime, int daysToAdd)
         {
-            var holidays = await _bankHolidayAPI.GetBankHolidaysAsync();
+            var holidays = await (from holiday in _context.Set<TNAHoliday>()
+                                  select holiday.date_closed).ToListAsync();
             var dateToReturn = dateTime;
             while (daysToAdd > 0)
             {
@@ -109,7 +111,8 @@ public async Task<DateTime> GetNextTwoDayOrderOpeningDayAsync(DateTime dateTime,
         public async Task<DateTime> GetCompleteByDateAsync(DateTime dateTime)
         {
             int daysToDeduct = int.Parse(_configuration.GetSection("BookingTimeLine:DocumentsPreparationDays").Value);
-            var holidays = await _bankHolidayAPI.GetBankHolidaysAsync();
+            var holidays = await (from holiday in _context.Set<TNAHoliday>()
+                                  select holiday.date_closed).ToListAsync();
             var dateToReturn = dateTime;
             while (daysToDeduct > 0)
             {

book-a-reading-room-visit.data/BookingContext.cs

@@ -15,6 +15,7 @@ public BookingContext(DbContextOptions<BookingContext> options)
         public DbSet<Seat> Seats { get; set; }
         public DbSet<BookingStatus> BookingStatus { get; set; }
         public DbSet<OrderDocument> OrderDocuments { get; set; }
+        public DbSet<TNAHoliday> TNAHoliday { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -43,6 +44,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<OrderDocument>().Property(e => e.PieceReference).HasMaxLength(40);
             modelBuilder.Entity<OrderDocument>().Property(e => e.ItemReference).HasMaxLength(40);
             modelBuilder.Entity<OrderDocument>().Property(e => e.Site).HasMaxLength(20);
+
+            modelBuilder.Entity<TNAHoliday>().ToView(nameof(TNAHoliday)).HasNoKey();
         }
     }
 }

book-a-reading-room-visit.domain/TNAHoliday.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace book_a_reading_room_visit.domain
+{
+    public class TNAHoliday
+    {
+        public DateTime date_closed { get; set; }
+        public string description { get; set; }
+    }
+}