Skip to content

Commit c5d05a4

Browse files
prograhammingprograhamming
committed
PM-31923 fixing dead code
1 parent 92442b7 commit c5d05a4

3 files changed

Lines changed: 34 additions & 125 deletions

File tree

‎src/Core/Dirt/Reports/ReportFeatures/Requests/UpdateOrganizationReportV2Request.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ public class UpdateOrganizationReportV2Request
44
{
55
public Guid ReportId { get; set; }
66
public Guid OrganizationId { get; set; }
7-
public string? ContentEncryptionKey { get; set; }
8-
public string? SummaryData { get; set; }
9-
public string? ApplicationData { get; set; }
10-
public OrganizationReportMetrics? ReportMetrics { get; set; }
7+
public required string ContentEncryptionKey { get; set; }
8+
public required string SummaryData { get; set; }
9+
public required string ApplicationData { get; set; }
10+
public required OrganizationReportMetrics ReportMetrics { get; set; }
1111
}

‎src/Core/Dirt/Reports/ReportFeatures/UpdateOrganizationReportV2Command.cs‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,36 +53,21 @@ public async Task<OrganizationReport> UpdateAsync(UpdateOrganizationReportV2Requ
5353
throw new BadRequestException("Organization report does not belong to the specified organization");
5454
}
5555

56-
if (request.ContentEncryptionKey != null)
57-
{
58-
existingReport.ContentEncryptionKey = request.ContentEncryptionKey;
59-
}
60-
61-
if (request.SummaryData != null)
62-
{
63-
existingReport.SummaryData = request.SummaryData;
64-
}
65-
66-
if (request.ApplicationData != null)
67-
{
68-
existingReport.ApplicationData = request.ApplicationData;
69-
}
70-
71-
if (request.ReportMetrics != null)
72-
{
73-
existingReport.ApplicationCount = request.ReportMetrics.ApplicationCount;
74-
existingReport.ApplicationAtRiskCount = request.ReportMetrics.ApplicationAtRiskCount;
75-
existingReport.CriticalApplicationCount = request.ReportMetrics.CriticalApplicationCount;
76-
existingReport.CriticalApplicationAtRiskCount = request.ReportMetrics.CriticalApplicationAtRiskCount;
77-
existingReport.MemberCount = request.ReportMetrics.MemberCount;
78-
existingReport.MemberAtRiskCount = request.ReportMetrics.MemberAtRiskCount;
79-
existingReport.CriticalMemberCount = request.ReportMetrics.CriticalMemberCount;
80-
existingReport.CriticalMemberAtRiskCount = request.ReportMetrics.CriticalMemberAtRiskCount;
81-
existingReport.PasswordCount = request.ReportMetrics.PasswordCount;
82-
existingReport.PasswordAtRiskCount = request.ReportMetrics.PasswordAtRiskCount;
83-
existingReport.CriticalPasswordCount = request.ReportMetrics.CriticalPasswordCount;
84-
existingReport.CriticalPasswordAtRiskCount = request.ReportMetrics.CriticalPasswordAtRiskCount;
85-
}
56+
existingReport.ContentEncryptionKey = request.ContentEncryptionKey;
57+
existingReport.SummaryData = request.SummaryData;
58+
existingReport.ApplicationData = request.ApplicationData;
59+
existingReport.ApplicationCount = request.ReportMetrics.ApplicationCount;
60+
existingReport.ApplicationAtRiskCount = request.ReportMetrics.ApplicationAtRiskCount;
61+
existingReport.CriticalApplicationCount = request.ReportMetrics.CriticalApplicationCount;
62+
existingReport.CriticalApplicationAtRiskCount = request.ReportMetrics.CriticalApplicationAtRiskCount;
63+
existingReport.MemberCount = request.ReportMetrics.MemberCount;
64+
existingReport.MemberAtRiskCount = request.ReportMetrics.MemberAtRiskCount;
65+
existingReport.CriticalMemberCount = request.ReportMetrics.CriticalMemberCount;
66+
existingReport.CriticalMemberAtRiskCount = request.ReportMetrics.CriticalMemberAtRiskCount;
67+
existingReport.PasswordCount = request.ReportMetrics.PasswordCount;
68+
existingReport.PasswordAtRiskCount = request.ReportMetrics.PasswordAtRiskCount;
69+
existingReport.CriticalPasswordCount = request.ReportMetrics.CriticalPasswordCount;
70+
existingReport.CriticalPasswordAtRiskCount = request.ReportMetrics.CriticalPasswordAtRiskCount;
8671

8772
existingReport.RevisionDate = DateTime.UtcNow;
8873
await _organizationReportRepo.ReplaceAsync(existingReport);

‎test/Core.Test/Dirt/ReportFeatures/UpdateOrganizationReportV2CommandTests.cs‎

Lines changed: 15 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -118,94 +118,6 @@ public async Task UpdateAsync_WithMetrics_UpdatesMetricFields(
118118
Assert.Equal(20, result.PasswordAtRiskCount);
119119
}
120120

121-
[Theory]
122-
[BitAutoData]
123-
public async Task UpdateAsync_NullFields_PreservesExistingValues(
124-
SutProvider<UpdateOrganizationReportV2Command> sutProvider)
125-
{
126-
var fixture = new Fixture();
127-
var orgId = Guid.NewGuid();
128-
var reportId = Guid.NewGuid();
129-
130-
var existingReport = fixture.Build<OrganizationReport>()
131-
.With(r => r.Id, reportId)
132-
.With(r => r.OrganizationId, orgId)
133-
.With(r => r.ContentEncryptionKey, "original-key")
134-
.With(r => r.SummaryData, "original-summary")
135-
.With(r => r.ApplicationData, "original-app-data")
136-
.With(r => r.ApplicationCount, 5)
137-
.Without(r => r.ReportFile)
138-
.Create();
139-
140-
var request = new UpdateOrganizationReportV2Request
141-
{
142-
ReportId = reportId,
143-
OrganizationId = orgId,
144-
ContentEncryptionKey = null,
145-
SummaryData = null,
146-
ApplicationData = null,
147-
ReportMetrics = null
148-
};
149-
150-
sutProvider.GetDependency<IOrganizationRepository>()
151-
.GetByIdAsync(orgId)
152-
.Returns(fixture.Create<Organization>());
153-
154-
sutProvider.GetDependency<IOrganizationReportRepository>()
155-
.GetByIdAsync(reportId)
156-
.Returns(existingReport);
157-
158-
var result = await sutProvider.Sut.UpdateAsync(request);
159-
160-
Assert.Equal("original-key", result.ContentEncryptionKey);
161-
Assert.Equal("original-summary", result.SummaryData);
162-
Assert.Equal("original-app-data", result.ApplicationData);
163-
Assert.Equal(5, result.ApplicationCount);
164-
}
165-
166-
[Theory]
167-
[BitAutoData]
168-
public async Task UpdateAsync_PartialUpdate_OnlyUpdatesProvidedFields(
169-
SutProvider<UpdateOrganizationReportV2Command> sutProvider)
170-
{
171-
var fixture = new Fixture();
172-
var orgId = Guid.NewGuid();
173-
var reportId = Guid.NewGuid();
174-
175-
var existingReport = fixture.Build<OrganizationReport>()
176-
.With(r => r.Id, reportId)
177-
.With(r => r.OrganizationId, orgId)
178-
.With(r => r.ContentEncryptionKey, "original-key")
179-
.With(r => r.SummaryData, "original-summary")
180-
.With(r => r.ApplicationData, "original-app-data")
181-
.Without(r => r.ReportFile)
182-
.Create();
183-
184-
var request = new UpdateOrganizationReportV2Request
185-
{
186-
ReportId = reportId,
187-
OrganizationId = orgId,
188-
SummaryData = "updated-summary",
189-
ContentEncryptionKey = null,
190-
ApplicationData = null,
191-
ReportMetrics = null
192-
};
193-
194-
sutProvider.GetDependency<IOrganizationRepository>()
195-
.GetByIdAsync(orgId)
196-
.Returns(fixture.Create<Organization>());
197-
198-
sutProvider.GetDependency<IOrganizationReportRepository>()
199-
.GetByIdAsync(reportId)
200-
.Returns(existingReport);
201-
202-
var result = await sutProvider.Sut.UpdateAsync(request);
203-
204-
Assert.Equal("original-key", result.ContentEncryptionKey);
205-
Assert.Equal("updated-summary", result.SummaryData);
206-
Assert.Equal("original-app-data", result.ApplicationData);
207-
}
208-
209121
[Theory]
210122
[BitAutoData]
211123
public async Task UpdateAsync_InvalidOrganization_ThrowsBadRequestException(
@@ -214,7 +126,11 @@ public async Task UpdateAsync_InvalidOrganization_ThrowsBadRequestException(
214126
var request = new UpdateOrganizationReportV2Request
215127
{
216128
ReportId = Guid.NewGuid(),
217-
OrganizationId = Guid.NewGuid()
129+
OrganizationId = Guid.NewGuid(),
130+
ContentEncryptionKey = "key",
131+
SummaryData = "summary",
132+
ApplicationData = "app-data",
133+
ReportMetrics = new OrganizationReportMetrics()
218134
};
219135

220136
sutProvider.GetDependency<IOrganizationRepository>()
@@ -297,7 +213,11 @@ public async Task UpdateAsync_EmptyOrganizationId_ThrowsBadRequestException(
297213
var request = new UpdateOrganizationReportV2Request
298214
{
299215
ReportId = Guid.NewGuid(),
300-
OrganizationId = Guid.Empty
216+
OrganizationId = Guid.Empty,
217+
ContentEncryptionKey = "key",
218+
SummaryData = "summary",
219+
ApplicationData = "app-data",
220+
ReportMetrics = new OrganizationReportMetrics()
301221
};
302222

303223
var exception = await Assert.ThrowsAsync<BadRequestException>(
@@ -313,7 +233,11 @@ public async Task UpdateAsync_EmptyReportId_ThrowsBadRequestException(
313233
var request = new UpdateOrganizationReportV2Request
314234
{
315235
ReportId = Guid.Empty,
316-
OrganizationId = Guid.NewGuid()
236+
OrganizationId = Guid.NewGuid(),
237+
ContentEncryptionKey = "key",
238+
SummaryData = "summary",
239+
ApplicationData = "app-data",
240+
ReportMetrics = new OrganizationReportMetrics()
317241
};
318242

319243
var exception = await Assert.ThrowsAsync<BadRequestException>(

0 commit comments

Comments
 (0)