From 987ac611bbb1ea0d23afc7e2067954fd8eeb5235 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 28 Oct 2024 12:10:35 +0700 Subject: [PATCH] Now use project ID, not code, in CrdtMerge API --- backend/CrdtMerge/Program.cs | 10 +++++----- backend/CrdtMerge/ProjectLookupService.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/CrdtMerge/Program.cs b/backend/CrdtMerge/Program.cs index 3daeca871a..97b50673cf 100644 --- a/backend/CrdtMerge/Program.cs +++ b/backend/CrdtMerge/Program.cs @@ -46,20 +46,20 @@ ProjectsService projectsService, ProjectLookupService projectLookupService, CrdtFwdataProjectSyncService syncService, - string projectCode, + Guid projectId, bool dryRun = false) { - logger.LogInformation("About to execute sync request for {projectCode}", projectCode); + logger.LogInformation("About to execute sync request for {projectId}", projectId); if (dryRun) { logger.LogInformation("Dry run, not actually syncing"); return TypedResults.Ok(new CrdtFwdataProjectSyncService.SyncResult(0, 0)); } - var projectId = await projectLookupService.GetProjectId(projectCode); - if (projectId is null) + var projectCode = await projectLookupService.GetProjectCode(projectId); + if (projectCode is null) { - logger.LogError("Project code {projectCode} not found", projectCode); + logger.LogError("Project ID {projectId} not found", projectId); return TypedResults.NotFound(); } diff --git a/backend/CrdtMerge/ProjectLookupService.cs b/backend/CrdtMerge/ProjectLookupService.cs index 2301fc888e..ac8244e992 100644 --- a/backend/CrdtMerge/ProjectLookupService.cs +++ b/backend/CrdtMerge/ProjectLookupService.cs @@ -5,12 +5,12 @@ namespace CrdtMerge; public class ProjectLookupService(LexBoxDbContext dbContext) { - public async ValueTask GetProjectId(string projectCode) + public async ValueTask GetProjectCode(Guid projectId) { - var projectId = await dbContext.Projects - .Where(p => p.Code == projectCode) - .Select(p => p.Id) + var projectCode = await dbContext.Projects + .Where(p => p.Id == projectId) + .Select(p => p.Code) .FirstOrDefaultAsync(); - return projectId; + return projectCode; } }