Skip to content

Commit 168c556

Browse files
committed
feat: remove syncedAt logic
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent 60dfc43 commit 168c556

2 files changed

Lines changed: 6 additions & 23 deletions

File tree

services/apps/automatic_projects_discovery_worker/src/activities/activities.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { parse } from 'csv-parse'
22

3-
import {
4-
bulkUpsertProjectCatalog,
5-
findLatestProjectCatalogSyncedAt,
6-
} from '@crowd/data-access-layer'
3+
import { bulkInsertProjectCatalog } from '@crowd/data-access-layer'
74
import { IDbProjectCatalogCreate } from '@crowd/data-access-layer/src/project-catalog/types'
85
import { pgpQx } from '@crowd/data-access-layer/src/queryExecutor'
96
import { getServiceLogger } from '@crowd/logging'
@@ -23,13 +20,9 @@ export async function listSources(): Promise<string[]> {
2320
export async function listDatasets(sourceName: string): Promise<IDatasetDescriptor[]> {
2421
const source = getSource(sourceName)
2522

26-
const qx = pgpQx(svc.postgres.reader.connection())
27-
const latestSyncedAt = await findLatestProjectCatalogSyncedAt(qx)
28-
const scoredAfter = latestSyncedAt ? latestSyncedAt.slice(0, 10) : undefined
23+
log.info({ sourceName }, 'Listing datasets.')
2924

30-
log.info({ sourceName, scoredAfter: scoredAfter ?? 'none (full fetch)' }, 'Listing datasets.')
31-
32-
const datasets = await source.listAvailableDatasets({ scoredAfter })
25+
const datasets = await source.listAvailableDatasets()
3326

3427
log.info({ sourceName, count: datasets.length, newest: datasets[0]?.id }, 'Datasets listed.')
3528

@@ -104,7 +97,7 @@ export async function processDataset(
10497
if (batch.length >= BATCH_SIZE) {
10598
batchNumber++
10699

107-
await bulkUpsertProjectCatalog(qx, batch)
100+
await bulkInsertProjectCatalog(qx, batch)
108101
totalProcessed += batch.length
109102
batch = []
110103

@@ -119,7 +112,7 @@ export async function processDataset(
119112
{ sourceName, datasetId: dataset.id, batchSize: batch.length },
120113
'Flushing final batch...',
121114
)
122-
await bulkUpsertProjectCatalog(qx, batch)
115+
await bulkInsertProjectCatalog(qx, batch)
123116
totalProcessed += batch.length
124117
}
125118

services/libs/data-access-layer/src/project-catalog/projectCatalog.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,6 @@ export async function countProjectCatalog(qx: QueryExecutor): Promise<number> {
8686
return parseInt(result.count, 10)
8787
}
8888

89-
export async function findLatestProjectCatalogSyncedAt(qx: QueryExecutor): Promise<string | null> {
90-
const result = await qx.selectOneOrNone(
91-
`
92-
SELECT MAX("syncedAt") AS "latestSyncedAt"
93-
FROM "projectCatalog"
94-
WHERE "lfCriticalityScore" IS NOT NULL
95-
`,
96-
)
97-
return result?.latestSyncedAt ?? null
98-
}
99-
10089
export async function insertProjectCatalog(
10190
qx: QueryExecutor,
10291
data: IDbProjectCatalogCreate,
@@ -175,6 +164,7 @@ export async function bulkInsertProjectCatalog(
175164
"ossfCriticalityScore" double precision,
176165
"lfCriticalityScore" double precision
177166
)
167+
ON CONFLICT ("repoUrl") DO NOTHING
178168
`,
179169
{ values: JSON.stringify(values) },
180170
)

0 commit comments

Comments
 (0)