Skip to content

Commit d376e15

Browse files
paul-fresquetpaul-fresquet
committed
refactor: cleanup
1 parent ad66eb9 commit d376e15

File tree

5 files changed

+3
-272
lines changed

5 files changed

+3
-272
lines changed

‎src/ByteSync.ServerCommon/Interfaces/Services/ICloudSessionsService.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ namespace ByteSync.ServerCommon.Interfaces.Services;
88

99
public interface ICloudSessionsService
1010
{
11-
// Task<CloudSessionResult> CreateCloudSession(CreateCloudSessionParameters createCloudSessionParameters, Client creator);
12-
1311
Task<CloudSessionResult> BuildCloudSessionResult(CloudSessionData cloudSessionData, SessionMemberData sessionMemberData);
1412

1513
Task<List<string>> GetMembersInstanceIds(string sessionId);
@@ -19,9 +17,7 @@ public interface ICloudSessionsService
1917
Task<JoinSessionResult> AskJoinCloudSession(Client client, AskJoinCloudSessionParameters parameters);
2018

2119
Task ValidateJoinCloudSession(ValidateJoinCloudSessionParameters parameters);
22-
23-
// Task<FinalizeJoinSessionResult> FinalizeJoinCloudSession(Client client, FinalizeJoinCloudSessionParameters parameters);
24-
20+
2521
Task<List<SessionMemberInfoDTO>> GetSessionMembersInfosAsync(string sessionId);
2622

2723
Task<bool> ResetSession(string sessionId, Client client);

‎src/ByteSync.ServerCommon/Interfaces/Services/ILobbyService.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ namespace ByteSync.ServerCommon.Interfaces.Services;
66

77
public interface ILobbyService
88
{
9-
// Task<JoinLobbyResult> TryJoinLobby(JoinLobbyParameters joinLobbyParameters, Client client);
10-
11-
// Task<bool> QuitLobby(string lobbyId, Client byteSyncEndpoint);
12-
139
Task<LobbyMemberInfo?> UpdateLobbyMemberStatus(string lobbyId, Client client, LobbyMemberStatuses lobbyMemberStatus);
1410

1511
Task SendLobbyCloudSessionCredentials(LobbyCloudSessionCredentials lobbyCloudSessionCredentials, Client client);

‎src/ByteSync.ServerCommon/Services/CloudSessionsService.cs‎

Lines changed: 1 addition & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,6 @@ public CloudSessionsService(ILogger<CloudSessionsService> logger, ISharedFilesSe
3636
_sessionMemberConverter = sessionMemberConverter;
3737
_invokeClientsService = invokeClientsService;
3838
}
39-
40-
// public async Task<CloudSessionResult> CreateCloudSession(CreateCloudSessionParameters createCloudSessionParameters, Client client)
41-
// {
42-
// CloudSessionData cloudSessionData;
43-
// SessionMemberData creatorData;
44-
//
45-
// cloudSessionData = new CloudSessionData(createCloudSessionParameters.LobbyId, createCloudSessionParameters.SessionSettings, client);
46-
// creatorData = new SessionMemberData(client, createCloudSessionParameters.CreatorPublicKeyInfo,
47-
// createCloudSessionParameters.CreatorProfileClientId, cloudSessionData,
48-
// createCloudSessionParameters.CreatorPrivateData);
49-
// cloudSessionData.SessionMembers.Add(creatorData);
50-
//
51-
// cloudSessionData = await _cloudSessionsRepository.AddCloudSession(cloudSessionData, GenerateRandomSessionId);
52-
//
53-
// await _clientsGroupsManager.AddToSessionGroup(client, cloudSessionData.SessionId);
54-
//
55-
// _logger.LogInformation("Cloud Session {SessionId} created", cloudSessionData.SessionId);
56-
//
57-
// var cloudSessionResult = await BuildCloudSessionResult(cloudSessionData, creatorData);
58-
//
59-
// return cloudSessionResult;
60-
// }
6139

6240
public async Task<List<string>> GetMembersInstanceIds(string sessionId)
6341
{
@@ -79,27 +57,15 @@ public async Task<List<string>> GetMembersInstanceIds(string sessionId)
7957
return result;
8058
}
8159

82-
// private string GenerateRandomSessionId()
83-
// {
84-
// string sessionId = RandomUtils.GetRandomNumber(3) +
85-
// RandomUtils.GetRandomLetters(3, false) +
86-
// RandomUtils.GetRandomNumber(3);
87-
//
88-
// return sessionId;
89-
// }
90-
9160
public async Task PreJoinCloudSession(Client client, PublicKeyInfo publicKeyInfo,
9261
string? profileClientId,
9362
string sessionId, string validatorClientInstanceId)
9463
{
95-
//var cloudSessionData = await _cloudSessionsRepository.GetCloudSession(sessionId);
96-
9764
var updateResult = await _cloudSessionsRepository.Update(sessionId, cloudSessionData =>
9865
{
9966
SessionMemberData joiner = new SessionMemberData(client, publicKeyInfo, profileClientId, cloudSessionData);
10067
joiner.ValidatorInstanceId = validatorClientInstanceId;
101-
102-
// On enlève tout ce qui peut ressemble au joiner de la liste
68+
10369
cloudSessionData.PreSessionMembers.Remove(joiner);
10470
cloudSessionData.PreSessionMembers.RemoveAll(m => m.ClientInstanceId.Equals(joiner.ClientInstanceId));
10571

@@ -231,90 +197,6 @@ public async Task ValidateJoinCloudSession(ValidateJoinCloudSessionParameters pa
231197
}
232198
}
233199

234-
// public async Task<FinalizeJoinSessionResult> FinalizeJoinCloudSession(Client client, FinalizeJoinCloudSessionParameters parameters)
235-
// {
236-
// FinalizeJoinSessionStatuses? finalizeJoinSessionStatus = null;
237-
// SessionMemberData? joiner = null;
238-
//
239-
// var updateResult = await _cloudSessionsRepository.Update(parameters.SessionId, innerCloudSessionData =>
240-
// {
241-
// if (innerCloudSessionData.IsSessionRemoved || innerCloudSessionData.IsSessionActivated)
242-
// {
243-
// finalizeJoinSessionStatus = FinalizeJoinSessionStatuses.SessionNotFound;
244-
// }
245-
// else if (innerCloudSessionData.IsSessionActivated)
246-
// {
247-
// finalizeJoinSessionStatus = FinalizeJoinSessionStatuses.SessionAlreadyActivated;
248-
// }
249-
// else if (innerCloudSessionData.SessionMembers
250-
// .Count(sm => !sm.IsAuthCheckedFor(parameters.JoinerInstanceId)) > 0)
251-
// {
252-
// var nonAuthCheckedMembers = innerCloudSessionData.SessionMembers
253-
// .Where(sm => !sm.IsAuthCheckedFor(parameters.JoinerInstanceId))
254-
// .Select(sm => sm.ClientInstanceId)
255-
// .ToList().JoinToString(",");
256-
//
257-
// _logger.LogInformation("FinalizeJoinCloudSession: session {SessionId} has non-auth checked members {NonAuthCheckedMembers}",
258-
// parameters.SessionId, nonAuthCheckedMembers);
259-
//
260-
// finalizeJoinSessionStatus = FinalizeJoinSessionStatuses.AuthIsNotChecked;
261-
// }
262-
// else
263-
// {
264-
// joiner = innerCloudSessionData
265-
// .PreSessionMembers
266-
// .FirstOrDefault(m =>
267-
// Equals(m.ClientInstanceId, parameters.JoinerInstanceId) &&
268-
// Equals(m.ValidatorInstanceId, parameters.ValidatorInstanceId) &&
269-
// Equals(m.FinalizationPassword, parameters.FinalizationPassword));
270-
//
271-
// if (joiner == null)
272-
// {
273-
// finalizeJoinSessionStatus = FinalizeJoinSessionStatuses.PrememberNotFound;
274-
// }
275-
// }
276-
//
277-
// if (joiner != null && finalizeJoinSessionStatus == null)
278-
// {
279-
// if (!innerCloudSessionData!.SessionMembers.Any(smd => smd.ClientInstanceId.Equals(joiner.ClientInstanceId)))
280-
// {
281-
// joiner.EncryptedPrivateData = parameters.EncryptedSessionMemberPrivateData;
282-
//
283-
// innerCloudSessionData.SessionMembers.Add(joiner);
284-
// innerCloudSessionData.PreSessionMembers.Remove(joiner);
285-
// }
286-
//
287-
// finalizeJoinSessionStatus = FinalizeJoinSessionStatuses.FinalizeJoinSessionSucess;
288-
//
289-
// return true;
290-
// }
291-
// else
292-
// {
293-
// return false;
294-
// }
295-
// });
296-
//
297-
// if (updateResult.IsSaved)
298-
// {
299-
// var sessionMemberInfo = await _sessionMemberConverter.Convert(joiner!);
300-
//
301-
// await _clientsGroupsInvoker.SessionGroup(parameters.SessionId).MemberJoinedSession(sessionMemberInfo).ConfigureAwait(false);
302-
// await _clientsGroupsManager.AddToSessionGroup(client, parameters.SessionId).ConfigureAwait(false);
303-
//
304-
// _logger.LogInformation("FinalizeJoinCloudSession: {@cloudSession} by {@joiner}",
305-
// joiner!.CloudSessionData.BuildLog(), joiner.BuildLog());
306-
// }
307-
// else
308-
// {
309-
// _logger.LogInformation("FinalizeJoinCloudSession: Can not validate member {JoinerId} for session {SessionId}, status: {Status}",
310-
// parameters.JoinerInstanceId, parameters.SessionId, finalizeJoinSessionStatus);
311-
// }
312-
//
313-
// FinalizeJoinSessionResult finalizeJoinSessionResult = FinalizeJoinSessionResult.BuildFrom(finalizeJoinSessionStatus!.Value);
314-
//
315-
// return finalizeJoinSessionResult;
316-
// }
317-
318200
public async Task<CloudSessionResult> BuildCloudSessionResult(CloudSessionData cloudSessionData, SessionMemberData sessionMemberData)
319201
{
320202
var sessionMemberInfo = await _sessionMemberConverter.Convert(sessionMemberData);

‎src/ByteSync.ServerCommon/Services/LobbyService.cs‎

Lines changed: 1 addition & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -15,127 +15,15 @@ namespace ByteSync.ServerCommon.Services;
1515
public class LobbyService : ILobbyService
1616
{
1717
private readonly ILobbyRepository _lobbyRepository;
18-
private readonly ICloudSessionProfileRepository _cloudSessionProfileRepository;
19-
private readonly ILobbyFactory _lobbyFactory;
20-
private readonly IClientsGroupsHubService _clientsGroupsHubService;
2118
private readonly IInvokeClientsService _invokeClientsService;
2219
private readonly ILogger<LobbyService> _logger;
2320

24-
public LobbyService(ILobbyRepository lobbyRepository, ICloudSessionProfileRepository cloudSessionProfileRepository,
25-
ILobbyFactory lobbyFactory, IClientsGroupsHubService clientsGroupsHubService, IInvokeClientsService invokeClientsService, ILogger<LobbyService> logger)
21+
public LobbyService(ILobbyRepository lobbyRepository, IInvokeClientsService invokeClientsService, ILogger<LobbyService> logger)
2622
{
2723
_lobbyRepository = lobbyRepository;
28-
_cloudSessionProfileRepository = cloudSessionProfileRepository;
29-
_lobbyFactory = lobbyFactory;
30-
_clientsGroupsHubService = clientsGroupsHubService;
3124
_invokeClientsService = invokeClientsService;
3225
_logger = logger;
3326
}
34-
35-
// public async Task<JoinLobbyResult> TryJoinLobby(JoinLobbyParameters joinLobbyParameters, Client client)
36-
// {
37-
// JoinLobbyResult? joinLobbyResult = null;
38-
// bool? isConnected = null;
39-
//
40-
// // string? lobbyId = null;
41-
// CloudSessionProfileEntity? cloudSessionProfile = null;
42-
//
43-
// var updateResult1 = await _cloudSessionProfileRepository.AddOrUpdate(joinLobbyParameters.CloudSessionProfileId, cloudSessionProfileEntity =>
44-
// {
45-
// if (cloudSessionProfileEntity == null)
46-
// {
47-
// joinLobbyResult = JoinLobbyResult.BuildFrom(JoinLobbyStatuses.UnknownCloudSessionProfile);
48-
// return null;
49-
// }
50-
// else
51-
// {
52-
// cloudSessionProfile = cloudSessionProfileEntity;
53-
//
54-
// if (cloudSessionProfileEntity.CurrentLobbyId == null)
55-
// {
56-
// Lobby lobby = _lobbyFactory.BuildLobby(cloudSessionProfileEntity);
57-
// _lobbyRepository.Save(lobby.LobbyId, lobby);
58-
//
59-
// cloudSessionProfileEntity.CurrentLobbyId = lobby.LobbyId;
60-
//
61-
// return cloudSessionProfileEntity;
62-
// }
63-
// else
64-
// {
65-
// return null;
66-
// }
67-
// }
68-
// });
69-
//
70-
// if (joinLobbyResult != null)
71-
// {
72-
// return joinLobbyResult;
73-
// }
74-
//
75-
// var updateResult = await _lobbyRepository.AddOrUpdate(cloudSessionProfile!.CurrentLobbyId!, lobby =>
76-
// {
77-
// if (lobby == null)
78-
// {
79-
// joinLobbyResult = JoinLobbyResult.BuildFrom(JoinLobbyStatuses.UnknownCloudSessionProfile);
80-
// return null;
81-
// }
82-
//
83-
// if (cloudSessionProfile.Slots.Any(s => s.ProfileClientId == joinLobbyParameters.ProfileClientId))
84-
// {
85-
// // On contrôle le JoinMode
86-
// int index = cloudSessionProfile.Slots.FindIndex(s => s.ProfileClientId == joinLobbyParameters.ProfileClientId);
87-
// bool isJoinModeOK;
88-
// if (index == 0)
89-
// {
90-
// isJoinModeOK = joinLobbyParameters.JoinMode.In(JoinLobbyModes.RunInventory, JoinLobbyModes.RunSynchronization);
91-
// // lobby.SetSessionMode(joinLobbyParameters.JoinMode);
92-
// }
93-
// else
94-
// {
95-
// isJoinModeOK = joinLobbyParameters.JoinMode.In(JoinLobbyModes.Join);
96-
// }
97-
//
98-
// if (!isJoinModeOK)
99-
// {
100-
// joinLobbyResult = JoinLobbyResult.BuildFrom(JoinLobbyStatuses.UnexpectedLobbyJoinMode);
101-
// return null;
102-
// }
103-
//
104-
// isConnected = lobby.ConnectLobbyMember(joinLobbyParameters.ProfileClientId, joinLobbyParameters.PublicKeyInfo,
105-
// joinLobbyParameters.JoinMode, client);
106-
//
107-
// return lobby;
108-
// }
109-
// else
110-
// {
111-
// joinLobbyResult = JoinLobbyResult.BuildFrom(JoinLobbyStatuses.UnknownProfileClientId);
112-
// return null;
113-
// }
114-
// });
115-
//
116-
// if (updateResult.IsSaved)
117-
// {
118-
// LobbyInfo lobbyInfo = updateResult.Element!.BuildLobbyInfo();
119-
//
120-
// _logger.LogInformation("TryJoinLobby: {@joiner} joins lobby {LobbyId}", client.BuildLog(), lobbyInfo.LobbyId);
121-
//
122-
// joinLobbyResult = JoinLobbyResult.BuildFrom(lobbyInfo,
123-
// isConnected!.Value ? JoinLobbyStatuses.LobbyJoinedSucessfully : JoinLobbyStatuses.LobbyPreviouslyJoined);
124-
//
125-
// var memberInfo = lobbyInfo.GetMember(joinLobbyParameters.ProfileClientId)!;
126-
//
127-
// await _clientsGroupsInvoker
128-
// .LobbyGroupExcept(lobbyInfo.LobbyId, client)
129-
// .MemberJoinedLobby(lobbyInfo.LobbyId, memberInfo)
130-
// .ConfigureAwait(false);
131-
//
132-
// await _clientsGroupsManager
133-
// .AddToLobbyGroup(client, lobbyInfo.LobbyId)
134-
// .ConfigureAwait(false);
135-
// }
136-
//
137-
// return joinLobbyResult!;
138-
// }
13927

14028
public async Task<LobbyMemberInfo?> UpdateLobbyMemberStatus(string lobbyId, Client client, LobbyMemberStatuses lobbyMemberStatus)
14129
{
@@ -198,33 +86,4 @@ await _invokeClientsService.LobbyGroup(lobbyCheckInfo.LobbyId)
19886
.LobbyCheckInfosSent(lobbyCheckInfo.LobbyId, lobbyCheckInfo).ConfigureAwait(false);
19987
}
20088
}
201-
202-
// public async Task<bool> QuitLobby(string lobbyId, Client client)
203-
// {
204-
// var result = await _lobbyRepository.QuitLobby(lobbyId, client.ClientInstanceId);
205-
//
206-
// if (result.IsSaved)
207-
// {
208-
// _logger.LogInformation("QuitLobby: {@member} quits {@lobby}", client.BuildLog(), lobbyId);
209-
// }
210-
// else if (result.IsDeleted)
211-
// {
212-
// _logger.LogInformation("QuitLobby: {@member} quits {@lobby}", client.BuildLog(), lobbyId);
213-
// _logger.LogInformation("QuitLobby: {@lobby} is closed", lobbyId);
214-
// }
215-
// else
216-
// {
217-
// _logger.LogWarning("QuitLobby: {@member} not found in {@lobby}", client.BuildLog(), lobbyId);
218-
// }
219-
//
220-
// if (result.IsSaved || result.IsDeleted)
221-
// {
222-
// await _clientsGroupsInvoker.LobbyGroup(lobbyId).
223-
// MemberQuittedLobby(lobbyId, client.ClientInstanceId).ConfigureAwait(false);
224-
//
225-
// await _clientsGroupsManager.RemoveFromLobbyGroup(client, $"Lobby_{lobbyId}").ConfigureAwait(false);
226-
// }
227-
//
228-
// return result.IsSaved || result.IsDeleted;
229-
// }
23089
}

‎tests/ByteSync.ServerCommon.Tests/Commands/CloudSessions/FinalizeJoinCloudSessionCommandHandlerTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public async Task Handle_SuccessfulFinalization_ReturnsSuccess()
8989

9090
cloudSession.PreSessionMembers.Add(joiner);
9191

92-
// A.CallTo(() => _mockUpdateResult.IsWaitingForTransaction).Returns(true);
93-
9492
bool funcResult = false;
9593
bool isTransaction = false;
9694
A.CallTo(() => _mockCloudSessionsRepository.Update(

0 commit comments

Comments
 (0)