Fixing api refs (#354)

* fixing namespaces and packages in API * removes sharedMethods from service, by creating weekService, and dependency injecting it into a controller. --------- Co-authored-by: Desktop <[email protected]> Co-authored-by: Andreas Würtz <[email protected]>
aau-giraf · Nov 22, 2023 · 148408a · 148408a
1 parent b866c06
commit 148408a
Show file tree

Hide file tree

Showing 57 changed files with 177 additions and 522 deletions.
diff --git a/Giraf.IntegrationTest/CustomWebApplicationFactory.cs b/Giraf.IntegrationTest/CustomWebApplicationFactory.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using System;
-using GirafAPI.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Authentication.JwtBearer;

diff --git a/GirafAPI/Controllers/AccountController.cs b/GirafAPI/Controllers/AccountController.cs
@@ -1,16 +1,16 @@
-using GirafEntities.User;
+using GirafEntities.Authentication;
+using GirafEntities.Authentication.DTOs;
+using GirafEntities.Responses;
+using GirafEntities.Settings.DTOs;
+using GirafEntities.User;
+using GirafEntities.User.DTOs;
 using GirafRepositories.Interfaces;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.DTOs.AccountDTOs;
-using GirafAPI.Models.Responses;
-using GirafAPI.Services;
-using GirafAPI.Interfaces;
+using GirafServices.Authentication;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;

diff --git a/GirafAPI/Controllers/ActivityController.cs b/GirafAPI/Controllers/ActivityController.cs
@@ -1,15 +1,12 @@
-using GirafEntities.User;
+using GirafEntities.Responses;
+using GirafEntities.User;
 using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
 using GirafRepositories.Interfaces;
 using System.Collections.Generic;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
-using GirafAPI.Interfaces;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/GirafAPI/Controllers/AlternateNameController.cs b/GirafAPI/Controllers/AlternateNameController.cs
@@ -1,12 +1,13 @@
 using GirafEntities.User;
+using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
 using GirafRepositories.Interfaces;
-using GirafAPI.Models;
-using GirafAPI.Interfaces;
+using GirafServices.Authentication;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
-using GirafAPI.Models.DTOs;
 using Microsoft.AspNetCore.Http;
 
 namespace GirafAPI.Controllers

diff --git a/GirafAPI/Controllers/BaseControllerExtensions.cs b/GirafAPI/Controllers/BaseControllerExtensions.cs
@@ -1,5 +1,4 @@
-
-using GirafAPI.Models.Responses;
+using GirafEntities.Responses;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;

diff --git a/GirafAPI/Controllers/DepartmentController.cs b/GirafAPI/Controllers/DepartmentController.cs
@@ -1,9 +1,8 @@
+using GirafEntities.Responses;
 using GirafEntities.User;
+using GirafEntities.User.DTOs;
 using GirafRepositories.Interfaces;
-using GirafAPI.Interfaces;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;

diff --git a/GirafAPI/Controllers/ErrorController.cs b/GirafAPI/Controllers/ErrorController.cs
@@ -1,9 +1,8 @@
-using GirafAPI.Models.Responses;
+using GirafEntities.Responses;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System.Net;
 
 namespace GirafAPI.Controllers
 {

diff --git a/GirafAPI/Controllers/PictogramController.cs b/GirafAPI/Controllers/PictogramController.cs
@@ -1,9 +1,9 @@
+using GirafEntities.Responses;
 using GirafEntities.User;
+using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
 using GirafRepositories.Interfaces;
-using GirafAPI.Interfaces;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/GirafAPI/Controllers/StatusController.cs b/GirafAPI/Controllers/StatusController.cs
@@ -1,13 +1,12 @@
-using GirafRepositories.Persistence;
+using GirafEntities.Responses;
+using GirafRepositories.Persistence;
+using GirafServices.User;
 using System;
 using System.IO;
 using System.Linq;
-using GirafAPI.Models.Responses;
-using GirafAPI.Interfaces;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
-using GirafAPI.Data;
 
 namespace GirafAPI.Controllers
 {

diff --git a/GirafAPI/Controllers/UserController.cs b/GirafAPI/Controllers/UserController.cs
@@ -1,10 +1,13 @@
+using GirafEntities.Responses;
+using GirafEntities.Settings.DTOs;
 using GirafEntities.User;
+using GirafEntities.User.DTOs;
+using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
+using GirafRepositories;
 using GirafRepositories.Interfaces;
-using GirafAPI.Extensions;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
-using GirafAPI.Interfaces;
+using GirafServices.Authentication;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;

diff --git a/GirafAPI/Controllers/WeekController.cs b/GirafAPI/Controllers/WeekController.cs
@@ -1,18 +1,16 @@
+using GirafEntities.Responses;
 using GirafEntities.User;
+using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
 using GirafRepositories.Interfaces;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
-using GirafAPI.Interfaces;
+using GirafServices.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using static GirafAPI.Shared.SharedMethods;
 
 
 namespace GirafAPI.Controllers
@@ -157,34 +155,35 @@ public async Task<ActionResult> ReadUsersWeekSchedule(string userId, int weekYea
 
             //Create default thumbnail
             var emptyThumbnail = await _pictogramRepository.GetPictogramWithName("default");
-            if (emptyThumbnail == null)
-            {
-                //Create default thumbnail
-                await _pictogramRepository.AddPictogramWith_NO_ImageHash("default", AccessLevel.PUBLIC);
-
-                emptyThumbnail = await _pictogramRepository.GetPictogramWithName("default");
-
-                return Ok(new SuccessResponse<WeekDTO>(new WeekDTO()
-                {
-                    WeekYear = weekYear,
-                    Name = $"{weekYear} - {weekNumber}",
-                    WeekNumber = weekNumber,
-                    Thumbnail = new Models.DTOs.WeekPictogramDTO(emptyThumbnail),
-                    Days = new int[] { 1, 2, 3, 4, 5, 6, 7 }
-                        .Select(d => new WeekdayDTO()
-                        {
-                            Activities = new List<ActivityDTO>(),
-                            Day = (Days)d
-                        }).ToArray()
-                }));
-            }
+            // IDE SAYS THIS IS ALWAYS FALSE
+            // if (emptyThumbnail == null) 
+            // {
+            //     //Create default thumbnail
+            //     await _pictogramRepository.AddPictogramWith_NO_ImageHash("default", AccessLevel.PUBLIC);
+            //     
+            //     emptyThumbnail = await _pictogramRepository.GetPictogramWithName("default");
+            //
+            //     return Ok(new SuccessResponse<WeekDTO>(new WeekDTO()
+            //     {
+            //         WeekYear = weekYear,
+            //         Name = $"{weekYear} - {weekNumber}",
+            //         WeekNumber = weekNumber,
+            //         Thumbnail = new Models.DTOs.WeekPictogramDTO(emptyThumbnail),
+            //         Days = new int[] { 1, 2, 3, 4, 5, 6, 7 }
+            //             .Select(d => new WeekdayDTO()
+            //             {
+            //                 Activities = new List<ActivityDTO>(),
+            //                 Day = (Days)d
+            //             }).ToArray()
+            //     }));
+            // }
 
             return Ok(new SuccessResponse<WeekDTO>(new WeekDTO()
             {
                 WeekYear = weekYear,
                 Name = $"{weekYear} - {weekNumber}",
                 WeekNumber = weekNumber,
-                Thumbnail = new Models.DTOs.WeekPictogramDTO(emptyThumbnail),
+                Thumbnail = new WeekPictogramDTO(emptyThumbnail),
                 Days = new[] { 1, 2, 3, 4, 5, 6, 7 }
                     .Select(d => new WeekdayDTO()
                     {

diff --git a/GirafAPI/Controllers/WeekTemplateController.cs b/GirafAPI/Controllers/WeekTemplateController.cs
@@ -1,9 +1,11 @@
-using GirafEntities.User;
+using GirafEntities.Responses;
+using GirafEntities.User;
+using GirafEntities.WeekPlanner;
+using GirafEntities.WeekPlanner.DTOs;
 using GirafRepositories.Persistence;
-using GirafAPI.Models;
-using GirafAPI.Models.DTOs;
-using GirafAPI.Models.Responses;
-using GirafAPI.Interfaces;
+using GirafServices.Authentication;
+using GirafServices.User;
+using GirafServices.WeekPlanner;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -12,8 +14,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using static GirafAPI.Shared.SharedMethods;
-using GirafAPI.Data;
 
 namespace GirafAPI.Controllers
 {
@@ -24,6 +24,7 @@ namespace GirafAPI.Controllers
     [Route("v1/[controller]")]
     public class WeekTemplateController : Controller
     {
+        private readonly IWeekService _weekService;
         /// <summary>
         /// A reference to GirafService, that contains common functionality for all controllers.
         /// </summary>
@@ -47,12 +48,14 @@ public class WeekTemplateController : Controller
         public WeekTemplateController(IGirafService giraf,
             ILoggerFactory loggerFactory,
             IAuthenticationService authentication,
-            GirafDbContext context)
+            GirafDbContext context,
+            IWeekService weekService)
         {
             _giraf = giraf;
             _giraf._logger = loggerFactory.CreateLogger("WeekTemplate");
             _authentication = authentication;
             _context = context;
+            _weekService = weekService;
         }
 
         /// <summary>
@@ -152,7 +155,7 @@ public async Task<ActionResult> CreateWeekTemplate([FromBody] WeekTemplateDTO te
 
             var newTemplate = new WeekTemplate(department);
 
-            var errorCode = await SetWeekFromDTO(templateDto, newTemplate, _giraf);
+            var errorCode = await _weekService.SetWeekFromDTO(templateDto, newTemplate, _giraf);
             if (errorCode != null)
                 return BadRequest(errorCode);
 
@@ -205,7 +208,7 @@ public async Task<ActionResult> UpdateWeekTemplate(long id, [FromBody] WeekTempl
             if (!await _authentication.HasTemplateAccess(user, template?.DepartmentKey))
                 return StatusCode(StatusCodes.Status403Forbidden, new ErrorResponse(ErrorCode.NotAuthorized, "User does not have permission"));
 
-            var errorCode = await SetWeekFromDTO(newValuesDto, template, _giraf);
+            var errorCode = await _weekService.SetWeekFromDTO(newValuesDto, template, _giraf);
             if (errorCode != null)
                 return BadRequest(errorCode);
 

diff --git a/GirafAPI/GirafAPI.csproj b/GirafAPI/GirafAPI.csproj
@@ -22,11 +22,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MySql.Data" Version="8.0.30" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.1" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.6.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />

diff --git a/GirafAPI/Setup/GirafExtensions.cs b/GirafAPI/Setup/GirafExtensions.cs
@@ -1,18 +1,6 @@
-using GirafEntities.User;
-using GirafAPI.Data;
-using GirafAPI.Models;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using System;
-using System.IO;
-using System.Threading.Tasks;
 
-namespace GirafAPI.Extensions
+namespace GirafAPI.Setup
 {
     /// <summary>
     /// The class for extension-methods for Giraf REST-api.

diff --git a/GirafAPI/Setup/Startup.cs b/GirafAPI/Setup/Startup.cs
@@ -1,14 +1,11 @@
 using AspNetCoreRateLimit;
+using GirafEntities.Authentication;
 using GirafEntities.User;
 using GirafRepositories;
 using GirafRepositories.Interfaces;
 using GirafRepositories.Persistence;
 using GirafRepositories.User;
 using GirafRepositories.WeekPlanner;
-using GirafAPI.Data;
-using GirafAPI.Extensions;
-using GirafAPI.Interfaces;
-using GirafAPI.Models;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -28,9 +25,9 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using GirafAPI.Repositories;
-using GirafAPI.Services;
 using GirafServices;
+using GirafServices.Authentication;
+using GirafServices.User;
 
 namespace GirafAPI.Setup
 {

diff --git a/GirafEntities/DTOs/ResourceIdDTO.cs b/GirafEntities/DTOs/ResourceIdDTO.cs
diff --git a/GirafEntities/Settings/ChangePasswordDTO.cs → ...tities/Settings/DTOs/ChangePasswordDTO.cs b/GirafEntities/Settings/ChangePasswordDTO.cs → ...tities/Settings/DTOs/ChangePasswordDTO.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace GirafEntities.Settings
+namespace GirafEntities.Settings.DTOs
 {
     /// <summary>
     /// DTO Used for changing password