Fix session member lettering (#38)

paul-fresquet · web-flow · commit 78d70c5104d4 · 2025-02-08T12:17:46.000+01:00
diff --git a/src/ByteSync.Client/App.axaml b/src/ByteSync.Client/App.axaml
@@ -11,6 +11,7 @@
         <converters:ExecutionModeConverter x:Key="ExecutionModeConverter" />
         <converters:LocalInventoryPartStatusToIconConverter x:Key="InventoryProcessStatusToIconConverter" />
         <converters:LocalInventoryPartStatusToTextConverter x:Key="InventoryProcessStatusToTextConverter" />
+        <converters:IntToLetterConverter x:Key="IntToLetterConverter" />
     </Application.Resources>
     <Application.DataTemplates>
         <byteSync:ViewLocator/>
diff --git a/src/ByteSync.Client/Business/PathItems/PathItemProxy.cs b/src/ByteSync.Client/Business/PathItems/PathItemProxy.cs
@@ -25,25 +25,17 @@ public PathItemProxy(PathItem pathItem, ILocalizationService localizationService
         _logger = logger;
 
         PathItem = pathItem;
-        // Code = PathItem.Code;
         Path = PathItem.Path;
         FileSystemType = PathItem.Type;
 
         UpdateElementType(localizationService);
 
         OpenPathCommand = ReactiveCommand.Create(OpenPath);
-
-        // this.WhenAnyValue(x => x.Code)
-        //     .Skip(1)
-        //     .Subscribe(code => PathItem.Code = code);
     }
     
     public PathItem PathItem { get; } = null!;
     
     public string ElementType { get; set; } = null!;
-
-    // [Reactive]
-    // public string Code { get; set; }
     
     public string Path { get; set; }
     
@@ -88,15 +80,4 @@ private void OpenPath()
         }
 
     }
-
-    // public static void RecodePathItems(ObservableCollection<PathItemViewModel> pathItemViewModels, string letter)
-    // {
-    //     int cpt = 1;
-    //     foreach (var pathItem in pathItemViewModels)
-    //     {
-    //         pathItem.Code = letter + cpt;
-    //
-    //         cpt += 1;
-    //     }
-    // }
 }
diff --git a/src/ByteSync.Client/Business/SessionMembers/SessionMemberInfo.cs b/src/ByteSync.Client/Business/SessionMembers/SessionMemberInfo.cs
@@ -11,19 +11,10 @@ public class SessionMemberInfo
     public SessionMemberPrivateData PrivateData { get; set; }
     
     public string SessionId { get; set; }
-        
 
     public DateTimeOffset JoinedSessionOn { get; set; }
     
     public int PositionInList { get; set; }
-
-    public string Letter
-    {
-        get
-        {
-            return ((char) ('A' + PositionInList)).ToString();
-        }
-    }
     
     public DateTimeOffset? LastLocalInventoryGlobalStatusUpdate { get; set; }
 
@@ -33,8 +24,6 @@ public string Letter
     
     public string? ProfileClientId { get; set; }
     
-    public string ClientId => Endpoint.ClientId;
-    
     public string ClientInstanceId => Endpoint.ClientInstanceId;
     
     public string IpAddress => Endpoint.IpAddress;
diff --git a/src/ByteSync.Client/Interfaces/ITranslationSource.cs b/src/ByteSync.Client/Interfaces/ITranslationSource.cs
diff --git a/src/ByteSync.Client/Services/Communications/PushReceivers/SessionMemberPushReceiver.cs b/src/ByteSync.Client/Services/Communications/PushReceivers/SessionMemberPushReceiver.cs
@@ -3,6 +3,7 @@
 using ByteSync.Interfaces.Repositories;
 using System.Reactive.Linq;
 using ByteSync.Business.Inventories;
+using ByteSync.Business.SessionMembers;
 using ByteSync.Common.Business.Sessions;
 using ByteSync.Common.Helpers;
 using ByteSync.Interfaces.Controls.Encryptions;
@@ -43,14 +44,18 @@ public SessionMemberPushReceiver(IHubPushHandler2 hubPushHandler2, ISessionMembe
             .Where(csr => _sessionService.CheckSession(csr.SessionId))
             .Subscribe(smi =>
             {
+                var elementsToUpdate = new List<SessionMemberInfo>();
+                
                 foreach (var anySessionMemberInfo in _sessionMemberRepository.Elements)
                 {
                     if (anySessionMemberInfo.JoinedSessionOn > smi.JoinedSessionOn)
                     {
                         anySessionMemberInfo.PositionInList -= 1;
+                        elementsToUpdate.Add(anySessionMemberInfo);
                     }
                 }
                 
+                _sessionMemberRepository.AddOrUpdate(elementsToUpdate);
                 _sessionMemberRepository.Remove(smi);
             });
 
diff --git a/src/ByteSync.Client/Services/Converters/IntToLetterConverter.cs b/src/ByteSync.Client/Services/Converters/IntToLetterConverter.cs
@@ -0,0 +1,28 @@
+﻿using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace ByteSync.Services.Converters;
+
+public class IntToLetterConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        int iValue = System.Convert.ToInt32(value);
+        
+        return ((char) ('A' + iValue)).ToString();
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is string strValue && strValue.Length == 1)
+        {
+            char letter = strValue[0];
+            if (char.IsLetter(letter))
+            {
+                return char.ToUpper(letter) - 'A';
+            }
+        }
+
+        throw new ArgumentOutOfRangeException();
+    }
+}
diff --git a/src/ByteSync.Client/Services/Inventories/DataInventoryRunner.cs b/src/ByteSync.Client/Services/Inventories/DataInventoryRunner.cs
@@ -20,6 +20,7 @@
 using ByteSync.Models.Inventories;
 using ByteSync.Services.Comparisons;
 using ByteSync.Services.Misc;
+using ByteSync.Services.Sessions;
 
 namespace ByteSync.Services.Inventories;
 
@@ -398,7 +399,7 @@ private InventoryBuilder BuildInventoryBuilder(SessionMemberInfo sessionMemberIn
     {
         var cloudSessionSettings = _sessionService.CurrentSessionSettings!;
         
-        var inventoryBuilder = new InventoryBuilder(sessionMemberInfo.Letter, cloudSessionSettings, InventoryProcessData, 
+        var inventoryBuilder = new InventoryBuilder(sessionMemberInfo.GetLetter(), cloudSessionSettings, InventoryProcessData, 
             endpoint, sessionMemberInfo.MachineName, FingerprintModes.Rsync);
         foreach (var pathItem in pathItems)
         {
diff --git a/src/ByteSync.Client/Services/Inventories/PathItemsService.cs b/src/ByteSync.Client/Services/Inventories/PathItemsService.cs
@@ -11,6 +11,7 @@
 using ByteSync.Interfaces.Repositories;
 using ByteSync.Interfaces.Services.Communications;
 using ByteSync.Interfaces.Services.Sessions;
+using ByteSync.Services.Sessions;
 using DynamicData;
 
 namespace ByteSync.Services.Inventories;
@@ -94,7 +95,7 @@ public Task CreateAndAddPathItem(string path, FileSystemTypes fileSystemType)
         pathItem.ClientInstanceId = _connectionService.ClientInstanceId!;
 
         var sessionMemberInfo = _sessionMemberRepository.GetCurrentSessionMember();
-        pathItem.Code = sessionMemberInfo.Letter +
+        pathItem.Code = sessionMemberInfo.GetLetter() +
                         (_pathItemRepository.Elements.Count(pi => pi.BelongsTo(sessionMemberInfo)) + 1);
 
         return AddPathItem(pathItem);
@@ -131,7 +132,7 @@ private void UpdateCodesForMember(SessionMemberInfo sessionMemberInfo)
         var i = 1;
         foreach (var remainingPathItem in pathItems)
         {
-            remainingPathItem.Code = sessionMemberInfo.Letter + i;
+            remainingPathItem.Code = sessionMemberInfo.GetLetter() + i;
             i += 1;
         }
     }
diff --git a/src/ByteSync.Client/Services/Profiles/SessionProfileManager.cs b/src/ByteSync.Client/Services/Profiles/SessionProfileManager.cs
@@ -20,6 +20,7 @@
 using ByteSync.Interfaces.Repositories;
 using ByteSync.Interfaces.Services.Communications;
 using ByteSync.Services.Misc;
+using ByteSync.Services.Sessions;
 using Serilog;
 
 namespace ByteSync.Services.Profiles;
@@ -362,7 +363,7 @@ private CloudSessionProfileDetails BuildCloudSessionProfileDetails(CloudSessionP
             var cloudSessionProfileMember = new CloudSessionProfileMember();
 
             cloudSessionProfileMember.MachineName = sessionMemberInfo.MachineName;
-            cloudSessionProfileMember.Letter = sessionMemberInfo.Letter;
+            cloudSessionProfileMember.Letter = sessionMemberInfo.GetLetter();
             cloudSessionProfileMember.IpAddress = sessionMemberInfo.IpAddress;
             cloudSessionProfileMember.ProfileClientId =
                 data.Slots
diff --git a/src/ByteSync.Client/Services/Sessions/SessionMemberLetterHelper.cs b/src/ByteSync.Client/Services/Sessions/SessionMemberLetterHelper.cs
@@ -0,0 +1,11 @@
+﻿using ByteSync.Business.SessionMembers;
+
+namespace ByteSync.Services.Sessions;
+
+public static class SessionMemberLetterHelper
+{
+    public static string GetLetter(this SessionMemberInfo sessionMemberInfo)
+    {
+        return ((char) ('A' + sessionMemberInfo.PositionInList)).ToString();
+    }
+}
diff --git a/src/ByteSync.Client/ViewModels/Sessions/Members/SessionMachineViewModel.cs b/src/ByteSync.Client/ViewModels/Sessions/Members/SessionMachineViewModel.cs
@@ -19,6 +19,7 @@
 using ByteSync.Interfaces.Factories.Proxies;
 using ByteSync.Interfaces.Repositories;
 using ByteSync.Interfaces.Services.Sessions;
+using ByteSync.Services.Sessions;
 using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
@@ -117,6 +118,7 @@ public SessionMachineViewModel(SessionMemberInfo sessionMemberInfo, ISessionServ
                 .Subscribe(item =>
                 {
                     UpdateStatus(item.Current.SessionMemberGeneralStatus);
+                    PositionInList = item.Current.PositionInList;
                 })
                 .DisposeWith(disposables);
 
@@ -127,9 +129,6 @@ public SessionMachineViewModel(SessionMemberInfo sessionMemberInfo, ISessionServ
         });
 
         UpdateMachineDescription();
-        UpdateStatus(SessionMemberGeneralStatus.InventoryWaitingForStart);
-
-        UpdateLetter();
 
     #if DEBUG
         if (IsLocalMachine && _sessionService.CurrentRunSessionProfileInfo == null)
@@ -250,9 +249,9 @@ private void OnLocaleChanged(PropertyChangedEventArgs objEventArgs)
 
     [Reactive]
     public string Status { get; set; }
-
+    
     [Reactive]
-    public string MachineLetter { get; set; }
+    public int PositionInList { get; set; }
 
     public ReadOnlyObservableCollection<PathItemProxy> PathItems => _data;
     
@@ -382,9 +381,4 @@ private void UpdateStatus(SessionMemberGeneralStatus localInventoryStatus)
                 break;
         }
     }
-
-    private void UpdateLetter()
-    {
-        MachineLetter = SessionMemberInfo.Letter;
-    }
 }
diff --git a/src/ByteSync.Client/Views/Sessions/Members/SessionMachineView.axaml b/src/ByteSync.Client/Views/Sessions/Members/SessionMachineView.axaml
@@ -42,7 +42,7 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Label Grid.Column="0" Content="{Binding MachineLetter}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontWeight="Bold" FontSize="24"
+            <Label Grid.Column="0" Content="{Binding PositionInList, Converter={StaticResource IntToLetterConverter}}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontWeight="Bold" FontSize="24"
                        Margin="6 6" BorderThickness="1" Width="36">
                 
                 <Interaction.Behaviors>
diff --git a/tests/ByteSync.Client.Tests/Controls/Converters/BooleanConverterTests.cs b/tests/ByteSync.Client.Tests/Controls/Converters/BooleanConverterTests.cs
@@ -0,0 +1,106 @@
+﻿using System.Globalization;
+using ByteSync.Services.Converters;
+using FluentAssertions;
+using NUnit.Framework;
+
+namespace ByteSync.Tests.Controls.Converters;
+
+[TestFixture]
+public class BooleanConverterTests
+{
+    private BooleanConverter<string> _converter;
+
+    [SetUp]
+    public void Setup()
+    {
+        _converter = new BooleanConverter<string>("Yes", "No");
+    }
+
+    [Test]
+    public void Convert_InputTrue_ReturnsFalseValue()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.Convert(true, typeof(string), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be("No");
+    }
+
+    [Test]
+    public void Convert_InputFalse_ReturnsBooleanFalse()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.Convert(false, typeof(string), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be(false);
+    }
+
+    [Test]
+    public void Convert_InputNonBoolean_ReturnsFalseValue()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.Convert("anything", typeof(string), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be("No");
+    }
+
+    [Test]
+    public void Convert_InputNull_ReturnsFalseValue()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.Convert(null, typeof(string), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be("No");
+    }
+
+    [Test]
+    public void ConvertBack_InputEqualsTrueValue_ReturnsTrue()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.ConvertBack("Yes", typeof(bool), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be(true);
+    }
+
+    [Test]
+    public void ConvertBack_InputNotEqualTrueValue_ReturnsFalse()
+    {
+        // Arrange
+
+        // Act
+        var result1 = _converter.ConvertBack("No", typeof(bool), null, CultureInfo.InvariantCulture);
+        var result2 = _converter.ConvertBack("Other", typeof(bool), null, CultureInfo.InvariantCulture);
+        var result3 = _converter.ConvertBack(123, typeof(bool), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result1.Should().Be(false);
+        result2.Should().Be(false);
+        result3.Should().Be(false);
+    }
+
+    [Test]
+    public void ConvertBack_InputNull_ReturnsFalse()
+    {
+        // Arrange
+
+        // Act
+        var result = _converter.ConvertBack(null, typeof(bool), null, CultureInfo.InvariantCulture);
+
+        // Assert
+        result.Should().Be(false);
+    }
+}
diff --git a/tests/ByteSync.Client.Tests/Controls/Converters/IntToLetterConverterTests.cs b/tests/ByteSync.Client.Tests/Controls/Converters/IntToLetterConverterTests.cs

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using ByteSync.Interfaces.Repositories;`
`4`	`4`	`using System.Reactive.Linq;`
`5`	`5`	`using ByteSync.Business.Inventories;`
	`6`	`+using ByteSync.Business.SessionMembers;`
`6`	`7`	`using ByteSync.Common.Business.Sessions;`
`7`	`8`	`using ByteSync.Common.Helpers;`
`8`	`9`	`using ByteSync.Interfaces.Controls.Encryptions;`
`@@ -43,14 +44,18 @@ public SessionMemberPushReceiver(IHubPushHandler2 hubPushHandler2, ISessionMembe`
`43`	`44`	`.Where(csr => _sessionService.CheckSession(csr.SessionId))`
`44`	`45`	`.Subscribe(smi =>`
`45`	`46`	`{`
	`47`	`+ var elementsToUpdate = new List<SessionMemberInfo>();`
	`48`	`+`
`46`	`49`	`foreach (var anySessionMemberInfo in _sessionMemberRepository.Elements)`
`47`	`50`	`{`
`48`	`51`	`if (anySessionMemberInfo.JoinedSessionOn > smi.JoinedSessionOn)`
`49`	`52`	`{`
`50`	`53`	`anySessionMemberInfo.PositionInList -= 1;`
	`54`	`+ elementsToUpdate.Add(anySessionMemberInfo);`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`
	`58`	`+ _sessionMemberRepository.AddOrUpdate(elementsToUpdate);`
`54`	`59`	`_sessionMemberRepository.Remove(smi);`
`55`	`60`	`});`
`56`	`61`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`using ByteSync.Models.Inventories;`
`21`	`21`	`using ByteSync.Services.Comparisons;`
`22`	`22`	`using ByteSync.Services.Misc;`
	`23`	`+using ByteSync.Services.Sessions;`
`23`	`24`
`24`	`25`	`namespace ByteSync.Services.Inventories;`
`25`	`26`
`@@ -398,7 +399,7 @@ private InventoryBuilder BuildInventoryBuilder(SessionMemberInfo sessionMemberIn`
`398`	`399`	`{`
`399`	`400`	`var cloudSessionSettings = _sessionService.CurrentSessionSettings!;`
`400`	`401`
`401`		`- var inventoryBuilder = new InventoryBuilder(sessionMemberInfo.Letter, cloudSessionSettings, InventoryProcessData,`
	`402`	`+ var inventoryBuilder = new InventoryBuilder(sessionMemberInfo.GetLetter(), cloudSessionSettings, InventoryProcessData,`
`402`	`403`	`endpoint, sessionMemberInfo.MachineName, FingerprintModes.Rsync);`
`403`	`404`	`foreach (var pathItem in pathItems)`
`404`	`405`	`{`