Merge pull request #91 from martijnmelchers/development

Development

.gitignore

@@ -3,10 +3,14 @@
 bin/
 obj/
 packages/
+*.user
 PublishProfiles/
 
 # macOS vomit
 .DS_Store
 
 # IntelliJ/Rider files
-.idea/
+.idea/
+
+# Other
+Uploads/

src/DomainServices/DomainServices.csproj

@@ -20,6 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Helpers" />
     <Folder Include="Helpers\" />
   </ItemGroup>
 

src/DomainServices/Enums/FestispecPaths.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
 namespace Festispec.DomainServices.Enums
 {
+    [ExcludeFromCodeCoverage]
     public static class FestispecPaths
     {
         // base %AppData% path.

src/DomainServices/Factories/AnswerFactory.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Festispec.Models.Answers;
+using Festispec.Models.Questions;
+
+namespace Festispec.DomainServices.Factories
+{
+    [ExcludeFromCodeCoverage]
+    public class AnswerFactory
+    {
+        public Answer GetAnswer(Question question)
+        {
+            return question switch
+            {
+                NumericQuestion _ => new NumericAnswer(),
+                RatingQuestion _ => new NumericAnswer(),
+                MultipleChoiceQuestion _ => new MultipleChoiceAnswer(),
+                StringQuestion _ => new StringAnswer(),
+                DrawQuestion _ => new FileAnswer(),
+                UploadPictureQuestion _ => new FileAnswer(),
+                _ => throw new Exception()
+            };
+
+        }
+    }
+}

src/DomainServices/Factories/GraphSelectorFactory.cs

@@ -1,10 +1,12 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Festispec.Models;
 using Festispec.Models.GraphConverters;
 using Festispec.Models.Interfaces;
 
 namespace Festispec.DomainServices.Factories
 {
+    [ExcludeFromCodeCoverage]
     public class GraphSelectorFactory
     {
         private readonly Dictionary<GraphType, IGraphable> _converters;

src/DomainServices/Factories/QuestionFactory.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Festispec.Models.Questions;
 
 namespace Festispec.DomainServices.Factories
 {
+    [ExcludeFromCodeCoverage]
     public class QuestionFactory
     {
         public QuestionFactory()

src/DomainServices/Interfaces/IAvailabilityService.cs

@@ -8,14 +8,9 @@ namespace Festispec.DomainServices.Interfaces
 {
     public interface IAvailabilityService
     {
-        Task<Availability> AddUnavailabilityEntireDay(int employeeId, DateTime date, string reason);        
-
-        Task RemoveUnavailablity(int availabilityId);
-
-        Task SaveChanges();
-
+        Task<Availability> AddUnavailabilityEntireDay(int employeeId, DateTime date, string reason);
+        Task RemoveUnavailability(int availabilityId);
         Availability GetUnavailabilityForDay(int employeeId, DateTime date);
-
-        Task<Dictionary<long, Availability>> GetUnavailabilitiesForFuture(int employeeId, DateTime startDate);
+        Task<Dictionary<long, Availability>> GetUnavailabilityForFuture(int employeeId, DateTime startDate);
     }
 }

src/DomainServices/Interfaces/ICustomerService.cs

@@ -7,18 +7,12 @@ namespace Festispec.DomainServices.Interfaces
     public interface ICustomerService : ISyncable
     {
         List<Customer> GetAllCustomers();
-
         Customer GetCustomer(int customerId);
         Task<Customer> GetCustomerAsync(int customerId);
-
         Task<int> RemoveCustomerAsync(int customerId);
-
         Task<Customer> CreateCustomerAsync(string name, int kvkNr, Address address, ContactDetails contactDetails);
         Task<Customer> CreateCustomerAsync(Customer customer);
-
         Task UpdateCustomerAsync(Customer customer);
-
-        Task<int> SaveChangesAsync();
         public bool CanDeleteCustomer(Customer customer);
     }
 }

src/DomainServices/Interfaces/IEmployeeService.cs

@@ -7,22 +7,13 @@ namespace Festispec.DomainServices.Interfaces
     public interface IEmployeeService : ISyncable
     {
         List<Employee> GetAllEmployees();
-
         List<Employee> GetAllEmployeesActiveAndNonActive();
-
         Employee GetEmployee(int employeeId);
         Task<Employee> GetEmployeeAsync(int employeeId);
-
         Task<int> RemoveEmployeeAsync(int employeeId);
-
         Task<Employee> CreateEmployeeAsync(FullName name, string iban, string username, string password,
             Role role, Address address, ContactDetails contactDetails);
-
-        Task<Employee> CreateEmployeeAsync(Employee employee);
-
         Task UpdateEmployee(Employee employee);
-
-
         Task<int> SaveChangesAsync();
         bool CanRemoveEmployee(Employee employee);
         Account GetAccountForEmployee(int employeeId);

src/DomainServices/Interfaces/IFestivalService.cs

@@ -7,7 +7,6 @@ namespace Festispec.DomainServices.Interfaces
     public interface IFestivalService : ISyncable
     {
         Task<Festival> CreateFestival(Festival festival, int customerId);
-        Task<Festival> GetFestivalAsync(int festivalId);
         Festival GetFestival(int festivalId);
         ICollection<Festival> GetFestivals();
         Task UpdateFestival(Festival festival);

src/DomainServices/Interfaces/IInspectionService.cs

@@ -26,8 +26,10 @@ int employeeId
         );
 
         Task RemoveInspection(int plannedInspectionId, string cancellationReason);
-        Task<int> SaveChanges();
         Task<Festival> GetFestivalAsync(int festivalId);
-        Task<int> ProcessPlannedInspections(IEnumerable<PlannedInspection> plannedInspections);
+        Task<int> ProcessPlannedInspections(IEnumerable<PlannedInspection> plannedInspections,
+            Questionnaire questionnaire, string instructions);
     }
+
+
 }

src/DomainServices/Interfaces/IQuestionnaireService.cs

@@ -17,12 +17,8 @@ public interface IQuestionnaireService : ISaveable, ISyncable
         Task<Questionnaire> CopyQuestionnaire(int questionnaireId, string questionnaireName);
         Task<Question> GetQuestion(int questionId);
         Task<Answer> CreateAnswer(Answer answer);
-        void Save();
-
         List<Question> GetQuestionsFromQuestionnaire(int questionnaireId);
-        List<Answer> GetAnswers();
-
-
+        Task<TAnswer> GetAnswer<TAnswer>(int id) where TAnswer : Answer;
         Task<List<PlannedInspection>> GetPlannedInspections(int employeeId);
         Task<PlannedInspection> GetPlannedInspection(int plannedInspectionId);
     }

src/DomainServices/Interfaces/ISicknessService.cs

@@ -8,8 +8,8 @@ namespace Festispec.DomainServices.Interfaces
 {
     public interface ISicknessService
     {
-        Task<Availability> AddAbsense(int employeeId, string reason, DateTime? endDate);
-        Task EndAbsense(int employeeId);
+        Task<Availability> AddAbsence(int employeeId, string reason, DateTime? endDate);
+        Task EndAbsence(int employeeId);
         bool IsSick(int employeeId);
 
     }

src/DomainServices/Interfaces/ISyncService.cs

@@ -16,8 +16,7 @@ public interface ISyncService<T> where T : Entity
         void AddEntities(IEnumerable<T> entities);
 
         void SaveChanges();
-        void SaveChangesAsync();
-
+
         FestispecContext GetSyncContext();
         void Flush();
     }

src/DomainServices/Services/AddressService.cs

@@ -21,8 +21,7 @@ public async Task<Address> SaveAddress(Address address)
             if (!address.Validate())
                 throw new InvalidAddressException();
 
-            Address existing = await _db.Addresses.FirstOrDefaultAsync(a =>
-                a.Latitude != 0 && a.Latitude == address.Latitude && a.Longitude != 0 && a.Longitude == a.Longitude);
+            Address existing = await _db.Addresses.FirstOrDefaultAsync(a => a.Latitude == address.Latitude && a.Longitude == address.Longitude);
 
             if (existing != null)
                 return existing;
@@ -36,14 +35,14 @@ public async Task<Address> SaveAddress(Address address)
         public async Task RemoveAddress(Address address)
         {
             var existing = 0;
-            existing += await _db.Festivals.Include(f => f.Address).CountAsync(a => a.Address.Id == address.Id);
-            existing += await _db.Employees.Include(e => e.Address).CountAsync(e => e.Address.Id == address.Id);
-            existing += await _db.Customers.Include(c => c.Address).CountAsync(c => c.Address.Id == address.Id);
+            existing += await _db.Festivals.Include(f => f.Address).CountAsync(a => a.Address.Id == address.Id && a.Address.Latitude == address.Latitude && a.Address.Longitude == address.Longitude);
+            existing += await _db.Employees.Include(e => e.Address).CountAsync(e => e.Address.Id == address.Id && e.Address.Latitude == address.Latitude && e.Address.Longitude == address.Longitude);
+            existing += await _db.Customers.Include(c => c.Address).CountAsync(c => c.Address.Id == address.Id && c.Address.Latitude == address.Latitude && c.Address.Longitude == address.Longitude);
 
             if (existing == 0)
                 _db.Addresses.Remove(address);
 
             await _db.SaveChangesAsync();
         }
     }
-}
+}

src/DomainServices/Services/AuthenticationService.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Festispec.Models.EntityMapping;
 using System.Data.Entity;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Festispec.DomainServices.Services
 {
@@ -13,7 +14,8 @@ public class AuthenticationService : IAuthenticationService
         private readonly FestispecContext _db;
         private readonly ISyncService<Account> _syncService;
 
-        public Account LoggedIn { get; private set; }
+        [ExcludeFromCodeCoverage]
+        private Account LoggedIn { get; set; }
 
         public AuthenticationService(FestispecContext db, ISyncService<Account> syncService)
         {
@@ -23,7 +25,7 @@ public AuthenticationService(FestispecContext db, ISyncService<Account> syncServ
 
         public Account AssembleAccount(string username, string password, Role requiredRole)
         {
-            Account existing = _db.Accounts.FirstOrDefault(x => x.Username == username);
+            var existing = _db.Accounts.FirstOrDefault(x => x.Username == username);
 
             if (existing != null)
                 throw new EntityExistsException();
@@ -43,7 +45,7 @@ public Account AssembleAccount(string username, string password, Role requiredRo
 
         public Account Login(string username, string password, Role requiredRole)
         {
-            Account account = _db.Accounts.FirstOrDefault(x => x.Username == username);
+            var account = _db.Accounts.FirstOrDefault(x => x.Username == username);
 
             if (account == null || !BCrypt.Net.BCrypt.Verify(password, account.Password))
                 throw new AuthenticationException("Username or password are incorrect");
@@ -59,7 +61,7 @@ public Account Login(string username, string password, Role requiredRole)
 
         public async Task ChangePassword(string username, string password, string newPassword)
         {
-            Account account = _db.Accounts.FirstOrDefault(x => x.Username == username);
+            var account = _db.Accounts.FirstOrDefault(x => x.Username == username);
 
             if (account == null || !BCrypt.Net.BCrypt.Verify(password, account.Password))
                 throw new AuthenticationException("Username or password are incorrect");
@@ -69,14 +71,15 @@ public async Task ChangePassword(string username, string password, string newPas
             await _db.SaveChangesAsync();
         }
 
+        [ExcludeFromCodeCoverage]
         public void Sync()
         {
             if (LoggedIn == null)
                 return;
 
-            FestispecContext ctx = _syncService.GetSyncContext();
+            var ctx = _syncService.GetSyncContext();
 
-            Account account = ctx.Accounts.Include(a => a.Employee).First(a => a.Id == LoggedIn.Id);
+            var account = ctx.Accounts.Include(a => a.Employee).First(a => a.Id == LoggedIn.Id);
 
             _syncService.Flush();
             _syncService.AddEntity(account);