diff --git a/GirafEntities/Authentication/DTOs/LoginDTO.cs b/GirafEntities/Authentication/DTOs/LoginDTO.cs index 44afb458..fdc69143 100644 --- a/GirafEntities/Authentication/DTOs/LoginDTO.cs +++ b/GirafEntities/Authentication/DTOs/LoginDTO.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace GirafRest.Models.DTOs.AccountDTOs +namespace GirafEntities.Authentication.DTOs { /// /// DTO Used for Login diff --git a/GirafEntities/Authentication/DTOs/RegisterDTO.cs b/GirafEntities/Authentication/DTOs/RegisterDTO.cs index 05520f0e..9bf999c1 100644 --- a/GirafEntities/Authentication/DTOs/RegisterDTO.cs +++ b/GirafEntities/Authentication/DTOs/RegisterDTO.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using GirafEntities.User; -namespace GirafRest.Models.DTOs.AccountDTOs +namespace GirafEntities.Authentication.DTOs { /// /// DTO Used for registrering/Signup diff --git a/GirafEntities/Authentication/JwtConfig.cs b/GirafEntities/Authentication/JwtConfig.cs index 84ca03e5..2ef3919c 100644 --- a/GirafEntities/Authentication/JwtConfig.cs +++ b/GirafEntities/Authentication/JwtConfig.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Services +namespace GirafEntities.Authentication { /// /// Instance of JwtConfig holding serverside configuration for building JWT Tokens diff --git a/GirafEntities/DTOs/ResourceIdDTO.cs b/GirafEntities/DTOs/ResourceIdDTO.cs index 235e1e6c..03f38e9a 100644 --- a/GirafEntities/DTOs/ResourceIdDTO.cs +++ b/GirafEntities/DTOs/ResourceIdDTO.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Models.DTOs +namespace GirafEntities.DTOs { /// /// Simple DTO for a Resource ID diff --git a/GirafEntities/GirafEntities.csproj b/GirafEntities/GirafEntities.csproj index 166914f9..e79a7fd0 100644 --- a/GirafEntities/GirafEntities.csproj +++ b/GirafEntities/GirafEntities.csproj @@ -8,6 +8,7 @@ + diff --git a/GirafEntities/Samples/SampleData.cs b/GirafEntities/Samples/SampleData.cs index 4c48b9a9..1928835c 100644 --- a/GirafEntities/Samples/SampleData.cs +++ b/GirafEntities/Samples/SampleData.cs @@ -1,10 +1,9 @@ -using GirafRest.Data.Samples; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace GirafRest.Data +namespace GirafEntities.Samples { public class SampleData { diff --git a/GirafEntities/Samples/SampleDepartment.cs b/GirafEntities/Samples/SampleDepartment.cs index d207295c..506778b8 100644 --- a/GirafEntities/Samples/SampleDepartment.cs +++ b/GirafEntities/Samples/SampleDepartment.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SampleDepartment { diff --git a/GirafEntities/Samples/SampleGirafUser.cs b/GirafEntities/Samples/SampleGirafUser.cs index 9fe457f2..283ffc2b 100644 --- a/GirafEntities/Samples/SampleGirafUser.cs +++ b/GirafEntities/Samples/SampleGirafUser.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SampleGirafUser { diff --git a/GirafEntities/Samples/SamplePictogram.cs b/GirafEntities/Samples/SamplePictogram.cs index f0930a73..10a2c6a1 100644 --- a/GirafEntities/Samples/SamplePictogram.cs +++ b/GirafEntities/Samples/SamplePictogram.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SamplePictogram { diff --git a/GirafEntities/Samples/SampleWeek.cs b/GirafEntities/Samples/SampleWeek.cs index 137524bc..96cec9b7 100644 --- a/GirafEntities/Samples/SampleWeek.cs +++ b/GirafEntities/Samples/SampleWeek.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SampleWeek { diff --git a/GirafEntities/Samples/SampleWeekDay.cs b/GirafEntities/Samples/SampleWeekDay.cs index eec48bc3..db7e37ba 100644 --- a/GirafEntities/Samples/SampleWeekDay.cs +++ b/GirafEntities/Samples/SampleWeekDay.cs @@ -1,7 +1,7 @@ using GirafRest.Models; using System.Collections.Generic; -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SampleWeekday { diff --git a/GirafEntities/Samples/SampleWeekTemplate.cs b/GirafEntities/Samples/SampleWeekTemplate.cs index 9f0873bf..bbd99afb 100644 --- a/GirafEntities/Samples/SampleWeekTemplate.cs +++ b/GirafEntities/Samples/SampleWeekTemplate.cs @@ -1,4 +1,4 @@ -namespace GirafRest.Data.Samples +namespace GirafEntities.Samples { public class SampleWeekTemplate { diff --git a/GirafEntities/Settings/ChangePasswordDTO.cs b/GirafEntities/Settings/ChangePasswordDTO.cs index 634f8f3d..b71ef8ef 100644 --- a/GirafEntities/Settings/ChangePasswordDTO.cs +++ b/GirafEntities/Settings/ChangePasswordDTO.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace GirafRest.Models.DTOs.AccountDTOs +namespace GirafEntities.Settings { /// /// DTO Used for changing password diff --git a/GirafEntities/Settings/ResetPasswordDTO.cs b/GirafEntities/Settings/ResetPasswordDTO.cs index ed05a9cd..5630c140 100644 --- a/GirafEntities/Settings/ResetPasswordDTO.cs +++ b/GirafEntities/Settings/ResetPasswordDTO.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace GirafRest.Models.DTOs.AccountDTOs +namespace GirafEntities.Settings { /// /// This class defines the structure of the expected json when a user wishes to reset his password. diff --git a/GirafEntities/Settings/Setting.cs b/GirafEntities/Settings/Setting.cs index 31b55de8..ee63a1eb 100644 --- a/GirafEntities/Settings/Setting.cs +++ b/GirafEntities/Settings/Setting.cs @@ -1,9 +1,8 @@ -using GirafRest.Models.DTOs; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -namespace GirafRest.Models +namespace GirafEntities.Settings { /// /// The LauncherOptions, which is the various settings the users can add to customize the Launcher App. @@ -50,7 +49,7 @@ public class Setting /// [Required] public Theme Theme { get; set; } - + /// /// Defines the number of days to display in portrait mode for a user in a weekplan /// @@ -79,12 +78,12 @@ public class Setting /// Flag to indicate whether citizen should see one or more days or only activities /// public bool ShowOnlyActivities { get; set; } - + /// /// Defines the number of activities to display for a user in a weekschedule /// public int? NrOfActivitiesToDisplay { get; set; } - + /// /// Flag for indicating whether or not greyscale is enabled /// @@ -122,24 +121,24 @@ public class Setting /// The DTO containing new settings public void UpdateFrom(SettingDTO newOptions) { - this.Orientation = newOptions?.Orientation ?? this.Orientation; - this.CompleteMark = newOptions?.CompleteMark ?? this.CompleteMark; - this.CancelMark = newOptions?.CancelMark ?? this.CancelMark; - this.DefaultTimer = newOptions?.DefaultTimer ?? this.DefaultTimer; - this.TimerSeconds = newOptions?.TimerSeconds ?? this.TimerSeconds; - this.ActivitiesCount = newOptions?.ActivitiesCount ?? this.ActivitiesCount; - this.Theme = newOptions?.Theme ?? this.Theme; - this.NrOfDaysToDisplayPortrait = newOptions?.NrOfDaysToDisplayPortrait ?? this.NrOfDaysToDisplayPortrait; - this.DisplayDaysRelativePortrait = newOptions?.DisplayDaysRelativePortrait ?? this.DisplayDaysRelativePortrait; - this.NrOfDaysToDisplayLandscape = newOptions?.NrOfDaysToDisplayLandscape ?? this.NrOfDaysToDisplayLandscape; - this.DisplayDaysRelativeLandscape = newOptions?.DisplayDaysRelativeLandscape ?? this.DisplayDaysRelativeLandscape; - this.GreyScale = newOptions?.GreyScale ?? this.GreyScale; - this.LockTimerControl = newOptions?.LockTimerControl ?? this.LockTimerControl; - this.PictogramText = newOptions?.PictogramText ?? this.PictogramText; - this.ShowPopup = newOptions?.ShowPopup ?? this.ShowPopup; - this.NrOfActivitiesToDisplay = newOptions?.NrOfActivitiesToDisplay ?? this.NrOfActivitiesToDisplay; - this.ShowOnlyActivities = newOptions?.ShowOnlyActivities ?? this.ShowOnlyActivities; - this.ShowSettingsForCitizen = newOptions?.ShowSettingsForCitizen ?? this.ShowSettingsForCitizen; + Orientation = newOptions?.Orientation ?? Orientation; + CompleteMark = newOptions?.CompleteMark ?? CompleteMark; + CancelMark = newOptions?.CancelMark ?? CancelMark; + DefaultTimer = newOptions?.DefaultTimer ?? DefaultTimer; + TimerSeconds = newOptions?.TimerSeconds ?? TimerSeconds; + ActivitiesCount = newOptions?.ActivitiesCount ?? ActivitiesCount; + Theme = newOptions?.Theme ?? Theme; + NrOfDaysToDisplayPortrait = newOptions?.NrOfDaysToDisplayPortrait ?? NrOfDaysToDisplayPortrait; + DisplayDaysRelativePortrait = newOptions?.DisplayDaysRelativePortrait ?? DisplayDaysRelativePortrait; + NrOfDaysToDisplayLandscape = newOptions?.NrOfDaysToDisplayLandscape ?? NrOfDaysToDisplayLandscape; + DisplayDaysRelativeLandscape = newOptions?.DisplayDaysRelativeLandscape ?? DisplayDaysRelativeLandscape; + GreyScale = newOptions?.GreyScale ?? GreyScale; + LockTimerControl = newOptions?.LockTimerControl ?? LockTimerControl; + PictogramText = newOptions?.PictogramText ?? PictogramText; + ShowPopup = newOptions?.ShowPopup ?? ShowPopup; + NrOfActivitiesToDisplay = newOptions?.NrOfActivitiesToDisplay ?? NrOfActivitiesToDisplay; + ShowOnlyActivities = newOptions?.ShowOnlyActivities ?? ShowOnlyActivities; + ShowSettingsForCitizen = newOptions?.ShowSettingsForCitizen ?? ShowSettingsForCitizen; if (newOptions.WeekDayColors != null) updateWeekDayColors(newOptions.WeekDayColors); } @@ -150,7 +149,7 @@ private void updateWeekDayColors(List weekDayColors) { foreach (var weekDayColor in weekDayColors) { - var weekDayColorToUpdate = this.WeekDayColors.FirstOrDefault(wdc => wdc.Day == weekDayColor.Day); + var weekDayColorToUpdate = WeekDayColors.FirstOrDefault(wdc => wdc.Day == weekDayColor.Day); if (weekDayColorToUpdate != null) { weekDayColorToUpdate.HexColor = weekDayColor.HexColor; @@ -164,7 +163,7 @@ private void updateWeekDayColors(List weekDayColors) /// public void InitialiseWeekDayColors() { - this.WeekDayColors = new List(){ + WeekDayColors = new List(){ new WeekDayColor(){Day = Days.Monday, HexColor = "#08a045", SettingId = Key}, new WeekDayColor(){Day = Days.Tuesday, HexColor = "#540d6e", SettingId = Key}, new WeekDayColor(){Day = Days.Wednesday, HexColor = "#f77f00", SettingId = Key}, diff --git a/GirafEntities/Settings/SettingDTO.cs b/GirafEntities/Settings/SettingDTO.cs index 5dafea83..496b6396 100644 --- a/GirafEntities/Settings/SettingDTO.cs +++ b/GirafEntities/Settings/SettingDTO.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace GirafRest.Models.DTOs +namespace GirafEntities.Settings { /// /// Screen orientation @@ -195,25 +195,25 @@ public class SettingDTO /// The launcher options in need of transfer public SettingDTO(Setting options) { - this.Orientation = options.Orientation; - this.CompleteMark = options.CompleteMark; - this.CancelMark = options.CancelMark; - this.DefaultTimer = options.DefaultTimer; - this.TimerSeconds = options.TimerSeconds; - this.ActivitiesCount = options.ActivitiesCount; - this.Theme = options.Theme; - this.NrOfDaysToDisplayPortrait = options.NrOfDaysToDisplayPortrait; - this.DisplayDaysRelativePortrait = options.DisplayDaysRelativePortrait; - this.NrOfDaysToDisplayLandscape = options.NrOfDaysToDisplayLandscape; - this.DisplayDaysRelativeLandscape = options.DisplayDaysRelativeLandscape; - this.ShowOnlyActivities = options.ShowOnlyActivities; - this.NrOfActivitiesToDisplay = options.NrOfActivitiesToDisplay; - this.GreyScale = options.GreyScale; - this.LockTimerControl = options.LockTimerControl; - this.PictogramText = options.PictogramText; - this.ShowSettingsForCitizen = options.ShowSettingsForCitizen; - this.WeekDayColors = SetWeekDayColorsFromModel(options.WeekDayColors); - this.ShowPopup = options.ShowPopup; + Orientation = options.Orientation; + CompleteMark = options.CompleteMark; + CancelMark = options.CancelMark; + DefaultTimer = options.DefaultTimer; + TimerSeconds = options.TimerSeconds; + ActivitiesCount = options.ActivitiesCount; + Theme = options.Theme; + NrOfDaysToDisplayPortrait = options.NrOfDaysToDisplayPortrait; + DisplayDaysRelativePortrait = options.DisplayDaysRelativePortrait; + NrOfDaysToDisplayLandscape = options.NrOfDaysToDisplayLandscape; + DisplayDaysRelativeLandscape = options.DisplayDaysRelativeLandscape; + ShowOnlyActivities = options.ShowOnlyActivities; + NrOfActivitiesToDisplay = options.NrOfActivitiesToDisplay; + GreyScale = options.GreyScale; + LockTimerControl = options.LockTimerControl; + PictogramText = options.PictogramText; + ShowSettingsForCitizen = options.ShowSettingsForCitizen; + WeekDayColors = SetWeekDayColorsFromModel(options.WeekDayColors); + ShowPopup = options.ShowPopup; } /// diff --git a/GirafEntities/User/DTOs/DepartmentDTO.cs b/GirafEntities/User/DTOs/DepartmentDTO.cs index b10a28ef..8fc9a84f 100644 --- a/GirafEntities/User/DTOs/DepartmentDTO.cs +++ b/GirafEntities/User/DTOs/DepartmentDTO.cs @@ -3,9 +3,8 @@ using Microsoft.AspNetCore.Identity; using System.Collections.Generic; using System.Linq; -using GirafEntities.User; -namespace GirafRest.Models.DTOs +namespace GirafEntities.User.DTOs { /// /// DTO for diff --git a/GirafEntities/User/DTOs/DepartmentNameDTO.cs b/GirafEntities/User/DTOs/DepartmentNameDTO.cs index 04ab5032..6ccf8e56 100644 --- a/GirafEntities/User/DTOs/DepartmentNameDTO.cs +++ b/GirafEntities/User/DTOs/DepartmentNameDTO.cs @@ -1,4 +1,4 @@ -namespace GirafRest +namespace GirafEntities.User.DTOs { /// /// DTO for Department Name @@ -19,8 +19,8 @@ public class DepartmentNameDTO /// public DepartmentNameDTO(long id, string name) { - this.ID = id; - this.Name = name; + ID = id; + Name = name; } /// diff --git a/GirafEntities/User/DTOs/DisplayNameDTO.cs b/GirafEntities/User/DTOs/DisplayNameDTO.cs index 7b9b0617..5cacd92f 100644 --- a/GirafEntities/User/DTOs/DisplayNameDTO.cs +++ b/GirafEntities/User/DTOs/DisplayNameDTO.cs @@ -1,7 +1,7 @@ using System; using GirafEntities.User; -namespace GirafRest.Models.DTOs +namespace GirafEntities.User.DTOs { /// /// DTO for DisplayName, used to avoid sending entire GirafUserDTO to avoid sending unnecessary information @@ -54,7 +54,7 @@ public int CompareTo(DisplayNameDTO other) } else { - return this.DisplayName.CompareTo(other.DisplayName); + return DisplayName.CompareTo(other.DisplayName); } } @@ -68,7 +68,7 @@ public override bool Equals(object obj) return false; DisplayNameDTO dto = (DisplayNameDTO)obj; - return this.DisplayName == dto.DisplayName && this.UserRole == dto.UserRole && this.UserId == dto.UserId; + return DisplayName == dto.DisplayName && UserRole == dto.UserRole && UserId == dto.UserId; } } } diff --git a/GirafEntities/User/DTOs/GirafUserDTO.cs b/GirafEntities/User/DTOs/GirafUserDTO.cs index 9ca96399..63b872f6 100644 --- a/GirafEntities/User/DTOs/GirafUserDTO.cs +++ b/GirafEntities/User/DTOs/GirafUserDTO.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using GirafEntities.User; -namespace GirafRest.Models.DTOs +namespace GirafEntities.User.DTOs { /// /// Defines the structure of GirafUsers when serializing and deserializing data. Data transfer objects (DTOs) diff --git a/GirafEntities/User/Department.cs b/GirafEntities/User/Department.cs index a69342d0..4650c29a 100644 --- a/GirafEntities/User/Department.cs +++ b/GirafEntities/User/Department.cs @@ -1,10 +1,9 @@ -using GirafRest.Models.DTOs; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using GirafEntities.User; +using GirafEntities.User.DTOs; -namespace GirafRest.Models +namespace GirafEntities.User { /// /// Departments group users and thus have a list of users. They may own resources, that are available @@ -56,7 +55,7 @@ public Department() /// The DTO containing all data on the new department. public Department(DepartmentDTO depDTO) : this() { - this.Name = depDTO.Name; + Name = depDTO.Name; } } } \ No newline at end of file diff --git a/GirafEntities/User/DepartmentResource.cs b/GirafEntities/User/DepartmentResource.cs index f8f06557..f444e211 100644 --- a/GirafEntities/User/DepartmentResource.cs +++ b/GirafEntities/User/DepartmentResource.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace GirafRest.Models +namespace GirafEntities.User { /// /// Defines a many-to-many relationship between and (ressource) @@ -45,10 +45,10 @@ public class DepartmentResource /// The involved pictogram. public DepartmentResource(Department dep, Pictogram pictogram) { - this.OtherKey = dep.Key; - this.Other = dep; - this.PictogramKey = pictogram.Id; - this.Pictogram = pictogram; + OtherKey = dep.Key; + Other = dep; + PictogramKey = pictogram.Id; + Pictogram = pictogram; pictogram.LastEdit = DateTime.Now; Other.Resources.Add(this); diff --git a/GirafEntities/User/GirafUser.cs b/GirafEntities/User/GirafUser.cs index 0d47fe31..db61247a 100644 --- a/GirafEntities/User/GirafUser.cs +++ b/GirafEntities/User/GirafUser.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using GirafRest.Models; +using GirafEntities.Settings; using Microsoft.AspNetCore.Identity; namespace GirafEntities.User diff --git a/GirafEntities/User/GuardianRelation.cs b/GirafEntities/User/GuardianRelation.cs index 8aa9d99e..21e4e33e 100644 --- a/GirafEntities/User/GuardianRelation.cs +++ b/GirafEntities/User/GuardianRelation.cs @@ -1,9 +1,7 @@ -using GirafRest.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using GirafEntities.User; -namespace GirafRest.Models +namespace GirafEntities.User { /// @@ -46,8 +44,8 @@ public class GuardianRelation /// public GuardianRelation(GirafUser guardian, GirafUser citizen) { - this.Citizen = citizen; - this.Guardian = guardian; + Citizen = citizen; + Guardian = guardian; } /// diff --git a/GirafEntities/User/UserResource.cs b/GirafEntities/User/UserResource.cs index d53fe095..37fbd99c 100644 --- a/GirafEntities/User/UserResource.cs +++ b/GirafEntities/User/UserResource.cs @@ -1,9 +1,8 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using GirafEntities.User; -namespace GirafRest.Models +namespace GirafEntities.User { /// /// Defines a many-to-many relationship between and (ressource) @@ -47,10 +46,10 @@ public class UserResource /// The involved pictogram. public UserResource(GirafUser user, Pictogram pictogram) { - this.OtherKey = user.Id; - this.Other = user; - this.PictogramKey = pictogram.Id; - this.Pictogram = pictogram; + OtherKey = user.Id; + Other = user; + PictogramKey = pictogram.Id; + Pictogram = pictogram; pictogram.LastEdit = DateTime.Now; Other.Resources.Add(this); diff --git a/GirafEntities/WeekPlanner/WeekDayColor.cs b/GirafEntities/WeekPlanner/WeekDayColor.cs index cdce392f..26337e3f 100644 --- a/GirafEntities/WeekPlanner/WeekDayColor.cs +++ b/GirafEntities/WeekPlanner/WeekDayColor.cs @@ -1,4 +1,4 @@ -using GirafRest.Models; +using GirafEntities.Settings; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/GirafRepositories/Persistence/DBInitializer.cs b/GirafRepositories/Persistence/DBInitializer.cs index a33b4b0b..c4fb7cd9 100644 --- a/GirafRepositories/Persistence/DBInitializer.cs +++ b/GirafRepositories/Persistence/DBInitializer.cs @@ -1,8 +1,6 @@ using System.ComponentModel; +using GirafEntities.Samples; using GirafEntities.User; -using GirafRest.Data; -using GirafRest.Data.Samples; -using GirafRest.Models; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using SkiaSharp; diff --git a/GirafRepositories/Persistence/GirafDbContext.cs b/GirafRepositories/Persistence/GirafDbContext.cs index d829e945..978a4c2d 100644 --- a/GirafRepositories/Persistence/GirafDbContext.cs +++ b/GirafRepositories/Persistence/GirafDbContext.cs @@ -1,7 +1,7 @@  +using GirafEntities.Settings; using GirafEntities.User; using GirafEntities.WeekPlanner; -using GirafRest.Models; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Timer = GirafEntities.WeekPlanner.Timer; diff --git a/GirafRepositories/Persistence/SampleDataHandler.cs b/GirafRepositories/Persistence/SampleDataHandler.cs index ecc45349..c1e07fd7 100644 --- a/GirafRepositories/Persistence/SampleDataHandler.cs +++ b/GirafRepositories/Persistence/SampleDataHandler.cs @@ -1,5 +1,4 @@ -using GirafRest.Data; -using GirafRest.Data.Samples; +using GirafEntities.Samples; using Newtonsoft.Json; namespace GirafRepositories.Persistence diff --git a/GirafRepositories/Settings/ISettingRepository.cs b/GirafRepositories/Settings/ISettingRepository.cs index 4c719917..a07b771f 100644 --- a/GirafRepositories/Settings/ISettingRepository.cs +++ b/GirafRepositories/Settings/ISettingRepository.cs @@ -1,6 +1,8 @@ +using GirafEntities.Settings; + namespace GirafRepositories.Interfaces { - public interface ISettingRepository : IRepository + public interface ISettingRepository : IRepository { } diff --git a/GirafRepositories/Settings/SettingRepository.cs b/GirafRepositories/Settings/SettingRepository.cs index fafac1da..2adb8276 100644 --- a/GirafRepositories/Settings/SettingRepository.cs +++ b/GirafRepositories/Settings/SettingRepository.cs @@ -1,6 +1,6 @@ +using GirafEntities.Settings; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest.Models; namespace GirafRepositories { diff --git a/GirafRepositories/User/DepartmentRepository.cs b/GirafRepositories/User/DepartmentRepository.cs index 9f211500..a21a83fd 100644 --- a/GirafRepositories/User/DepartmentRepository.cs +++ b/GirafRepositories/User/DepartmentRepository.cs @@ -1,8 +1,7 @@ using GirafEntities.User; +using GirafEntities.User.DTOs; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest; -using GirafRest.Models; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; diff --git a/GirafRepositories/User/DepartmentResourseRepository.cs b/GirafRepositories/User/DepartmentResourseRepository.cs index 6b7a5b30..87ed0506 100644 --- a/GirafRepositories/User/DepartmentResourseRepository.cs +++ b/GirafRepositories/User/DepartmentResourseRepository.cs @@ -4,7 +4,6 @@ using GirafEntities.User; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest.Models; using GirafRest.Data; using Microsoft.EntityFrameworkCore; diff --git a/GirafRepositories/User/GirafUserRepository.cs b/GirafRepositories/User/GirafUserRepository.cs index cdd04188..073135b4 100644 --- a/GirafRepositories/User/GirafUserRepository.cs +++ b/GirafRepositories/User/GirafUserRepository.cs @@ -1,8 +1,7 @@ using GirafEntities.User; +using GirafEntities.User.DTOs; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest.Models; -using GirafRest.Models.DTOs; using Microsoft.EntityFrameworkCore; namespace GirafRepositories.User diff --git a/GirafRepositories/User/GuardianRelationRepository.cs b/GirafRepositories/User/GuardianRelationRepository.cs index 742e8bdf..d2105ff1 100644 --- a/GirafRepositories/User/GuardianRelationRepository.cs +++ b/GirafRepositories/User/GuardianRelationRepository.cs @@ -2,8 +2,8 @@ using System.Linq; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest.Models; using GirafRest.Data; +using GirafEntities.User; namespace GirafRepositories.User { diff --git a/GirafRepositories/User/Interfaces/IDepartmentRepository.cs b/GirafRepositories/User/Interfaces/IDepartmentRepository.cs index b831ceca..bc96e923 100644 --- a/GirafRepositories/User/Interfaces/IDepartmentRepository.cs +++ b/GirafRepositories/User/Interfaces/IDepartmentRepository.cs @@ -1,6 +1,5 @@ using GirafEntities.User; -using GirafRest; -using GirafRest.Models; +using GirafEntities.User.DTOs; using Microsoft.AspNetCore.Identity; namespace GirafRepositories.Interfaces diff --git a/GirafRepositories/User/Interfaces/IDepartmentResourseRepository.cs b/GirafRepositories/User/Interfaces/IDepartmentResourseRepository.cs index 75770755..d95b33e3 100644 --- a/GirafRepositories/User/Interfaces/IDepartmentResourseRepository.cs +++ b/GirafRepositories/User/Interfaces/IDepartmentResourseRepository.cs @@ -1,5 +1,4 @@ using GirafEntities.User; -using GirafRest.Models; namespace GirafRepositories.Interfaces { diff --git a/GirafRepositories/User/Interfaces/IGirafUserRepository.cs b/GirafRepositories/User/Interfaces/IGirafUserRepository.cs index 4a99a0ab..484488c3 100644 --- a/GirafRepositories/User/Interfaces/IGirafUserRepository.cs +++ b/GirafRepositories/User/Interfaces/IGirafUserRepository.cs @@ -1,6 +1,5 @@ using GirafEntities.User; -using GirafRest.Models; -using GirafRest.Models.DTOs; +using GirafEntities.User.DTOs; namespace GirafRepositories.Interfaces { diff --git a/GirafRepositories/User/Interfaces/IGuardianRelationRepository.cs b/GirafRepositories/User/Interfaces/IGuardianRelationRepository.cs index d307be91..f313ebea 100644 --- a/GirafRepositories/User/Interfaces/IGuardianRelationRepository.cs +++ b/GirafRepositories/User/Interfaces/IGuardianRelationRepository.cs @@ -1,4 +1,4 @@ -using GirafRest.Models; +using GirafEntities.User; namespace GirafRepositories.Interfaces { diff --git a/GirafRepositories/User/Interfaces/IUserResourseRepository.cs b/GirafRepositories/User/Interfaces/IUserResourseRepository.cs index 438cb836..50463ba8 100644 --- a/GirafRepositories/User/Interfaces/IUserResourseRepository.cs +++ b/GirafRepositories/User/Interfaces/IUserResourseRepository.cs @@ -1,5 +1,4 @@ using GirafEntities.User; -using GirafRest.Models; namespace GirafRepositories.Interfaces { diff --git a/GirafRepositories/User/UserResourseRepository.cs b/GirafRepositories/User/UserResourseRepository.cs index 94509d8e..fb971e2a 100644 --- a/GirafRepositories/User/UserResourseRepository.cs +++ b/GirafRepositories/User/UserResourseRepository.cs @@ -4,7 +4,6 @@ using GirafEntities.User; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; -using GirafRest.Models; using GirafRest.Data; using Microsoft.EntityFrameworkCore; diff --git a/GirafRepositories/WeekPlanner/Interfaces/IPictogramRepository.cs b/GirafRepositories/WeekPlanner/Interfaces/IPictogramRepository.cs index 9fdba19a..cd6c1348 100644 --- a/GirafRepositories/WeekPlanner/Interfaces/IPictogramRepository.cs +++ b/GirafRepositories/WeekPlanner/Interfaces/IPictogramRepository.cs @@ -1,6 +1,6 @@ +using GirafEntities.DTOs; using GirafEntities.User; using GirafRest.Models; -using GirafRest.Models.DTOs; namespace GirafRepositories.Interfaces { diff --git a/GirafRepositories/WeekPlanner/PictogramRepository.cs b/GirafRepositories/WeekPlanner/PictogramRepository.cs index 97428869..af78fd2a 100644 --- a/GirafRepositories/WeekPlanner/PictogramRepository.cs +++ b/GirafRepositories/WeekPlanner/PictogramRepository.cs @@ -1,8 +1,8 @@ +using GirafEntities.DTOs; using GirafEntities.User; using GirafRepositories.Interfaces; using GirafRepositories.Persistence; using GirafRest.Models; -using GirafRest.Models.DTOs; using Microsoft.EntityFrameworkCore; namespace GirafRepositories.WeekPlanner