Skip to content

Commit c153f64

Browse files
Refactor null checks in mapping extensions for improved readability
- Updated mapping extensions across various files to use braces for null checks, enhancing code clarity and consistency. - Ensured that all relevant properties are checked and assigned properly in the mapping methods. - This change applies to UserProfilesMappingExtensions, TagsMappingExtensions, RecentPlayersMappingExtensions, PlayersMappingExtensions, NotificationsMappingExtensions, MapRotationsMappingExtensions, GameServersMappingExtensions, ConnectedPlayersMappingExtensions, CentralBanFileStatusMappingExtensions, BanFileMonitorsMappingExtensions, and AdminActionsMappingExtensions. - Additionally, refactored user profile retrieval methods in UserProfileController to consistently handle null checks and return appropriate API results.
1 parent 85ae753 commit c153f64

87 files changed

Lines changed: 1587 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dotnet_diagnostic.CA1716.severity = suggestion
4444
dotnet_diagnostic.CA1720.severity = suggestion
4545

4646
# Defer broad style-only churn in existing code.
47-
dotnet_diagnostic.IDE0011.severity = suggestion
47+
dotnet_diagnostic.IDE0011.severity = warning
4848
dotnet_diagnostic.IDE0022.severity = suggestion
4949
dotnet_diagnostic.IDE0028.severity = suggestion
5050
dotnet_diagnostic.IDE0040.severity = suggestion

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/AdminActions/AdminActionDto.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,14 @@ public Dictionary<string, string> TelemetryProperties
6262
};
6363

6464
if (UserProfile is not null)
65+
{
6566
telemetryProperties.AddAdditionalProperties(UserProfile.TelemetryProperties);
67+
}
6668

6769
if (Player is not null)
70+
{
6871
telemetryProperties.AddAdditionalProperties(Player.TelemetryProperties);
72+
}
6973

7074
return telemetryProperties;
7175
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/BanFileMonitors/BanFileMonitorDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@ public Dictionary<string, string> TelemetryProperties
157157
};
158158

159159
if (GameServer is not null)
160+
{
160161
telemetryProperties.AddAdditionalProperties(GameServer.TelemetryProperties);
162+
}
161163

162164
return telemetryProperties;
163165
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/ChatMessages/ChatMessageDto.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,14 @@ public Dictionary<string, string> TelemetryProperties
6868
};
6969

7070
if (GameServer is not null)
71+
{
7172
telemetryProperties.AddAdditionalProperties(GameServer.TelemetryProperties);
73+
}
7274

7375
if (Player is not null)
76+
{
7477
telemetryProperties.AddAdditionalProperties(Player.TelemetryProperties);
78+
}
7579

7680
return telemetryProperties;
7781
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/Demos/DemoDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public Dictionary<string, string> TelemetryProperties
6767
};
6868

6969
if (UserProfile is not null)
70+
{
7071
telemetryProperties.AddAdditionalProperties(UserProfile.TelemetryProperties);
72+
}
7173

7274
return telemetryProperties;
7375
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/GameServers/GameServerEventDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ public Dictionary<string, string> TelemetryProperties
4141
};
4242

4343
if (GameServer is not null)
44+
{
4445
telemetryProperties.AddAdditionalProperties(GameServer.TelemetryProperties);
46+
}
4547

4648
return telemetryProperties;
4749
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/Maps/MapVoteDto.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,19 @@ public Dictionary<string, string> TelemetryProperties
4949
};
5050

5151
if (GameServer is not null)
52+
{
5253
telemetryProperties.AddAdditionalProperties(GameServer.TelemetryProperties);
54+
}
5355

5456
if (Map is not null)
57+
{
5558
telemetryProperties.AddAdditionalProperties(Map.TelemetryProperties);
59+
}
5660

5761
if (Player is not null)
62+
{
5863
telemetryProperties.AddAdditionalProperties(Player.TelemetryProperties);
64+
}
5965

6066
return telemetryProperties;
6167
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/Players/LivePlayerDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ public Dictionary<string, string> TelemetryProperties
7474
};
7575

7676
if (Player is not null)
77+
{
7778
telemetryProperties.AddAdditionalProperties(Player.TelemetryProperties);
79+
}
7880

7981
return telemetryProperties;
8082
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/Players/ProtectedNameDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ public Dictionary<string, string> TelemetryProperties
6363
};
6464

6565
if (CreatedByUserProfile is not null)
66+
{
6667
telemetryProperties.AddAdditionalProperties(CreatedByUserProfile.TelemetryProperties);
68+
}
6769

6870
return telemetryProperties;
6971
}

src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/RecentPlayers/RecentPlayerDto.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ public Dictionary<string, string> TelemetryProperties
6161
};
6262

6363
if (Player is not null)
64+
{
6465
telemetryProperties.AddAdditionalProperties(telemetryProperties);
66+
}
6567

6668
return telemetryProperties;
6769
}

0 commit comments

Comments
 (0)