Skip to content

Commit

Permalink
Fix contributor website import script (#8404)
Browse files Browse the repository at this point in the history
We had duplicate entries in the database for issueLabels/ prLabels
  • Loading branch information
FelixMalfait authored Nov 8, 2024
1 parent f06cdbd commit b2004fe
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 12 deletions.
5 changes: 5 additions & 0 deletions packages/twenty-website/src/database/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const insertMany = async (
options?: {
onConflictKey?: string;
onConflictUpdateObject?: any;
onConflictDoNothing?: boolean;
},
) => {
const query = pgDb.insert(model).values(data);
Expand All @@ -50,6 +51,10 @@ const insertMany = async (
}
}

if (options?.onConflictDoNothing && !options?.onConflictKey) {
return query.onConflictDoNothing().execute();
}

if (options?.onConflictKey) {
return query
.onConflictDoNothing({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ export async function getLatestUpdate() {
desc(pullRequestModel.updatedAt),
);
const latestIssue = await findOne(issueModel, desc(issueModel.updatedAt));
const prDate = new Date(latestPR[0].updatedAt);
const issueDate = new Date(latestIssue[0].updatedAt);
const prDate = latestPR[0]
? new Date(latestPR[0].updatedAt)
: new Date('2023-01-01');
const issueDate = latestIssue[0]
? new Date(latestIssue[0].updatedAt)
: new Date('2023-01-01');
return (prDate > issueDate ? prDate : issueDate).toISOString();
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,18 @@ export async function saveIssuesToDB(
},
},
);
await insertMany(issueLabelModel, [
await insertMany(
issueLabelModel,
[
{
issueId: issue.id,
labelId: label.id,
},
],
{
pullRequestId: issue.id,
labelId: label.id,
onConflictDoNothing: true,
},
]);
);
}
}
}
14 changes: 10 additions & 4 deletions packages/twenty-website/src/github/contributors/save-prs-to-db.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,18 @@ export async function savePRsToDB(
},
},
);
await insertMany(pullRequestLabelModel, [
await insertMany(
pullRequestLabelModel,
[
{
pullRequestId: pr.id,
labelId: label.id,
},
],
{
pullRequestId: pr.id,
labelId: label.id,
onConflictDoNothing: true,
},
]);
);
}
}
}
2 changes: 1 addition & 1 deletion packages/twenty-website/src/github/execute-partial-sync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const executePartialSync = async () => {
return new Error('No GitHub token provided');
}

console.log('Synching data..');
console.log('Syncing data... (partial sync)');

const query = graphql.defaults({
headers: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const fetchAndSaveGithubData = async () => {
return new Error('No GitHub token provided');
}

console.log('Synching data..');
console.log('Syncing data...');

const query = graphql.defaults({
headers: {
Expand Down

0 comments on commit b2004fe

Please sign in to comment.