From dcd79d215cacca433cc617f6cb627e24a838eda1 Mon Sep 17 00:00:00 2001 From: anomny Date: Mon, 3 Nov 2025 19:06:08 +0100 Subject: [PATCH 1/3] Rename Index calls to get or getall --- src/Controllers/GroupsController.cs | 2 +- src/Controllers/LocationsController.cs | 8 ++++---- src/Controllers/UsersController.cs | 4 ++-- src/Models/GroupsRequestModels.cs | 2 +- src/Models/LocationsResponseModels.cs | 2 +- src/Models/UsersRequestModels.cs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Controllers/GroupsController.cs b/src/Controllers/GroupsController.cs index 523fa71..4267263 100644 --- a/src/Controllers/GroupsController.cs +++ b/src/Controllers/GroupsController.cs @@ -19,7 +19,7 @@ public class GroupsController : Controller } [HttpGet("Get")] - public async Task GetAsync(GroupsIndexRequestModel model) + public async Task GetAsync(GroupsGetRequestModel model) { if (model is null) { diff --git a/src/Controllers/LocationsController.cs b/src/Controllers/LocationsController.cs index f4d639d..bfd2654 100644 --- a/src/Controllers/LocationsController.cs +++ b/src/Controllers/LocationsController.cs @@ -19,18 +19,18 @@ public class LocationsController : Controller _logger = logger; } - [HttpGet("Index")] - public async Task Index() + [HttpGet("GetAll")] + public async Task GetAll() { try { IEnumerable list = await _ldap.ListLocationsAsync(); - return new LocationsIndexResponseModel { Locations = list }; + return new LocationsGetAllResponseModel { Locations = list }; } catch (Exception ex) { _logger.LogError("Unable to list locations: {Message} - {StackTrace}", ex.Message, ex.StackTrace); - return new LocationsIndexResponseModel { Locations = [] }; + return new LocationsGetAllResponseModel { Locations = [] }; } } diff --git a/src/Controllers/UsersController.cs b/src/Controllers/UsersController.cs index 1228569..56d4df0 100644 --- a/src/Controllers/UsersController.cs +++ b/src/Controllers/UsersController.cs @@ -22,8 +22,8 @@ public class UsersController : Controller _logger = logger; } - [HttpGet("Index")] - public async Task> Index(UsersIndexRequestModel requestModel) + [HttpGet("GetAll")] + public async Task> GetAll(UsersGetAllRequestModel requestModel) { string? uid = requestModel.Uid; List attributes = ["cn", "sn", "title", "uid", "jpegPhoto", "userPassword", "description"]; diff --git a/src/Models/GroupsRequestModels.cs b/src/Models/GroupsRequestModels.cs index 6ae237e..4ca75f0 100644 --- a/src/Models/GroupsRequestModels.cs +++ b/src/Models/GroupsRequestModels.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; namespace Berufsschule_HAM.Models; -public class GroupsIndexRequestModel +public class GroupsGetRequestModel { public string? Cn { get; set; } public bool GidNumber { get; set; } = true; diff --git a/src/Models/LocationsResponseModels.cs b/src/Models/LocationsResponseModels.cs index bc84892..e362fa2 100644 --- a/src/Models/LocationsResponseModels.cs +++ b/src/Models/LocationsResponseModels.cs @@ -7,7 +7,7 @@ public class LocationsDeleteResponseModel(bool successful, string exception = "N public string? Exception { get; set; } = exception; } -public class LocationsIndexResponseModel +public class LocationsGetAllResponseModel { public required IEnumerable Locations { get; set; } } diff --git a/src/Models/UsersRequestModels.cs b/src/Models/UsersRequestModels.cs index 14361d7..194c037 100644 --- a/src/Models/UsersRequestModels.cs +++ b/src/Models/UsersRequestModels.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; namespace Berufsschule_HAM.Models; -public class UsersIndexRequestModel +public class UsersGetAllRequestModel { public string? Uid { get; set; } = null; public bool Cn { get; set; } = true; From 9b94aaea56d8d912d5dda201b1057756c926836d Mon Sep 17 00:00:00 2001 From: anomny Date: Mon, 3 Nov 2025 19:07:36 +0100 Subject: [PATCH 2/3] [HttpDelete("Delete")] --- src/Controllers/LocationsController.cs | 2 +- src/Controllers/UsersController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controllers/LocationsController.cs b/src/Controllers/LocationsController.cs index bfd2654..da82bd4 100644 --- a/src/Controllers/LocationsController.cs +++ b/src/Controllers/LocationsController.cs @@ -59,7 +59,7 @@ public class LocationsController : Controller } } - [HttpGet("Delete")] + [HttpDelete("Delete")] public async Task DeleteAsync(string cn) { if (cn is null) diff --git a/src/Controllers/UsersController.cs b/src/Controllers/UsersController.cs index 56d4df0..4a2a22d 100644 --- a/src/Controllers/UsersController.cs +++ b/src/Controllers/UsersController.cs @@ -46,7 +46,7 @@ public class UsersController : Controller } } - [HttpGet("Delete")] + [HttpDelete("Delete")] public async Task Delete(string uid) { try From 22cb944417b8c17900deb91c87ef5ef350390dc0 Mon Sep 17 00:00:00 2001 From: anomny Date: Wed, 5 Nov 2025 19:26:30 +0100 Subject: [PATCH 3/3] Rename usages --- src/Views/Home/Locations.cshtml | 2 +- src/Views/Home/Users.cshtml | 2 +- src/wwwroot/js/site.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Views/Home/Locations.cshtml b/src/Views/Home/Locations.cshtml index 11b6d89..d95bf4a 100644 --- a/src/Views/Home/Locations.cshtml +++ b/src/Views/Home/Locations.cshtml @@ -120,7 +120,7 @@ try { const response = await fetch(url, { - method: 'GET', + method: 'DELETE', headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index c74f6c7..b1547a1 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -126,7 +126,7 @@ try { const response = await fetch(url, { - method: 'GET', + method: 'DELETE', headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' diff --git a/src/wwwroot/js/site.js b/src/wwwroot/js/site.js index 07e0710..bfdde28 100644 --- a/src/wwwroot/js/site.js +++ b/src/wwwroot/js/site.js @@ -167,7 +167,7 @@ document.addEventListener('DOMContentLoaded', () => { async function loadLocationsIntoSelect(selectElement, selectedValue = null) { try { - const response = await fetch('/Locations/Index'); + const response = await fetch('/Locations/GetAll'); const data = await response.json(); const locations = data.locations; @@ -208,7 +208,7 @@ async function loadLocationsIntoSelect(selectElement, selectedValue = null) { async function loadUsersIntoSelect(selectElement, selectedValue = null) { try { - const response = await fetch('/Users/Index?Cn=false&Sn=false&Title=false&Description=false&JpegPhoto=false&UserPassword=false'); + const response = await fetch('/Users/GetAll?Cn=false&Sn=false&Title=false&Description=false&JpegPhoto=false&UserPassword=false'); const users = await response.json(); const ts = selectElement.tomselect;