Fixed the best ctor error and adds collection specific lease logic

Elfocrash · Nov 29, 2018 · d48c5f2 · d48c5f2
1 parent 0f36ace
commit d48c5f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttribute.cs b/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttribute.cs
@@ -8,7 +8,19 @@ namespace Cosmonaut.WebJobs.Extensions.Trigger
     [Binding]
     public sealed class CosmosStoreTriggerAttribute : Attribute
     {
-        public CosmosStoreTriggerAttribute(string databaseName, string overridenCollectionName = null)
+        public CosmosStoreTriggerAttribute(string databaseName)
+        {
+            if (string.IsNullOrWhiteSpace(databaseName))
+            {
+                throw new ArgumentException("Missing information for the collection to monitor", nameof(databaseName));
+            }
+
+            DatabaseName = databaseName;
+            LeaseCollectionName = CosmosStoreTriggerConstants.DefaultLeaseCollectionName;
+            LeaseDatabaseName = DatabaseName;
+        }
+
+        public CosmosStoreTriggerAttribute(string databaseName, string overridenCollectionName)
         {
             if (string.IsNullOrWhiteSpace(databaseName))
             {

diff --git a/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttributeBindingProvider.cs b/src/Cosmonaut.WebJobs.Extensions/Trigger/CosmosStoreTriggerAttributeBindingProvider.cs
@@ -236,10 +236,10 @@ internal string ResolveConnectionString(string unresolvedConnectionString, strin
         private ChangeFeedHostOptions ResolveLeaseOptions(CosmosStoreTriggerAttribute attribute)
         {
             var leasesOptions = _bindingOptions.LeaseOptions;
-
+            var entityType = typeof(T);
             var triggerChangeFeedHostOptions = new ChangeFeedHostOptions
             {
-                LeasePrefix = ResolveAttributeValue(attribute.LeaseCollectionPrefix) ?? leasesOptions.LeasePrefix,
+                LeasePrefix = ResolveAttributeValue(attribute.LeaseCollectionPrefix) ?? (entityType.UsesSharedCollection() ? $"{entityType.GetSharedCollectionName()}_{entityType.GetSharedCollectionEntityName()}_" : $"{entityType.GetCollectionName()}_"),
                 FeedPollDelay = ResolveTimeSpanFromMilliseconds(nameof(CosmosStoreTriggerAttribute.FeedPollDelay), leasesOptions.FeedPollDelay, attribute.FeedPollDelay),
                 LeaseAcquireInterval = ResolveTimeSpanFromMilliseconds(nameof(CosmosStoreTriggerAttribute.LeaseAcquireInterval), leasesOptions.LeaseAcquireInterval, attribute.LeaseAcquireInterval),
                 LeaseExpirationInterval = ResolveTimeSpanFromMilliseconds(nameof(CosmosStoreTriggerAttribute.LeaseExpirationInterval), leasesOptions.LeaseExpirationInterval, attribute.LeaseExpirationInterval),