Skip to content

Commit 58a31d9

Browse files
committed
feat: improve SessionSettingsEditViewModel
refactor: cleanup
1 parent e7a00b7 commit 58a31d9

File tree

2 files changed

+6
-23
lines changed

2 files changed

+6
-23
lines changed

src/ByteSync.Client/ViewModels/Sessions/Managing/SessionSettingsEditViewModel.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using ByteSync.Interfaces.Services.Sessions;
99
using ReactiveUI;
1010
using ReactiveUI.Fody.Helpers;
11-
using Serilog;
1211

1312
namespace ByteSync.ViewModels.Sessions.Managing;
1413

@@ -20,6 +19,7 @@ public class SessionSettingsEditViewModel : ActivatableViewModelBase
2019
private readonly IAnalysisModeViewModelFactory _analysisModeViewModelFactory;
2120
private readonly IDataTypeViewModelFactory _dataTypeViewModelFactory;
2221
private readonly ILinkingKeyViewModelFactory _linkingKeyViewModelFactory;
22+
private readonly ILogger<SessionSettingsEditViewModel> _logger;
2323

2424
#if DEBUG
2525
public SessionSettingsEditViewModel()
@@ -30,14 +30,15 @@ public SessionSettingsEditViewModel()
3030

3131
public SessionSettingsEditViewModel(ISessionService sessionService, ILocalizationService localizationService, IDataInventoryStarter dataInventoryStarter,
3232
IAnalysisModeViewModelFactory analysisModeViewModelFactory, IDataTypeViewModelFactory dataTypeViewModelFactory,
33-
ILinkingKeyViewModelFactory linkingKeyViewModelFactory, SessionSettings? sessionSettings)
33+
ILinkingKeyViewModelFactory linkingKeyViewModelFactory, SessionSettings? sessionSettings, ILogger<SessionSettingsEditViewModel> logger)
3434
{
3535
_sessionService = sessionService;
3636
_localizationService = localizationService;
3737
_dataInventoryStarter = dataInventoryStarter;
3838
_analysisModeViewModelFactory = analysisModeViewModelFactory ?? throw new ArgumentNullException(nameof(analysisModeViewModelFactory));
3939
_dataTypeViewModelFactory = dataTypeViewModelFactory;
4040
_linkingKeyViewModelFactory = linkingKeyViewModelFactory;
41+
_logger = logger;
4142

4243
AvailableAnalysisModes =
4344
[
@@ -90,6 +91,7 @@ public SessionSettingsEditViewModel(ISessionService sessionService, ILocalizatio
9091
x => x.DataType,
9192
x => x.AnalysisMode, x => x.Extensions)
9293
.Skip(1)
94+
// .Throttle(TimeSpan.FromMilliseconds(250), RxApp.MainThreadScheduler)
9395
.Subscribe(_ => SendUpdate());
9496
});
9597
}
@@ -173,11 +175,11 @@ private async void SendUpdate()
173175
try
174176
{
175177
var sessionSettings = ExportSettings();
176-
await _sessionService.SetSessionSettings(sessionSettings);
178+
await _sessionService.SetSessionSettings(sessionSettings, true);
177179
}
178180
catch (Exception ex)
179181
{
180-
Log.Error(ex, "SendUpdate");
182+
_logger.LogError(ex, "SendUpdate");
181183
}
182184
}
183185
}

tests/ByteSync.ServerCommon.Tests/Commands/CloudSessions/QuitSessionCommandHandlerTests.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -222,23 +222,4 @@ public async Task QuitSession_SessionMemberNotExists_()
222222
A.CallTo(() => _mockSessionMemberMapper.Convert(A<SessionMemberData>.Ignored))
223223
.MustNotHaveHappened();
224224
}
225-
226-
// private UpdateEntityResult<T> BuildUpdateResult<T>(bool funcResult, T element, bool isTransaction)
227-
// {
228-
// if (funcResult)
229-
// {
230-
// if (isTransaction)
231-
// {
232-
// return new UpdateEntityResult<T>(element, UpdateEntityStatus.WaitingForTransaction);
233-
// }
234-
// else
235-
// {
236-
// return new UpdateEntityResult<T>(element, UpdateEntityStatus.Saved);
237-
// }
238-
// }
239-
// else
240-
// {
241-
// return new UpdateEntityResult<T>(element, UpdateEntityStatus.NotFound);
242-
// }
243-
// }
244225
}

0 commit comments

Comments
 (0)