Fix company creation duplicate on email sync after introducing links type #6460
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
The pull request addresses the issue of duplicate company creation by standardizing domain name extraction.
- Type Annotation: Added type annotation for
companyDomainNameColumnNameinpackages/twenty-server/src/modules/company/repositories/company.repository.tsto enhance type safety. - Utility Replacement: Replaced
getCompanyDomainNamewithextractDomainFromLinkinpackages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.tsfor consistent domain extraction. - New Utility: Introduced
extractDomainFromLinkinpackages/twenty-server/src/modules/contact-creation-manager/utils/extract-domain-from-link.util.tsto standardize domain extraction from URLs.
3 file(s) reviewed, 5 comment(s)
Edit PR Review Bot Settings
| @@ -57,7 +57,7 @@ export class CompanyRepository { | |||
| public async createCompany( | |||
| workspaceId: string, | |||
| companyToCreate: CompanyToCreate, | |||
| companyDomainNameColumnName, | |||
| companyDomainNameColumnName: string, | |||
There was a problem hiding this comment.
style: Ensure companyDomainNameColumnName is always a valid column name to prevent SQL injection.
| @@ -7,8 +7,8 @@ import { v4 } from 'uuid'; | |||
| import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator'; | |||
| import { CompanyRepository } from 'src/modules/company/repositories/company.repository'; | |||
| import { CompanyWorkspaceEntity } from 'src/modules/company/standard-objects/company.workspace-entity'; | |||
| import { extractDomainFromLink } from 'src/modules/contact-creation-manager/utils/extract-domain-from-link.util'; | |||
There was a problem hiding this comment.
style: Ensure extractDomainFromLink handles all edge cases to avoid inconsistencies.
| @@ -55,7 +55,7 @@ export class CreateCompanyService { | |||
| }, | |||
| ) => ({ | |||
| ...acc, | |||
| [company.domainName]: company.id, | |||
| [extractDomainFromLink(company.domainName)]: company.id, | |||
There was a problem hiding this comment.
logic: Consider caching results of extractDomainFromLink if called frequently.
| @@ -64,7 +64,7 @@ export class CreateCompanyService { | |||
| (domainName) => | |||
| !existingCompanies.some( | |||
| (company: { domainName: string }) => | |||
| getCompanyDomainName(company) === domainName, | |||
| extractDomainFromLink(company.domainName) === domainName, | |||
There was a problem hiding this comment.
check: Verify that extractDomainFromLink correctly normalizes domain names.
| @@ -0,0 +1,5 @@ | |||
| export const extractDomainFromLink = (link: string) => { | |||
| const domain = link.replace(/^(https?:\/\/)?(www\.)?/i, '').split('/')[0]; | |||
There was a problem hiding this comment.
style: Consider using a more robust URL parsing library to handle edge cases and non-standard URLs.
ijreilly
approved these changes
Jul 30, 2024
bosiraphael
deleted the
fix-company-creation-duplicate-introduced-by-domain-name-migration
branch
charlesBochet
pushed a commit
that referenced
this pull request
Jul 31, 2024
…type (#6460) - Introduce `extractDomainFromLink` - Use is inside `create-company.service`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
extractDomainFromLinkcreate-company.service