Domain Interactions - Fixed: Unnecesary dependency on Intent.Common.UnitOfWork module causing errors when the module isn't installed.

Author: garethbaars

Modules/Intent.Modules.Application.DomainInteractions/Intent.Application.DomainInteractions.imodspec

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Application.DomainInteractions</id>
-  <version>1.1.6-pre.0</version>
+  <version>1.1.6-pre.1</version>
   <supportedClientVersions>[4.5.15-a,5.0.0)</supportedClientVersions>
   <summary>Provides interaction strategies to generate domain interaction implementations.</summary>
   <description>Provides interaction strategies to generate domain interaction implementations.</description>

Modules/Intent.Modules.Application.DomainInteractions/Intent.Modules.Application.DomainInteractions.csproj

@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Intent.Modules.Common.UnitOfWork\Settings\ModuleSettingsExtensions.cs" Link="Settings\ModuleSettingsExtensions.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.9.6" />
     <PackageReference Include="Intent.Modules.Common.Types" Version="4.0.0" />
@@ -24,4 +28,8 @@
     <ProjectReference Include="..\Intent.Modules.Constants\Intent.Modules.Constants.csproj" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Settings\" />
+  </ItemGroup>
+
 </Project>

Modules/Intent.Modules.Application.DomainInteractions/InteractionStrategies/DeleteEntityInteractionStrategy.cs

@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using Intent.Modules.Common.UnitOfWork.Settings;
 using static Intent.Modules.Constants.TemplateRoles.Domain;
 
 namespace Intent.Modules.Application.DomainInteractions.InteractionStrategies
@@ -35,13 +36,13 @@ public void ImplementInteraction(ICSharpClassMethodDeclaration method, IElement
                 ? queryContext.GetDtoProjectionReturnType()
                 : null;
 
-            method.AddStatements(method.GetQueryStatements(
+            method.AddStatements(ExecutionPhases.Retrieval, method.GetQueryStatements(
                 dataAccessProvider: dataAccess,
-                interaction: interaction, 
+                interaction: interaction,
                 foundEntity: foundEntity,
                 projectedType: projectedType));
 
-            method.AddStatement(string.Empty);
+            method.AddStatement(ExecutionPhases.Retrieval, string.Empty);
 
             var deleteAction = interaction.AsDeleteEntityActionTargetEndModel();
             try
@@ -59,14 +60,14 @@ public void ImplementInteraction(ICSharpClassMethodDeclaration method, IElement
                     statements.Add(entityDetails.DataAccessProvider.Remove(entityDetails.VariableName)
                         .SeparatedFromPrevious());
                 }
-                method.AddStatements(statements);
-                // Unit Of Work Module Auto Save Changes disabled?
-                if (bool.TryParse(method.Class.File.Template.ExecutionContext.GetSettings().GetGroup("c4b7e545-eaac-42bc-8f06-2768ac8dad99").GetSetting("d6338b7c-b0f9-46bd-8dbb-3c745d5f8623").Value, out bool uowAutoSaveOff))
+                method.AddStatements(ExecutionPhases.BusinessLogic, statements);
+
+                var automaticallyPersistUnitOfWork = method.Class.File.Template.ExecutionContext.GetSettings()
+                    .GetUnitOfWorkSettings()?.AutomaticallyPersistUnitOfWork() ?? true;
+                var saveAlreadyCalled = method.FindStatement(x => x.ToString().Trim().Contains(entityDetails.DataAccessProvider.SaveChangesAsync().ToString().Trim())) != null;
+                if (!saveAlreadyCalled && !automaticallyPersistUnitOfWork)
                 {
-                    if (!uowAutoSaveOff)
-                    {
-                        method.AddStatement(ExecutionPhases.Persistence, new CSharpStatement($"{entityDetails.DataAccessProvider.SaveChangesAsync()}"));
-                    }
+                    method.AddStatement(ExecutionPhases.Persistence, new CSharpStatement($"{entityDetails.DataAccessProvider.SaveChangesAsync()}"));
                 }
             }
             catch (Exception ex)

Modules/Intent.Modules.Application.DomainInteractions/InteractionStrategies/UpdateEntityInteractionStrategy.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Intent.Exceptions;
+using Intent.Exceptions;
 using Intent.Metadata.Models;
 using Intent.Modelers.Domain.Api;
 using Intent.Modelers.Services.DomainInteractions.Api;
@@ -11,7 +8,11 @@
 using Intent.Modules.Common.CSharp.Interactions;
 using Intent.Modules.Common.CSharp.Templates;
 using Intent.Modules.Common.Templates;
+using Intent.Modules.Common.UnitOfWork.Settings;
 using Intent.Modules.Constants;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Intent.Modules.Application.DomainInteractions.InteractionStrategies
 {
@@ -35,13 +36,13 @@ public void ImplementInteraction(ICSharpClassMethodDeclaration method, IElement
                 ? queryContext.GetDtoProjectionReturnType()
                 : null;
 
-            method.AddStatements(method.GetQueryStatements(
+            method.AddStatements(ExecutionPhases.Retrieval, method.GetQueryStatements(
                 dataAccessProvider: dataAccess,
                 interaction: interaction,
                 foundEntity: foundEntity,
                 projectedType: projectedType));
 
-            method.AddStatement(string.Empty);
+            method.AddStatement(ExecutionPhases.Retrieval, string.Empty);
 
             var updateAction = interaction.AsUpdateEntityActionTargetEndModel();
             var csharpMapping = method.GetMappingManager();
@@ -92,16 +93,16 @@ public void ImplementInteraction(ICSharpClassMethodDeclaration method, IElement
                     statements.Add(entityDetails.DataAccessProvider.Update(entityDetails.VariableName)
                         .SeparatedFromPrevious());
                 }
-                else // Unit Of Work Module Auto Save Changes disabled?
-                if (bool.TryParse(method.Class.File.Template.ExecutionContext.GetSettings().GetGroup("c4b7e545-eaac-42bc-8f06-2768ac8dad99").GetSetting("d6338b7c-b0f9-46bd-8dbb-3c745d5f8623").Value, out bool uowAutoSaveOff))
+
+                method.AddStatements(ExecutionPhases.BusinessLogic, statements);
+
+                var automaticallyPersistUnitOfWork = method.Class.File.Template.ExecutionContext.GetSettings()
+                    .GetUnitOfWorkSettings()?.AutomaticallyPersistUnitOfWork() ?? true;
+                var saveAlreadyCalled = method.FindStatement(x => x.ToString().Trim().Contains(entityDetails.DataAccessProvider.SaveChangesAsync().ToString().Trim())) != null;
+                if (!saveAlreadyCalled && !automaticallyPersistUnitOfWork)
                 {
-                    if (!uowAutoSaveOff)
-                    {
-                        method.AddStatement(ExecutionPhases.Persistence, new CSharpStatement($"{entityDetails.DataAccessProvider.SaveChangesAsync()}"));
-                    }
+                    method.AddStatement(ExecutionPhases.Persistence, new CSharpStatement($"{entityDetails.DataAccessProvider.SaveChangesAsync()}"));
                 }
-
-                method.AddStatements(statements);
             }
             catch (Exception ex)
             {

Modules/Intent.Modules.Application.DomainInteractions/release-notes.md

@@ -1,6 +1,7 @@
 ### Version 1.1.6
 
 - Improvement: Improved error message when `ProjectTo` is selected as the query strategy with an unsupporting provider (mapperly)
+- Fixed: Unnecesary dependency on `Intent.Common.UnitOfWork` module causing errors when the module isn't installed.
 
 ### Version 1.1.5