Fixed dispatcher return http contracts on non-http triggers

joelsteventurner · joelsteventurner · commit 0fdeaca6c461 · 2025-10-09T19:03:23.000+02:00
Fixed script crashing when commands , etc had association children and swapping between trigger types.
diff --git a/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/FactoryExtensions/AzureFunctionsMediatRDispatchInstaller.cs b/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/FactoryExtensions/AzureFunctionsMediatRDispatchInstaller.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Intent.AzureFunctions.Api;
 using Intent.Engine;
 using Intent.Modelers.Services.Api;
@@ -17,6 +14,10 @@
 using Intent.Modules.Metadata.WebApi.Models;
 using Intent.Plugins.FactoryExtensions;
 using Intent.RoslynWeaver.Attributes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.ModuleBuilder.Templates.FactoryExtension", Version = "1.0")]
@@ -110,7 +111,12 @@ private static CSharpStatement GetReturnStatement(string statement, string statu
 
         private static CSharpStatement GetReturnStatement(IAzureFunctionModel operationModel)
         {
-            var endpoint = HttpEndpointModelFactory.GetEndpoint(operationModel.InternalElement, string.Empty);
+            IHttpEndpointModel? endpoint = null;
+            if (operationModel.TriggerType == TriggerType.HttpTrigger)
+            {
+                endpoint = HttpEndpointModelFactory.GetEndpoint(operationModel.InternalElement, string.Empty);
+            }
+            
             switch (endpoint?.Verb)
             {
                 case HttpVerb.Get:
diff --git a/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/Intent.AzureFunctions.Dispatch.MediatR.imodspec b/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/Intent.AzureFunctions.Dispatch.MediatR.imodspec
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AzureFunctions.Dispatch.MediatR</id>
-  <version>2.0.2</version>
+  <version>2.0.3-pre.0</version>
   <supportedClientVersions>[4.2.4, 5.0.0-a)</supportedClientVersions>
   <summary>Azure Functions dispatch for mapped Commands and Queries to their respective handlers via MediatR.</summary>
   <description>Azure Functions dispatch for mapped Commands and Queries to their respective handlers via MediatR.</description>
diff --git a/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/release-notes.md b/Modules/Intent.Modules.AzureFunctions.Dispatch.MediatR/release-notes.md
@@ -1,3 +1,7 @@
+### Version 2.0.3
+
+- Fixed: Dispatching not only return REST concepts for HTTP triggers.
+
 ### Version 2.0.2
 
 - Fixed: Nuget package management update.
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.AzureFunctions.imodspec b/Modules/Intent.Modules.AzureFunctions/Intent.AzureFunctions.imodspec
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AzureFunctions</id>
-  <version>5.0.17-pre.1</version>
+  <version>5.0.17-pre.2</version>
   <supportedClientVersions>[4.5.15-a, 5.0.0-a)</supportedClientVersions>
   <summary>Provides support to describe Azure Functions in the Services designer</summary>
   <description>Provides support to describe Azure Functions in the Services designer</description>
@@ -77,7 +77,7 @@
     </detect>
     <detect id="Intent.Application.MediatR">
       <install>
-        <package id="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.2" />
+        <package id="Intent.AzureFunctions.Dispatch.MediatR" version="2.0.3-pre.0" />
       </install>
     </detect>
     <detect id="Intent.AzureFunctions.OpenApi">
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/35aaa5d4-1e33-4946-a18a-73c557f1dae5.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/35aaa5d4-1e33-4946-a18a-73c557f1dae5.xml
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/4e5923fd-78a1-4f07-826b-70c0cb9e03ac.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/4e5923fd-78a1-4f07-826b-70c0cb9e03ac.xml
@@ -94,6 +94,7 @@
                 <property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
                 <property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
                 <property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
+                <property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
                 <property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
                 <property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
               </properties>
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/88c532a8-209b-4888-aa69-aee8666aca33.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/88c532a8-209b-4888-aa69-aee8666aca33.xml
@@ -93,6 +93,7 @@
                 <property name="6087e660-9599-47fb-9ff4-1ad901ce2a00" display="Trigger On Double-Click" value="false" isActive="true" />
                 <property name="c03841e5-a1e9-4e95-b699-5a466dde7d7d" display="Is Option Visible Function" isActive="true" />
                 <property name="e034a0ca-0101-4594-8384-43048b714578" display="Order" isActive="true" />
+                <property name="c37d8704-0003-4886-b6c2-4e51aa22a8f9" display="Menu Group" isActive="true" />
                 <property name="3e93529e-2110-414e-aec1-2656e1a99b22" display="Top Divider" value="false" isActive="true" />
                 <property name="d2572c08-f02e-40b2-8a06-4d5251bb3352" display="Bottom Divider" value="false" isActive="true" />
               </properties>
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/b78dc242-b6b7-4287-84b9-dc61a1341871.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Extension/b78dc242-b6b7-4287-84b9-dc61a1341871.xml
@@ -93,6 +93,7 @@
                 <property name="6087e660-9599-47fb-9ff4-1ad901ce2a00" display="Trigger On Double-Click" value="false" isActive="true" />
                 <property name="c03841e5-a1e9-4e95-b699-5a466dde7d7d" display="Is Option Visible Function" isActive="true" />
                 <property name="e034a0ca-0101-4594-8384-43048b714578" display="Order" isActive="true" />
+                <property name="c37d8704-0003-4886-b6c2-4e51aa22a8f9" display="Menu Group" isActive="true" />
                 <property name="3e93529e-2110-414e-aec1-2656e1a99b22" display="Top Divider" value="false" isActive="true" />
                 <property name="d2572c08-f02e-40b2-8a06-4d5251bb3352" display="Bottom Divider" value="false" isActive="true" />
               </properties>
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Settings/702f57ca-3b5a-413b-a084-9f2d154154e7.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Element Settings/702f57ca-3b5a-413b-a084-9f2d154154e7.xml
@@ -97,6 +97,7 @@
                 <property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
                 <property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
                 <property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
+                <property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
                 <property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
                 <property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
               </properties>
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Module Settings Configuration/90437e3f-cb10-4e44-b229-cc30c4807bea.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Module Settings Configuration/90437e3f-cb10-4e44-b229-cc30c4807bea.xml
@@ -9,7 +9,16 @@
   <parentFolderId>022dbddc-276c-406b-81e6-5034ad64db72</parentFolderId>
   <packageId>022dbddc-276c-406b-81e6-5034ad64db72</packageId>
   <packageName>Intent.AzureFunctions</packageName>
-  <stereotypes />
+  <stereotypes>
+    <stereotype stereotypeDefinitionId="15b3e709-aeb8-410a-9172-1273eb7b0864" name="Configuration">
+      <addedByDefault>true</addedByDefault>
+      <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
+      <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
+      <properties>
+        <property name="ce4eefa2-657c-42b0-a8cf-bbe35ef1d8a9" display="Settings Type" value="Application Settings" isActive="true" />
+      </properties>
+    </stereotype>
+  </stereotypes>
   <metadata />
   <childElements>
     <childElement id="ff298d6c-705b-41d9-9286-be85480a0abd" type="Module Settings Field Configuration" typeId="88e29cab-1342-40c7-b052-5fcd68ffafec">
@@ -33,6 +42,7 @@
             <property name="653d889c-626f-45c5-a6e6-72b74a2f805c" display="Default Value" value="true" isActive="true" />
             <property name="c3456e79-0607-41a5-9b85-e0712f4f4834" display="Is Active Function" value="" isActive="true" />
             <property name="fa54329f-d4e5-48bc-8027-e17206e9fc89" display="Is Required Function" value="" isActive="true" />
+            <property name="29696a13-bf1d-4fbd-bdf3-adb802430cb4" display="Order Priority" isActive="true" />
           </properties>
         </stereotype>
       </stereotypes>
@@ -60,6 +70,7 @@
             <property name="653d889c-626f-45c5-a6e6-72b74a2f805c" display="Default Value" value="false" isActive="true" />
             <property name="c3456e79-0607-41a5-9b85-e0712f4f4834" display="Is Active Function" value="" isActive="true" />
             <property name="fa54329f-d4e5-48bc-8027-e17206e9fc89" display="Is Required Function" value="" isActive="true" />
+            <property name="29696a13-bf1d-4fbd-bdf3-adb802430cb4" display="Order Priority" isActive="true" />
           </properties>
         </stereotype>
       </stereotypes>
diff --git a/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Package Extension/e00928be-7fc4-47ff-9c7d-a06a19aa6ae0.xml b/Modules/Intent.Modules.AzureFunctions/Intent.Metadata/Module Builder/Intent.AzureFunctions/Elements/Package Extension/e00928be-7fc4-47ff-9c7d-a06a19aa6ae0.xml
@@ -69,6 +69,7 @@
                 <property name="719e9dff-2b8d-407d-912d-fac99a158721" display="Api Model Name" isActive="true" />
                 <property name="77a9993c-40ba-47a9-a2a4-0974548a3f27" display="Is Option Visible Function" isActive="true" />
                 <property name="A43F388B-DAFF-422C-BD8D-FB433EFEC51B" display="Type Order" isActive="true" />
+                <property name="fdea9028-8611-4eb0-b1a5-4d54d267af41" display="Menu Group" isActive="true" />
                 <property name="aeaeff9b-f55b-4888-92e9-5317b5c14016" display="Top Divider" value="false" isActive="true" />
                 <property name="543cc5f5-0b0c-40cc-9df7-3ce45b555dd0" display="Bottom Divider" value="false" isActive="true" />
               </properties>
diff --git a/Modules/Intent.Modules.AzureFunctions/modelers/Azure Functions CQRS Extensions.designer.settings b/Modules/Intent.Modules.AzureFunctions/modelers/Azure Functions CQRS Extensions.designer.settings
@@ -463,15 +463,26 @@ function getMappedDomainElement(request) {
     const httpSettingsId = "b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6"; // from WebApi module
     const httpSettingsMediatypeId = "4490e212-1e99-43ce-b3dd-048ed2a6bae8";
     const parameterSettingsId = "d01df110-1208-4af8-a913-92a49d219552"; // from WebApi module
+const dtoFieldTypeId = "7baed1fd-469b-4980-8fd9-4cefb8331eb2"; // from WebApi module
     if (!element.hasStereotype(azureFunctionId)) {
         return;
     }
-    if (element.getStereotype(azureFunctionId).getProperty(azureFunctionTriggerId).getValue() !== "Http Trigger") {
-        element.removeStereotype(httpSettingsId);
-        element.getChildren().forEach(x =&gt; x.removeStereotype(parameterSettingsId));
-        return;
+    let httpSettings;
+    //This is a switch for opting out of this managed behaviour , allowing the manual adding of http settings
+    if (!element.hasMetadata("manual-http-settings")) {
+        if (element.getStereotype(azureFunctionId).getProperty(azureFunctionTriggerId).getValue() !== "Http Trigger") {
+            element.removeStereotype(httpSettingsId);
+            element.getChildren(dtoFieldTypeId).forEach(x =&gt; x.removeStereotype(parameterSettingsId));
+            return;
+        }
+        httpSettings = (_a = element.getStereotype(httpSettingsId)) !== null &amp;&amp; _a !== void 0 ? _a : element.addStereotype(httpSettingsId);
+    }
+    else {
+        httpSettings = element.getStereotype(httpSettingsId);
+        if (httpSettings == null) {
+            return;
+        }
     }
-    let httpSettings = (_a = element.getStereotype(httpSettingsId)) !== null &amp;&amp; _a !== void 0 ? _a : element.addStereotype(httpSettingsId);
     if (httpSettings.getProperty("Route").getValue()) {
         return;
     }
diff --git a/Modules/Intent.Modules.AzureFunctions/release-notes.md b/Modules/Intent.Modules.AzureFunctions/release-notes.md
@@ -2,6 +2,7 @@
 
 - Improvement: Updated NuGet package versions.
 - Improvement: Isolated Processes program file template upgraded for improved extensibility from other modules.
+- Fixed: Script crash when swapping Trigger types for endpoint which has association children.
 
 ### Version 5.0.16
 
