Skip to content

Commit 1dc95a4

Browse files
committed
fix: set syncedAt when inserting the projects
Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>
1 parent 87e6a04 commit 1dc95a4

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

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

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

3-
import { bulkInsertProjectCatalog } from '@crowd/data-access-layer'
3+
import { bulkUpsertProjectCatalog } from '@crowd/data-access-layer'
44
import { IDbProjectCatalogCreate } from '@crowd/data-access-layer/src/project-catalog/types'
55
import { pgpQx } from '@crowd/data-access-layer/src/queryExecutor'
66
import { getServiceLogger } from '@crowd/logging'
@@ -97,7 +97,7 @@ export async function processDataset(
9797
if (batch.length >= BATCH_SIZE) {
9898
batchNumber++
9999

100-
await bulkInsertProjectCatalog(qx, batch)
100+
await bulkUpsertProjectCatalog(qx, batch)
101101
totalProcessed += batch.length
102102
batch = []
103103

@@ -112,7 +112,7 @@ export async function processDataset(
112112
{ sourceName, datasetId: dataset.id, batchSize: batch.length },
113113
'Flushing final batch...',
114114
)
115-
await bulkInsertProjectCatalog(qx, batch)
115+
await bulkUpsertProjectCatalog(qx, batch)
116116
totalProcessed += batch.length
117117
}
118118

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ export async function insertProjectCatalog(
9999
"ossfCriticalityScore",
100100
"lfCriticalityScore",
101101
"createdAt",
102-
"updatedAt"
102+
"updatedAt",
103+
"syncedAt"
103104
)
104105
VALUES (
105106
$(projectSlug),
@@ -108,6 +109,7 @@ export async function insertProjectCatalog(
108109
$(ossfCriticalityScore),
109110
$(lfCriticalityScore),
110111
NOW(),
112+
NOW(),
111113
NOW()
112114
)
113115
RETURNING ${prepareSelectColumns(PROJECT_CATALOG_COLUMNS)}
@@ -147,7 +149,8 @@ export async function bulkInsertProjectCatalog(
147149
"ossfCriticalityScore",
148150
"lfCriticalityScore",
149151
"createdAt",
150-
"updatedAt"
152+
"updatedAt",
153+
"syncedAt"
151154
)
152155
SELECT
153156
v."projectSlug",
@@ -156,6 +159,7 @@ export async function bulkInsertProjectCatalog(
156159
v."ossfCriticalityScore"::double precision,
157160
v."lfCriticalityScore"::double precision,
158161
NOW(),
162+
NOW(),
159163
NOW()
160164
FROM jsonb_to_recordset($(values)::jsonb) AS v(
161165
"projectSlug" text,
@@ -183,7 +187,8 @@ export async function upsertProjectCatalog(
183187
"ossfCriticalityScore",
184188
"lfCriticalityScore",
185189
"createdAt",
186-
"updatedAt"
190+
"updatedAt",
191+
"syncedAt"
187192
)
188193
VALUES (
189194
$(projectSlug),
@@ -192,14 +197,16 @@ export async function upsertProjectCatalog(
192197
$(ossfCriticalityScore),
193198
$(lfCriticalityScore),
194199
NOW(),
200+
NOW(),
195201
NOW()
196202
)
197203
ON CONFLICT ("repoUrl") DO UPDATE SET
198204
"projectSlug" = EXCLUDED."projectSlug",
199205
"repoName" = EXCLUDED."repoName",
200206
"ossfCriticalityScore" = COALESCE(EXCLUDED."ossfCriticalityScore", "projectCatalog"."ossfCriticalityScore"),
201207
"lfCriticalityScore" = COALESCE(EXCLUDED."lfCriticalityScore", "projectCatalog"."lfCriticalityScore"),
202-
"updatedAt" = NOW()
208+
"updatedAt" = NOW(),
209+
"syncedAt" = NOW()
203210
RETURNING ${prepareSelectColumns(PROJECT_CATALOG_COLUMNS)}
204211
`,
205212
{
@@ -237,7 +244,8 @@ export async function bulkUpsertProjectCatalog(
237244
"ossfCriticalityScore",
238245
"lfCriticalityScore",
239246
"createdAt",
240-
"updatedAt"
247+
"updatedAt",
248+
"syncedAt"
241249
)
242250
SELECT
243251
v."projectSlug",
@@ -246,6 +254,7 @@ export async function bulkUpsertProjectCatalog(
246254
v."ossfCriticalityScore"::double precision,
247255
v."lfCriticalityScore"::double precision,
248256
NOW(),
257+
NOW(),
249258
NOW()
250259
FROM jsonb_to_recordset($(values)::jsonb) AS v(
251260
"projectSlug" text,
@@ -259,7 +268,8 @@ export async function bulkUpsertProjectCatalog(
259268
"repoName" = EXCLUDED."repoName",
260269
"ossfCriticalityScore" = COALESCE(EXCLUDED."ossfCriticalityScore", "projectCatalog"."ossfCriticalityScore"),
261270
"lfCriticalityScore" = COALESCE(EXCLUDED."lfCriticalityScore", "projectCatalog"."lfCriticalityScore"),
262-
"updatedAt" = NOW()
271+
"updatedAt" = NOW(),
272+
"syncedAt" = NOW()
263273
`,
264274
{ values: JSON.stringify(values) },
265275
)

0 commit comments

Comments
 (0)