Added ability to work within a transaction

daryllabar · Nov 2, 2017 · eb55271 · eb55271
1 parent 33644de
commit eb55271
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 16 deletions.
diff --git a/DLaB.XrmAutoNumberGenerator/AutoNumberIncrementor.cs b/DLaB.XrmAutoNumberGenerator/AutoNumberIncrementor.cs
@@ -75,7 +75,7 @@ private string GetKey(LocalPluginContext context, string name)
 
         protected override void ExecuteInternal(LocalPluginContext context)
         {
-            if (string.IsNullOrWhiteSpace(UnsecureConfig) && !context.IsInTransaction)
+            if (string.IsNullOrWhiteSpace(UnsecureConfig))
             {
                 ExecuteForEntity(context, context.GetTarget<Entity>());
             }
@@ -219,7 +219,7 @@ public void EnqueueBatch(LocalPluginContext context)
                 {
                     try
                     {
-                        Setting = dlab_AutoNumbering.EnqueueNextBatch(context.SystemOrganizationService, Setting, AutoNumberBatch, context.TracingService);
+                        Setting = dlab_AutoNumbering.EnqueueNextBatch(context.SystemOrganizationService, Setting, AutoNumberBatch, context.TracingService, context.IsInTransaction);
                         context.Trace("Successfully enqueued batch");
                         break;
                     }

diff --git a/DLaB.XrmAutoNumberGenerator/Entities/EntityExtensions/dlab_AutoNumbering.cs b/DLaB.XrmAutoNumberGenerator/Entities/EntityExtensions/dlab_AutoNumbering.cs
@@ -36,18 +36,39 @@ partial class dlab_AutoNumbering
         /// Queues the generated values in the Batch using the settings.  Returns the most current Setting Value
         /// </summary>
         /// <returns></returns>
-        public static dlab_AutoNumbering EnqueueNextBatch(IOrganizationService service, dlab_AutoNumbering setting, Queue<string> queue, ITracingService log)
+        public static dlab_AutoNumbering EnqueueNextBatch(IOrganizationService service, dlab_AutoNumbering setting, Queue<string> queue, ITracingService log, bool isInTransaction)
         {
             int currentNumber;
-            if (string.IsNullOrWhiteSpace(setting.RowVersion))
+            if (string.IsNullOrWhiteSpace(setting.RowVersion) || isInTransaction)
             {
-                // Some older versions of CRM don't contain RowVersions
-                log.Trace("No Row Version found.  Performing Non-Thread Safe Update.");
+                if (isInTransaction)
+                {
+                    log.Trace("Executing within transaction, Can't use the OptimisticUpdate.  Falling Back to Manual Database Lock");
+                }
+                else
+                {
+                    // Some older versions of CRM don't contain RowVersions
+                    log.Trace("No Row Version found.  Performing Non-Thread Safe Update.");
+                }
+
+                var stopwatch = new System.Diagnostics.Stopwatch();
+                stopwatch.Start();
+                // Update Entity to lock it
+                service.Update(new dlab_AutoNumbering
+                {
+                    Id = setting.Id,
+                    dlab_EntityName = setting.dlab_EntityName
+                });
+
                 setting = service.GetEntity<dlab_AutoNumbering>(setting.Id);
                 currentNumber = setting.IncrementNextNumber();
                 log.Trace("Grabbing values {0} to {1} and updating setting.", currentNumber, setting.dlab_NextNumber - 1);
                 service.Update(setting.CreateUpdateNextNumberEntity());
                 setting.EnqueueBatchValues(queue, currentNumber);
+
+                stopwatch.Stop();
+
+                log.Trace($"Time to retrieve and Update AutoNumber {stopwatch.ElapsedMilliseconds} ms");
                 return setting;
             }
 

diff --git a/DLaB.XrmAutoNumberGenerator/Properties/AssemblyInfo.cs b/DLaB.XrmAutoNumberGenerator/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
+[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyFileVersion("1.0.0.5")]
diff --git a/Solutions/AutoNumberGenerator.zip b/Solutions/AutoNumberGenerator.zip
diff --git a/Solutions/AutoNumberGenerator/Other/Solution.xml b/Solutions/AutoNumberGenerator/Other/Solution.xml
@@ -8,7 +8,7 @@
     <Descriptions>
       <Description description="Allows for defining Auto-Numbering for any entity / field" languagecode="1033" />
     </Descriptions>
-    <Version>1.0.0.4</Version>
+    <Version>1.0.0.5</Version>
     <Managed>2</Managed>
     <Publisher>
       <UniqueName>daryllabar</UniqueName>
@@ -86,7 +86,7 @@
       <RootComponent type="61" schemaName="dlab_/images/ticket_16.png" behavior="0" />
       <RootComponent type="61" schemaName="dlab_/images/ticket_32.png" behavior="0" />
       <RootComponent type="61" schemaName="dlab_/scripts/DLaB.AutoNumbering.js" behavior="0" />
-      <RootComponent type="91" schemaName="DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" behavior="0" />
+      <RootComponent type="91" schemaName="DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" behavior="0" />
       <RootComponent type="92" id="{2a15647f-96ab-e511-80e1-6c3be5a8a258}" behavior="0" />
       <RootComponent type="92" id="{a63ed0d8-96ab-e511-80e1-6c3be5a852b0}" behavior="0" />
       <RootComponent type="92" id="{f37f2291-96ab-e511-80e1-6c3be5a8a258}" behavior="0" />

diff --git a/...rmAutoNumberGenerator-CD48BA08-B1E2-4824-927C-C3E0441A298A/DLaBXrmAutoNumberGenerator.dll b/...rmAutoNumberGenerator-CD48BA08-B1E2-4824-927C-C3E0441A298A/DLaBXrmAutoNumberGenerator.dll
diff --git a/...berGenerator-CD48BA08-B1E2-4824-927C-C3E0441A298A/DLaBXrmAutoNumberGenerator.dll.data.xml b/...berGenerator-CD48BA08-B1E2-4824-927C-C3E0441A298A/DLaBXrmAutoNumberGenerator.dll.data.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PluginAssembly FullName="DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" CustomizationLevel="1">
+<PluginAssembly FullName="DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" CustomizationLevel="1">
   <IsolationMode>2</IsolationMode>
   <SourceType>0</SourceType>
   <IntroducedVersion>1.0</IntroducedVersion>
   <FileName>/PluginAssemblies/DLaBXrmAutoNumberGenerator-CD48BA08-B1E2-4824-927C-C3E0441A298A/DLaBXrmAutoNumberGenerator.dll</FileName>
   <PluginTypes>
-    <PluginType AssemblyQualifiedName="DLaB.XrmAutoNumberGenerator.AutoNumberIncrementor, DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" Name="DLaB.XrmAutoNumberGenerator.AutoNumberIncrementor">
+    <PluginType AssemblyQualifiedName="DLaB.XrmAutoNumberGenerator.AutoNumberIncrementor, DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" Name="DLaB.XrmAutoNumberGenerator.AutoNumberIncrementor">
       <FriendlyName>ac415b12-2085-4c41-8d2e-2046a6398f88</FriendlyName>
     </PluginType>
-    <PluginType AssemblyQualifiedName="DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" Name="DLaB.XrmAutoNumberGenerator.AutoNumberRegister">
+    <PluginType AssemblyQualifiedName="DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89" Name="DLaB.XrmAutoNumberGenerator.AutoNumberRegister">
       <FriendlyName>f538c8e0-d228-4ecf-a58e-f6f52f04f5fa</FriendlyName>
     </PluginType>
   </PluginTypes>

diff --git a/.../AutoNumberGenerator/SdkMessageProcessingSteps/{2a15647f-96ab-e511-80e1-6c3be5a8a258}.xml b/.../AutoNumberGenerator/SdkMessageProcessingSteps/{2a15647f-96ab-e511-80e1-6c3be5a8a258}.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <SdkMessageProcessingStep Name="DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Create of dlab_autonumbering" SdkMessageProcessingStepId="{2a15647f-96ab-e511-80e1-6c3be5a8a258}">
-  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
+  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
   <PrimaryEntity>dlab_autonumbering</PrimaryEntity>
   <AsyncAutoDelete>0</AsyncAutoDelete>
   <Description>DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Create of dlab_autonumbering</Description>

diff --git a/.../AutoNumberGenerator/SdkMessageProcessingSteps/{a63ed0d8-96ab-e511-80e1-6c3be5a852b0}.xml b/.../AutoNumberGenerator/SdkMessageProcessingSteps/{a63ed0d8-96ab-e511-80e1-6c3be5a852b0}.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <SdkMessageProcessingStep Name="DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Update of dlab_autonumbering" SdkMessageProcessingStepId="{a63ed0d8-96ab-e511-80e1-6c3be5a852b0}">
-  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
+  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
   <PrimaryEntity>dlab_autonumbering</PrimaryEntity>
   <AsyncAutoDelete>0</AsyncAutoDelete>
   <Description>DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Update of dlab_autonumbering</Description>

diff --git a/.../AutoNumberGenerator/SdkMessageProcessingSteps/{f37f2291-96ab-e511-80e1-6c3be5a8a258}.xml b/.../AutoNumberGenerator/SdkMessageProcessingSteps/{f37f2291-96ab-e511-80e1-6c3be5a8a258}.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <SdkMessageProcessingStep Name="DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Delete of dlab_autonumbering" SdkMessageProcessingStepId="{f37f2291-96ab-e511-80e1-6c3be5a8a258}">
-  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.4, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
+  <PluginTypeName>DLaB.XrmAutoNumberGenerator.AutoNumberRegister, DLaB.XrmAutoNumberGenerator, Version=1.0.0.5, Culture=neutral, PublicKeyToken=f7aa25e7f5f86d89</PluginTypeName>
   <PrimaryEntity>dlab_autonumbering</PrimaryEntity>
   <AsyncAutoDelete>0</AsyncAutoDelete>
   <Description>DLaB.XrmAutoNumberGenerator.AutoNumberRegister: Delete of dlab_autonumbering</Description>

diff --git a/Solutions/AutoNumberGenerator_managed.zip b/Solutions/AutoNumberGenerator_managed.zip