Merge pull request #18 from marcduiker/develop

Develop
marcduiker · Apr 19, 2019 · 4fed300 · 4fed300
2 parents c2e7532 + 8d6b10f
commit 4fed300
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/AzureFunctionsUpdates/Activities/Publications/GetLatestPublicationFromHistory.cs b/src/AzureFunctionsUpdates/Activities/Publications/GetLatestPublicationFromHistory.cs
@@ -14,12 +14,12 @@ public class GetLatestPublicationFromHistory
         [StorageAccount(Configuration.ConnectionName)]
         public async Task<Publication> Run(
             [ActivityTrigger] PublicationConfiguration publicationConfiguration,
-            [Table(Configuration.Releases.TableName)] CloudTable table,
+            [Table(Configuration.Publications.TableName)] CloudTable table,
             ILogger logger)
         {
             logger.LogInformation($"Started {nameof(GetLatestPublicationFromHistory)} for { publicationConfiguration.PublicationSourceOwner } { publicationConfiguration.PublicationSourceName }.");
 
-            Publication latestKnownPublication = null;            
+            Publication latestKnownPublication = null;
             var query = QueryBuilder<Publication>.CreateQueryForPartitionKey(publicationConfiguration.PublicationSourceName);
             var queryResult = await table.ExecuteQuerySegmentedAsync(query, null);
             latestKnownPublication = queryResult.Results.AsReadOnly().OrderByDescending(publication => publication.PublicationDate).FirstOrDefault();

diff --git a/src/AzureFunctionsUpdates/Activities/RepositoryReleases/GetLatestReleaseFromHistory.cs b/src/AzureFunctionsUpdates/Activities/RepositoryReleases/GetLatestReleaseFromHistory.cs
@@ -19,11 +19,18 @@ public class GetLatestReleaseFromHistory
         {
             logger.LogInformation($"Started {nameof(GetLatestReleaseFromHistory)} for { repoConfiguration.RepositoryOwner } { repoConfiguration.RepositoryName }.");
 
-            RepositoryRelease latestKnownRelease = null;            
+            RepositoryRelease latestKnownRelease = null;
             var query = QueryBuilder<RepositoryRelease>.CreateQueryForPartitionKey(repoConfiguration.RepositoryName);
             var queryResult = await table.ExecuteQuerySegmentedAsync(query, null);
             latestKnownRelease = queryResult.Results.AsReadOnly().OrderByDescending(release => release.CreatedAt).FirstOrDefault();
-
+
+            if (latestKnownRelease != null)
+            {
+                logger.LogInformation($"Found release in history for configuration: {repoConfiguration.RepositoryName}, " +
+                                      $"Release ID: {latestKnownRelease.ReleaseId}," +
+                                      $"ReleaseCreatedAt: {latestKnownRelease.ReleaseCreatedAt:F}.");
+            }
+
             return latestKnownRelease ?? new NullRelease(repoConfiguration.RepositoryName);
         }
     }

diff --git a/src/AzureFunctionsUpdates/Storage/QueryBuilder.cs b/src/AzureFunctionsUpdates/Storage/QueryBuilder.cs
@@ -6,8 +6,9 @@ public static class QueryBuilder<T> where T : TableEntity, new()
     {
         public static TableQuery<T> CreateQueryForPartitionKey(string partitionKey)
         {
+            var sanitizedPartitionKey = KeyFormatter.SanitizeKey(partitionKey);
             return new TableQuery<T>()
-                .Where(GetFilterConditionWhichEqualsPartitionKey(partitionKey));
+                .Where(GetFilterConditionWhichEqualsPartitionKey(sanitizedPartitionKey));
         }
 
         private static string GetFilterConditionWhichEqualsPartitionKey(string partitionKey)