Merge pull request #93 from martijnmelchers/development

Development
martijnmelchers · Jan 14, 2020 · 76c4fda · 76c4fda
2 parents f10ab54 + 34a5aa8
commit 76c4fda
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/src/DomainServices/Services/AvailabilityService.cs b/src/DomainServices/Services/AvailabilityService.cs
@@ -49,7 +49,7 @@ public Availability GetUnavailabilityForDay(int employeeId, DateTime date)
         {
             return _db.Availabilities.FirstOrDefault(
                 a => a.Employee.Id == employeeId 
-                     && _db.TruncateTime(a.StartTime) == _db.TruncateTime(date) 
+                     && FestispecContext.TruncateTime(a.StartTime) == FestispecContext.TruncateTime(date) 
                      && a.EventTitle == "Niet beschikbaar");
         }
 

diff --git a/src/DomainServices/Services/InspectionService.cs b/src/DomainServices/Services/InspectionService.cs
@@ -167,7 +167,7 @@ public async Task<List<PlannedInspection>> GetPlannedInspections(int employeeId)
         {
             var plannedInspections = await _db.PlannedInspections
                 .Include(e => e.Employee)
-                .Where(e => e.Employee.Id == employeeId && _db.TruncateTime(e.StartTime) == _db.TruncateTime(DateTime.Now))
+                .Where(e => e.Employee.Id == employeeId && FestispecContext.TruncateTime(e.StartTime) == FestispecContext.TruncateTime(DateTime.Now))
                 .ToListAsync();
 
             if (plannedInspections.Count < 1)

diff --git a/src/DomainServices/Startup.cs b/src/DomainServices/Startup.cs
@@ -18,7 +18,7 @@ public static IServiceCollection AddDomainServices(this IServiceCollection servi
             services.AddTransient<FestispecContext>();
             services.AddScoped(typeof(ISyncService<>), typeof(JsonSyncService<>));
             services.AddSingleton<IOfflineService, DbPollOfflineService>();
-            string environment = Environment.GetEnvironmentVariable("Environment") ?? "Debug";
+            string environment = Environment.GetEnvironmentVariable("Environment") ?? "Production";
 
             var configuration = new ConfigurationBuilder()
                 .AddJsonFile($"appsettings.{environment}.json")

diff --git a/src/DomainServices/appsettings.Production.json b/src/DomainServices/appsettings.Production.json
@@ -1,5 +1,5 @@
 {
-  "ConnectionString": "Server=tcp:festispec-e.database.windows.net,1433;Initial Catalog=Festispec;Persist Security Info=False;User ID=martijn;Password=w8UbnjG0kg%x2fyk;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
+  "ConnectionString": "Server=tcp:festispec-e.database.windows.net,1433;Initial Catalog=Festispec;Persist Security Info=False;User ID=martijn;Password=w8UbnjG0kg%x2fyk;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=10;",
   "ApiKeys": {
     "Google": "AIzaSyB75U9ewy-e0nrRb4WKXXTTdalclxoipTs",
     "Bing": "Ag2i7B-Uw8sWueLGS7BX7J5xYYKPJnynHsz7KYPQuE_cZAZItqMIQtYgE9mWIvkH"

diff --git a/src/Models/EntityMapping/FestispecContext.cs b/src/Models/EntityMapping/FestispecContext.cs
@@ -51,10 +51,11 @@ public override async Task<int> SaveChangesAsync()
             AddTimestamps();
             return await base.SaveChangesAsync();
         }
-
-        public virtual DateTime? TruncateTime(DateTime dateTime)
+
+        [DbFunction("Edm", "TruncateTime")]
+        public static DateTime? TruncateTime(DateTime? dateValue)
         {
-            return DbFunctions.TruncateTime(dateTime);
+            return dateValue?.Date;
         }
 
         private void AddTimestamps()

diff --git a/src/UnitTests/InspectionServiceTests.cs b/src/UnitTests/InspectionServiceTests.cs
@@ -33,7 +33,6 @@ public InspectionServiceTests()
             _dbMock.Setup(x => x.Questionnaires)
                 .Returns(MockHelpers.CreateDbSetMock(new ModelMocks().Questionnaires).Object);
             _dbMock.Setup(x => x.Employees).Returns(MockHelpers.CreateDbSetMock(new ModelMocks().Employees).Object);
-            _dbMock.Setup(x => x.TruncateTime(It.IsAny<DateTime>())).Returns<DateTime>(dt => dt.Date);
 
             // Create InspectionService
             _inspectionService =

diff --git a/src/UnitTests/QuestionnaireTests.cs b/src/UnitTests/QuestionnaireTests.cs
@@ -33,7 +33,6 @@ public QuestionnaireTests()
                 .Returns(MockHelpers.CreateDbSetMock(new ModelMocks().PlannedInspections).Object);
             _dbMock.Setup(x => x.Festivals).Returns(MockHelpers.CreateDbSetMock(new ModelMocks().Festivals).Object);
             _dbMock.Setup(x => x.Employees).Returns(MockHelpers.CreateDbSetMock(new ModelMocks().Employees).Object);
-            _dbMock.Setup(x => x.TruncateTime(It.IsAny<DateTime>())).Returns<DateTime>(dt => dt.Date);
             _dbMock.Setup(m => m.SaveChangesAsync()).ReturnsAsync(1);
 
             _questionnaireService =