Skip to content

Commit 757279d

Browse files
committed
1784: ensure core_result.filter is in sync with website.filter
1 parent d3ec8fd commit 757279d

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

libs/database/src/core-results/core-result.service.spec.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,13 @@ describe('CoreResultService', () => {
282282
websiteUrl,
283283
);
284284
expect(mockRepository.insert).toHaveBeenCalled();
285-
expect(mockWebsiteService.setFiltered).not.toHaveBeenCalled();
285+
expect(mockWebsiteService.setFilter).not.toHaveBeenCalled();
286+
expect(mockRepository.insert).toHaveBeenCalledWith(
287+
expect.objectContaining({ filter: false }),
288+
);
286289
});
287290

288-
it('should call setFiltered when finalUrlMIMEType is a filtered type', async () => {
291+
it('should call setFilter when finalUrlMIMEType is a filtered type', async () => {
289292
const websiteId = 1;
290293
const scanStatus: ScanStatus = ScanStatus['Completed'];
291294
const websiteUrl = 'https://example.gov';
@@ -471,9 +474,9 @@ describe('CoreResultService', () => {
471474
);
472475

473476
expect(mockRepository.insert).toHaveBeenCalled();
474-
expect(mockWebsiteService.setFiltered).toHaveBeenCalledWith(
475-
websiteId,
476-
true,
477+
expect(mockWebsiteService.setFilter).toHaveBeenCalledWith(websiteId, true);
478+
expect(mockRepository.insert).toHaveBeenCalledWith(
479+
expect.objectContaining({ filter: true }),
477480
);
478481
});
479482
});

libs/database/src/core-results/core-result.service.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,18 @@ export class CoreResultService {
5757
},
5858
});
5959

60-
if (exists) {
61-
await this.coreResultRepository.update(exists.id, coreResult);
62-
} else {
63-
await this.coreResultRepository.insert(coreResult);
64-
}
65-
6660
if (
6761
coreResult.finalUrlMIMEType &&
6862
CoreResult.filteredMediaTypes.includes(coreResult.finalUrlMIMEType)
6963
) {
70-
await this.websiteService.setFiltered(websiteId, true);
64+
coreResult.filter = true;
65+
await this.websiteService.setFilter(websiteId, true);
66+
}
67+
68+
if (exists) {
69+
await this.coreResultRepository.update(exists.id, coreResult);
70+
} else {
71+
await this.coreResultRepository.insert(coreResult);
7172
}
7273
}
7374

libs/database/src/websites/websites.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ export class WebsiteService {
257257
.execute();
258258
}
259259

260-
async setFiltered(id: number, filtered: boolean): Promise<void> {
261-
await this.website.update(id, { filter: filtered });
260+
async setFilter(id: number, filter: boolean): Promise<void> {
261+
await this.website.update(id, { filter });
262262
}
263263
}

0 commit comments

Comments
 (0)