Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove duplicateIds on unique assets #13752

Merged
merged 9 commits into from
Nov 4, 2024
Merged

fix: remove duplicateIds on unique assets #13752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0c402d
fix: remove duplicateIds on unique assets
Pranay-Pandey Oct 26, 2024
e490b02
chore: handle bulk update for rectifying unique assets
Pranay-Pandey Oct 26, 2024
7a90fa9
chore: fix linting issues
Pranay-Pandey Oct 26, 2024
fec4eec
revert: remove identify unique assets from duplicates in web
Pranay-Pandey Oct 26, 2024
34a6551
feat: Add unique assets checking after fetching duplicates
Pranay-Pandey Oct 26, 2024
0dd3105
format the code using prettier
Pranay-Pandey Oct 26, 2024
09c10b9
refactor: remove redundant imports
Pranay-Pandey Oct 26, 2024
ca500b0
update tests for getDuplicates
Pranay-Pandey Oct 26, 2024
566e5c2
await updateAll in getDuplicates to handle potential errors
Pranay-Pandey Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions server/src/services/duplicate.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,23 @@ describe(SearchService.name, () => {

describe('getDuplicates', () => {
it('should get duplicates', async () => {
assetMock.getDuplicates.mockResolvedValue([assetStub.hasDupe]);
assetMock.getDuplicates.mockResolvedValue([assetStub.hasDupe, assetStub.hasDupe]);
await expect(sut.getDuplicates(authStub.admin)).resolves.toEqual([
{ duplicateId: assetStub.hasDupe.duplicateId, assets: [expect.objectContaining({ id: assetStub.hasDupe.id })] },
{
duplicateId: assetStub.hasDupe.duplicateId,
assets: [
expect.objectContaining({ id: assetStub.hasDupe.id }),
expect.objectContaining({ id: assetStub.hasDupe.id }),
],
},
]);
});

it('should update assets with duplicateId', async () => {
assetMock.getDuplicates.mockResolvedValue([assetStub.hasDupe]);
await expect(sut.getDuplicates(authStub.admin)).resolves.toEqual([]);
expect(assetMock.updateAll).toHaveBeenCalledWith([assetStub.hasDupe.id], { duplicateId: null });
});
});

describe('handleQueueSearchDuplicates', () => {
Expand Down
20 changes: 18 additions & 2 deletions server/src/services/duplicate.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,24 @@ import { usePagination } from 'src/utils/pagination';
export class DuplicateService extends BaseService {
async getDuplicates(auth: AuthDto): Promise<DuplicateResponseDto[]> {
const res = await this.assetRepository.getDuplicates({ userIds: [auth.user.id] });

return mapDuplicateResponse(res.map((a) => mapAsset(a, { auth, withStack: true })));
const uniqueAssetIds: string[] = [];
Copy link
Member

@bo0tzz bo0tzz Oct 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naming nitpick: These aren't necessarily unique, right (more accurately, all assetIds are unique)? Not sure what a better name would be though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

singletonDuplicateIds?

const duplicates = mapDuplicateResponse(res.map((a) => mapAsset(a, { auth, withStack: true }))).filter(
(duplicate) => {
if (duplicate.assets.length === 1) {
uniqueAssetIds.push(duplicate.assets[0].id);
return false;
}
return true;
},
);
if (uniqueAssetIds.length > 0) {
try {
await this.assetRepository.updateAll(uniqueAssetIds, { duplicateId: null });
} catch (error: any) {
this.logger.error(`Failed to remove duplicateId from assets: ${error.message}`);
}
}
return duplicates;
}

async handleQueueSearchDuplicates({ force }: IBaseJob): Promise<JobStatus> {
Expand Down
Loading