- Internal Improvement: Preparing for future support for result pattern in mapping system.

Author: dandrejvv

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.7</version>
+  <version>1.1.8-pre.0</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>
@@ -16,16 +16,16 @@
   <moduleSettings></moduleSettings>
   <dependencies>
     <dependency id="Intent.Common" version="3.7.2" />
-    <dependency id="Intent.Common.CSharp" version="3.9.6" />
+    <dependency id="Intent.Common.CSharp" version="3.9.10-pre.0" />
     <dependency id="Intent.Common.Types" version="4.0.0" />
-    <dependency id="Intent.Modelers.Domain" version="3.9.0" />
+    <dependency id="Intent.Modelers.Domain" version="3.12.10-pre.0" />
     <dependency id="Intent.Modelers.Services" version="4.0.3" />
-    <dependency id="Intent.Modelers.Services.DomainInteractions" version="2.3.0" />
+    <dependency id="Intent.Modelers.Services.DomainInteractions" version="2.3.9-pre.0" />
   </dependencies>
   <interoperability>
     <detect id="Intent.Modelers.Services.DomainInteractions">
       <install>
-        <package id="Intent.Modelers.Services.DomainInteractions" version="2.2.0" />
+        <package id="Intent.Modelers.Services.DomainInteractions" version="2.3.9-pre.0" />
       </install>
     </detect>
     <detect id="Intent.Modelers.Services.EventInteractions">

Modules/Intent.Modules.Application.DomainInteractions/Intent.Metadata/Module Builder/Intent.Application.DomainInteractions/Intent.Application.DomainInteractions.pkg.config

@@ -33,7 +33,7 @@
       <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
       <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
       <properties>
-        <property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="1.1.7" isActive="true" />
+        <property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="1.1.8-pre.0" isActive="true" />
         <property name="177a2415-e749-46e7-8257-440e19ecfb5e" display="API Namespace" value="Intent.Modules.Application.Contracts.Api" isActive="true" />
         <property name="0d2ae582-090e-42d6-a7d6-689144433254" display="NuGet Package Id" isActive="true" />
         <property name="27cf6544-a9a2-4992-9fef-51d0ed49e66e" display="NuGet Package Version" value="" isActive="true" />

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>1.1.7</Version>
+    <Version>1.1.8-pre.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Modules/Intent.Modules.Application.DomainInteractions/Mapping/Resolvers/EntityCreationMappingTypeResolver.cs

@@ -1,4 +1,6 @@
-using Intent.Metadata.Models;
+using System;
+using System.Linq;
+using Intent.Metadata.Models;
 using Intent.Modelers.Domain.Api;
 using Intent.Modules.Common.CSharp.Mapping;
 using Intent.Modules.Common.CSharp.Templates;
@@ -39,7 +41,7 @@ public EntityCreationMappingTypeResolver(ICSharpFileBuilderTemplate sourceTempla
             return mapping;
         }
 
-        if (model.AsOperationModel()?.IsStatic == true && model.TypeReference.ElementId == ((IElement)model).ParentId)
+        if (IsStaticConstructor(model))
         {
             return new StaticMethodInvocationMapping(mappingModel, _sourceTemplate);
         }
@@ -61,4 +63,25 @@ public EntityCreationMappingTypeResolver(ICSharpFileBuilderTemplate sourceTempla
 
         return next?.Invoke(mappingModel);
     }
+
+    private static bool IsStaticConstructor(ICanBeReferencedType model)
+    {
+        if (model.AsOperationModel()?.IsStatic != true)
+        {
+            return false;
+        }
+
+        var entityId = ((IElement)model).ParentId;
+        var operationReturnTypeRef = model.TypeReference;
+
+        // Check for generics
+        var genericParams = operationReturnTypeRef.GenericTypeParameters.ToList();
+        if (genericParams.Count == 1 && genericParams[0].ElementId == entityId)
+        {
+            // return true if we want to support this result-pattern scenario in the future
+            throw new NotSupportedException("Wrapping the entity in a generic type is not supported for static constructor creation mappings.");
+        }
+
+        return operationReturnTypeRef?.ElementId == entityId;
+    }
 }

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

@@ -1,3 +1,7 @@
+### Version 1.1.8
+
+- Internal Improvement: Preparing for future support for result pattern in mapping system.
+
 ### Version 1.1.7
 
 - Improvement: Checking for installed mappers are more flexible.