daniel/Jugenddienst-Stunden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Architecture

Browse Source 
Add DI, Interfaces, Repositories
This commit is contained in:
Daniel Pichler
2025-12-16 15:27:09 +01:00
parent 83118103d9
commit 544b0c9591
7 changed files with 152 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Jugenddienst Stunden/Interfaces/IHoursRepository.cs Normal file
View File

@@ -0,0 +1,17 @@
using Jugenddienst_Stunden.Types;
namespace Jugenddienst_Stunden.Interfaces;
/// <summary>
/// Repository‑Schnittstelle für Datenzugriff (API/Storage) rund um Stunden.
/// </summary>
internal interface IHoursRepository {
Task<BaseResponse> LoadBase(string query);
Task<Settings> LoadSettings();
Task<Hours> LoadData();
Task<User> LoadUser(string apiKey);
Task<List<DayTime>> LoadDay(DateTime date);
Task<DayTime> LoadEntry(int id);
Task<DayTime> SaveEntry(DayTime stunde);
Task DeleteEntry(DayTime stunde);
}

16
Jugenddienst Stunden/Interfaces/IHoursService.cs Normal file
View File

@@ -0,0 +1,16 @@
using Jugenddienst_Stunden.Types;
namespace Jugenddienst_Stunden.Interfaces;
/// <summary>
/// Fachlicher Service für Stunden – konsumiert Repository und stellt VM‑freundliche Methoden bereit.
/// </summary>
internal interface IHoursService {
Task<(Hours hours, Settings settings)> GetMonthSummaryAsync(DateTime monthDate);
Task<(List<DayTime> dayTimes, Settings settings)> GetDayWithSettingsAsync(DateTime date);
Task<List<DayTime>> GetDayRangeAsync(DateTime from, DateTime to);
Task<Settings> GetSettingsAsync();
Task<DayTime> GetEntryAsync(int id);
Task<DayTime> SaveEntryAsync(DayTime stunde);
Task DeleteEntryAsync(DayTime stunde);
}

7
Jugenddienst Stunden/MauiProgram.cs
View File

@@ -1,5 +1,8 @@
using CommunityToolkit.Maui;
using Jugenddienst_Stunden.Models;
using Jugenddienst_Stunden.Interfaces;
using Jugenddienst_Stunden.Repositories;
using Jugenddienst_Stunden.Services;
using Microsoft.Extensions.Logging;
using ZXing.Net.Maui.Controls;
@@ -36,6 +39,10 @@ public static class MauiProgram {
builder.Logging.AddDebug();
#endif
// DI: Services & Repositories
builder.Services.AddSingleton<IHoursRepository, HoursRepository>();
builder.Services.AddSingleton<IHoursService, HoursService>();
return builder.Build();
}

19
Jugenddienst Stunden/Repositories/HoursRepository.cs Normal file
View File

@@ -0,0 +1,19 @@
using Jugenddienst_Stunden.Interfaces;
using Jugenddienst_Stunden.Models;
using Jugenddienst_Stunden.Types;
namespace Jugenddienst_Stunden.Repositories;
/// <summary>
/// Standard-Repository, das die bestehende API-/Model-Logik kapselt.
/// </summary>
internal class HoursRepository : IHoursRepository {
public async Task<BaseResponse> LoadBase(string query) => await HoursBase.LoadBase(query);
public async Task<Settings> LoadSettings() => await HoursBase.LoadSettings();
public async Task<Hours> LoadData() => await HoursBase.LoadData();
public async Task<User> LoadUser(string apiKey) => await HoursBase.LoadUser(apiKey);
public async Task<List<DayTime>> LoadDay(DateTime date) => await HoursBase.LoadDay(date);
public async Task<DayTime> LoadEntry(int id) => await HoursBase.LoadEntry(id);
public async Task<DayTime> SaveEntry(DayTime stunde) => await HoursBase.SaveEntry(stunde);
public async Task DeleteEntry(DayTime stunde) => await HoursBase.DeleteEntry(stunde);
}

38
Jugenddienst Stunden/Services/HoursService.cs Normal file
View File

@@ -0,0 +1,38 @@
using Jugenddienst_Stunden.Interfaces;
using Jugenddienst_Stunden.Types;
namespace Jugenddienst_Stunden.Services;
internal class HoursService : IHoursService {
private readonly IHoursRepository _repo;
public HoursService(IHoursRepository repo) {
_repo = repo;
}
public async Task<(Hours hours, Settings settings)> GetMonthSummaryAsync(DateTime monthDate) {
string q = $"hours&year={monthDate:yyyy}&month={monthDate:MM}";
var baseRes = await _repo.LoadBase(q);
return (baseRes.hour, baseRes.settings);
}
public async Task<(List<DayTime> dayTimes, Settings settings)> GetDayWithSettingsAsync(DateTime date) {
string q = $"date={date:yyyy-MM-dd}";
var baseRes = await _repo.LoadBase(q);
return (baseRes.daytimes ?? new List<DayTime>(), baseRes.settings);
}
public async Task<List<DayTime>> GetDayRangeAsync(DateTime from, DateTime to) {
string q = $"date={from:yyyy-MM-dd}&tilldate={to:yyyy-MM-dd}";
var baseRes = await _repo.LoadBase(q);
return baseRes.daytimes ?? new List<DayTime>();
}
public async Task<Settings> GetSettingsAsync() => await _repo.LoadSettings();
public async Task<DayTime> GetEntryAsync(int id) => await _repo.LoadEntry(id);
public async Task<DayTime> SaveEntryAsync(DayTime stunde) => await _repo.SaveEntry(stunde);
public async Task DeleteEntryAsync(DayTime stunde) => await _repo.DeleteEntry(stunde);
}

67
Jugenddienst Stunden/ViewModels/StundeViewModel.cs
View File

@@ -5,12 +5,16 @@ using Jugenddienst_Stunden.Types;
using System.ComponentModel;
using System.Windows.Input;
using static System.Runtime.InteropServices.JavaScript.JSType;
using Jugenddienst_Stunden.Interfaces;
using Jugenddienst_Stunden.Repositories;
using Jugenddienst_Stunden.Services;
namespace Jugenddienst_Stunden.ViewModels;
/// <summary>
/// Viewmodel für die einzelnen Stundeneinträge / Bearbeitung
/// </summary>
public partial class StundeViewModel : ObservableObject, IQueryAttributable {
private readonly IHoursService _hoursService;
public int Id { get; set; }
public string Title { get; set; } = "Eintrag bearbeiten";
@@ -76,20 +80,20 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
//public ICommand LoadDataCommand { get; private set; }
public StundeViewModel() {
public StundeViewModel() : this(GetServiceOrCreate()) { }
private static IHoursService GetServiceOrCreate() => new HoursService(new HoursRepository());
internal StundeViewModel(IHoursService hoursService) {
_hoursService = hoursService;
SaveCommand = new AsyncRelayCommand(Save);
//DeleteCommand = new AsyncRelayCommand(Delete);
DeleteConfirmCommand = new Command(async () => await DeleteConfirm());
}
public StundeViewModel(DayTime stunde) {
SaveCommand = new AsyncRelayCommand(Save);
DeleteConfirmCommand = new AsyncRelayCommand(DeleteConfirm);
}
private async void LoadSettingsAsync() {
try {
Settings = await HoursBase.LoadSettings();
Settings = await _hoursService.GetSettingsAsync();
GlobalVar.Settings = Settings;
OptionsGemeinde = Settings.Gemeinden;
@@ -114,7 +118,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
if (proceed) {
try {
await HoursBase.SaveEntry(DayTime);
await _hoursService.SaveEntryAsync(DayTime);
} catch (Exception e) {
AlertEvent?.Invoke(this, e.Message);
exceptionOccurred = true;
@@ -133,7 +137,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
/// Löschen ohne Bestätigung
/// </summary>
private async Task Delete() {
await HoursBase.DeleteEntry(DayTime);
await _hoursService.DeleteEntryAsync(DayTime);
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
}
@@ -145,7 +149,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
bool answer = await ConfirmEvent.Invoke("Achtung", "Löschen kann nicht ungeschehen gemacht werden. Fortfahren?");
if (answer) {
//Löschen
await HoursBase.DeleteEntry(DayTime);
await _hoursService.DeleteEntryAsync(DayTime);
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
} else {
//nicht Löschen
@@ -163,27 +167,27 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
//DateTime heute = DateTime.Now;
try {
//_dayTime = await HoursBase.LoadEntry(Convert.ToInt32(query["load"]));
BaseResponse dat = await HoursBase.LoadBase("id=" + Convert.ToInt32(query["load"]));
GlobalVar.Settings = dat.settings;
GemeindeAktivSet = dat.settings.GemeindeAktivSet;
ProjektAktivSet = dat.settings.ProjektAktivSet;
var entry = await _hoursService.GetEntryAsync(Convert.ToInt32(query["load"]));
var settings = await _hoursService.GetSettingsAsync();
GlobalVar.Settings = settings;
GemeindeAktivSet = settings.GemeindeAktivSet;
ProjektAktivSet = settings.ProjektAktivSet;
DayTime = dat.daytime;
DayTime.TimeSpanVon = dat.daytime.Begin.ToTimeSpan();
DayTime.TimeSpanBis = dat.daytime.End.ToTimeSpan();
DayTime = entry;
DayTime.TimeSpanVon = entry.Begin.ToTimeSpan();
DayTime.TimeSpanBis = entry.End.ToTimeSpan();
OptionsGemeinde = dat.settings.Gemeinden ?? new List<Gemeinde>();
OptionsProjekt = dat.settings.Projekte ?? new List<Projekt>();
OptionsFreistellung = dat.settings.Freistellungen ?? new List<Freistellung>();
OptionsGemeinde = settings.Gemeinden ?? new List<Gemeinde>();
OptionsProjekt = settings.Projekte ?? new List<Projekt>();
OptionsFreistellung = settings.Freistellungen ?? new List<Freistellung>();
DayTime.GemeindeAktiv = OptionsGemeinde.FirstOrDefault(Gemeinde => Gemeinde.Id == DayTime.Gemeinde) ?? new Gemeinde();
DayTime.ProjektAktiv = OptionsProjekt.FirstOrDefault(Projekt => Projekt.Id == DayTime.Projekt) ?? new Projekt();
DayTime.FreistellungAktiv = OptionsFreistellung.FirstOrDefault(Freistellung => Freistellung.Id == DayTime.Free) ?? new Freistellung();
//Evtl. noch die anderen Zeiten des gleichen Tages holen
BaseResponse dat1 = await HoursBase.LoadBase("date=" + DayTime.Day.ToString("yyyy-MM-dd"));
DayTimes = dat1.daytimes;
var day = await _hoursService.GetDayWithSettingsAsync(DayTime.Day);
DayTimes = day.dayTimes;
OnPropertyChanged(nameof(DayTime));
OnPropertyChanged(nameof(DayTimes));
@@ -209,17 +213,16 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
DateTime _date = DateTime.ParseExact((string)query["date"], "yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
//Bei neuem Eintrag die vorhandenen des gleichen Tages anzeigen
try {
//DayTimes = await HoursBase.LoadDay(_date);
BaseResponse dat = await HoursBase.LoadBase("date=" + _date.ToString("yyyy-MM-dd"));
GlobalVar.Settings = dat.settings;
DayTimes = dat.daytimes;
var (list, settings) = await _hoursService.GetDayWithSettingsAsync(_date);
GlobalVar.Settings = settings;
DayTimes = list;
OptionsGemeinde = dat.settings.Gemeinden;
OptionsProjekt = dat.settings.Projekte;
OptionsFreistellung = dat.settings.Freistellungen;
OptionsGemeinde = settings.Gemeinden;
OptionsProjekt = settings.Projekte;
OptionsFreistellung = settings.Freistellungen;
GemeindeAktivSet = dat.settings.GemeindeAktivSet;
ProjektAktivSet = dat.settings.ProjektAktivSet;
GemeindeAktivSet = settings.GemeindeAktivSet;
ProjektAktivSet = settings.ProjektAktivSet;
} catch (Exception) {
//Ein Tag ohne Einträge gibt eine Fehlermeldung,

31
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -8,6 +8,9 @@ using System.Windows.Input;
using CommunityToolkit.Maui.Alerts;
using CommunityToolkit.Maui.Core;
using static System.Runtime.InteropServices.JavaScript.JSType;
using Jugenddienst_Stunden.Interfaces;
using Jugenddienst_Stunden.Repositories;
using Jugenddienst_Stunden.Services;
namespace Jugenddienst_Stunden.ViewModels;
@@ -15,6 +18,7 @@ namespace Jugenddienst_Stunden.ViewModels;
/// ViewModel für die Stundenliste
/// </summary>
internal partial class StundenViewModel : ObservableObject, IQueryAttributable, INotifyPropertyChanged {
private readonly IHoursService _hoursService;
public ICommand NewEntryCommand { get; }
public ICommand SelectEntryCommand { get; }
@@ -156,7 +160,13 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// <summary>
/// CTOR
/// </summary>
public StundenViewModel() {
public StundenViewModel() : this(GetServiceOrCreate()) {
}
private static IHoursService GetServiceOrCreate() => new HoursService(new HoursRepository());
internal StundenViewModel(IHoursService hoursService) {
_hoursService = hoursService;
Hours = new Hours();
LoadOverview = "Lade Summen für " + DateToday.ToString("MMMM");
@@ -200,9 +210,9 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// </summary>
private async Task LoadData() {
try {
BaseResponse dat = await HoursBase.LoadBase("hours&year=" + DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
Hours = dat.hour;
Settings = dat.settings;
var (hours, settings) = await _hoursService.GetMonthSummaryAsync(DateToday);
Hours = hours;
Settings = settings;
if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
InfoEvent?.Invoke(this, "Version: " + Settings.Version + " verfügbar (" + AppInfo.Current.VersionString.Substring(0, 5) + " installiert)");
@@ -222,11 +232,10 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
DayTotal = new TimeOnly(0);
Sollstunden = new TimeOnly(0);
try {
//_dayTimes = await HoursBase.LoadDay(date);
BaseResponse dat = await HoursBase.LoadBase("date=" + date.ToString("yyyy-MM-dd"));
var (dayTimes, settings) = await _hoursService.GetDayWithSettingsAsync(date);
DayTimes = dat.daytimes;
Settings = dat.settings;
DayTimes = dayTimes;
Settings = settings;
GemeindeAktivSet = Settings.GemeindeAktivSet;
ProjektAktivSet = Settings.ProjektAktivSet;
@@ -251,9 +260,9 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
//Nach der Tagessumme die anderen Tage anhängen
if (DayTimes != null) {
BaseResponse dat1 = await HoursBase.LoadBase("date=" + date.ToString("yyyy-MM-dd") + "&tilldate=" + date.AddDays(3).ToString("yyyy-MM-dd"));
if (dat1.daytimes != null)
DayTimes = dat.daytimes.Concat(dat1.daytimes).ToList();
var more = await _hoursService.GetDayRangeAsync(date, date.AddDays(3));
if (more != null && more.Count > 0)
DayTimes = DayTimes.Concat(more).ToList();
}
} catch (Exception e) {