From 59bea70f1562ed3f158366343e7514380f41a188 Mon Sep 17 00:00:00 2001 From: "john.cyril" Date: Thu, 15 Jul 2021 11:25:47 +0100 Subject: [PATCH] Renamed Id property to Identifier as Id is a reserved keyword in AzureTable on cosmos --- src/BaGet.Azure/Table/PackageEntity.cs | 2 +- src/BaGet.Azure/Table/TableOperationBuilder.cs | 2 +- src/BaGet.Azure/Table/TablePackageService.cs | 2 +- src/BaGet.Azure/Table/TableSearchService.cs | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/BaGet.Azure/Table/PackageEntity.cs b/src/BaGet.Azure/Table/PackageEntity.cs index 46e9a053d..11272f2a2 100644 --- a/src/BaGet.Azure/Table/PackageEntity.cs +++ b/src/BaGet.Azure/Table/PackageEntity.cs @@ -15,7 +15,7 @@ public PackageEntity() { } - public string Id { get; set; } + public string Identifier { get; set; } public string NormalizedVersion { get; set; } public string OriginalVersion { get; set; } public string Authors { get; set; } diff --git a/src/BaGet.Azure/Table/TableOperationBuilder.cs b/src/BaGet.Azure/Table/TableOperationBuilder.cs index db4742ad4..3f1a1cb7a 100644 --- a/src/BaGet.Azure/Table/TableOperationBuilder.cs +++ b/src/BaGet.Azure/Table/TableOperationBuilder.cs @@ -22,7 +22,7 @@ public TableOperation AddPackage(Package package) PartitionKey = package.Id.ToLowerInvariant(), RowKey = normalizedVersion.ToLowerInvariant(), - Id = package.Id, + Identifier = package.Id, NormalizedVersion = normalizedVersion, OriginalVersion = version.ToFullString(), Authors = JsonConvert.SerializeObject(package.Authors), diff --git a/src/BaGet.Azure/Table/TablePackageService.cs b/src/BaGet.Azure/Table/TablePackageService.cs index 40c68c287..6ab42ed86 100644 --- a/src/BaGet.Azure/Table/TablePackageService.cs +++ b/src/BaGet.Azure/Table/TablePackageService.cs @@ -221,7 +221,7 @@ private Package AsPackage(PackageEntity entity) return new Package { - Id = entity.Id, + Id = entity.Identifier, NormalizedVersionString = entity.NormalizedVersion, OriginalVersionString = entity.OriginalVersion, diff --git a/src/BaGet.Azure/Table/TableSearchService.cs b/src/BaGet.Azure/Table/TableSearchService.cs index 8aa6e7b3f..2664de31f 100644 --- a/src/BaGet.Azure/Table/TableSearchService.cs +++ b/src/BaGet.Azure/Table/TableSearchService.cs @@ -201,7 +201,7 @@ string GenerateIsFalse(string propertyName) private string ToAutocompleteResult(IReadOnlyList packages) { // TODO: This should find the latest version and return its package Id. - return packages.Last().Id; + return packages.Last().Identifier; } private SearchResult ToSearchResult(IReadOnlyList packages) @@ -218,7 +218,7 @@ private SearchResult ToSearchResult(IReadOnlyList packages) totalDownloads += package.Downloads; versions.Add(new SearchResultVersion { - RegistrationLeafUrl = _url.GetRegistrationLeafUrl(package.Id, version), + RegistrationLeafUrl = _url.GetRegistrationLeafUrl(package.Identifier, version), Version = package.NormalizedVersion, Downloads = package.Downloads, }); @@ -231,19 +231,19 @@ private SearchResult ToSearchResult(IReadOnlyList packages) } var iconUrl = latest.HasEmbeddedIcon - ? _url.GetPackageIconDownloadUrl(latest.Id, latestVersion) + ? _url.GetPackageIconDownloadUrl(latest.Identifier, latestVersion) : latest.IconUrl; return new SearchResult { - PackageId = latest.Id, + PackageId = latest.Identifier, Version = latest.NormalizedVersion, Description = latest.Description, Authors = JsonConvert.DeserializeObject(latest.Authors), IconUrl = iconUrl, LicenseUrl = latest.LicenseUrl, ProjectUrl = latest.ProjectUrl, - RegistrationIndexUrl = _url.GetRegistrationIndexUrl(latest.Id), + RegistrationIndexUrl = _url.GetRegistrationIndexUrl(latest.Identifier), Summary = latest.Summary, Tags = JsonConvert.DeserializeObject(latest.Tags), Title = latest.Title,