Merge (#366)

* arch * hej * hej * added services * removed pictogram service * removed redundant packages, tested dotnet ef database update and dotnet run * Found the issue its the UserIcon in GirafUser and in the constructor * removed dbcontext from startup * added role repo to constructer in service * Fix two byte null errors * added settings for weekdaycolors to girafuser * forgot to initialize list * test * removing logging * removed serilog * logging removed * logging removed * Remove prints * removed remaining log problems from programoptions * removed girafextensions * refactor logic from entities * refactoring of helper functions * started resolving unit test errors * resolving more unit test issues * no build errors in unit tests * fixed account controller test for girafroles * Missing 3 tests * fixed 1 integration test * dto to nullable * Changed xunit * removed userservice from find members * resolved another test * user role * changed * fixed some error * another unit test fixed * enabled last test * removed unneacessary extra method calls in ReadPictograms_Succes test, now works * Changed mock setup for UpdatepictogramInfo_Succes to rely less on other dependencies * changed DeletePictogram_Success test to rely on less denpendencies * removed commented-out functions, that have been moved --------- Co-authored-by: Kristian <[email protected]> Co-authored-by: Schoogle <[email protected]> Co-authored-by: jojens15 <[email protected]>
aau-giraf · Dec 1, 2023 · d1c8efb · d1c8efb
1 parent dca9353
commit d1c8efb
Show file tree

Hide file tree

Showing 78 changed files with 886 additions and 1,026 deletions.
diff --git a/Giraf.IntegrationTest/CustomWebApplicationFactory.cs b/Giraf.IntegrationTest/CustomWebApplicationFactory.cs
@@ -1,15 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Configuration;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using GirafAPI.Data;
-using GirafAPI.Models;
-using Microsoft.AspNetCore.Identity;
-using System.IdentityModel.Tokens.Jwt;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using GirafAPI.Setup;

diff --git a/Giraf.IntegrationTest/Tests/AuthorizationTest.cs b/Giraf.IntegrationTest/Tests/AuthorizationTest.cs
@@ -8,7 +8,7 @@
 using Giraf.IntegrationTest.Extensions;
 using Giraf.IntegrationTest.Order;
 using Giraf.IntegrationTest.Setup;
-using GirafAPI;
+using GirafEntities.User.DTOs;
 using Xunit;
 using Newtonsoft.Json.Linq;