From e53553eff582948c10e3c5a26c34b96743913a92 Mon Sep 17 00:00:00 2001
From: MerrionComputing <Duncan@merrioncomputing.com>
Date: Tue, 12 Mar 2019 22:06:05 +0000
Subject: [PATCH] Fixing results handler to use the durable function
 suborchestration to send results

---
 .../Get_League_Summary_Definition_Return.cs   | 34 +++++++------------
 .../Handlers/GetLeagueSummaryGetResults.cs    |  2 +-
 .../Queries/OnGetLeagueSummaryQueryHandler.cs |  2 +-
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/Domains/Leagues/Query Handlers/Get_League_Summary_Definition_Return.cs b/Domains/Leagues/Query Handlers/Get_League_Summary_Definition_Return.cs
index 5511e2a..e51a1a6 100644
--- a/Domains/Leagues/Query Handlers/Get_League_Summary_Definition_Return.cs	
+++ b/Domains/Leagues/Query Handlers/Get_League_Summary_Definition_Return.cs	
@@ -19,26 +19,14 @@ public class Get_League_Summary_Definition_Return
         /// <summary>
         /// The unique identifier of the query for which this result was returned
         /// </summary>
-        private readonly Guid queryId;
-        public Guid QueryIdentifier
-        {
-            get
-            {
-                return queryId;
-            }
-        }
+        public Guid QueryIdentifier { get; set; }
+
 
         /// <summary>
         /// The unique identifier for the league for which this query data are returned
         /// </summary>
-        private readonly string leagueName;
-        public string LeagueName
-        {
-            get
-            {
-                return leagueName;
-            }
-        }
+        public string LeagueName { get; set; }
+
 
         public string Location { get; set; }
 
@@ -50,13 +38,15 @@ public string LeagueName
             Guid queryIdIn,
             string leagueNameIn)
         {
-            queryId = queryIdIn;
-            leagueName = leagueNameIn;
+            QueryIdentifier  = queryIdIn;
+            LeagueName  = leagueNameIn;
         }
 
-        public static implicit operator JObject(Get_League_Summary_Definition_Return v)
-        {
-            throw new NotImplementedException();
-        }
+        /// <summary>
+        /// Empty constructor for serialisation
+        /// </summary>
+        public Get_League_Summary_Definition_Return()
+        { }
+
     }
 }
diff --git a/TheLongRun-League-Function/Queries/Handlers/GetLeagueSummaryGetResults.cs b/TheLongRun-League-Function/Queries/Handlers/GetLeagueSummaryGetResults.cs
index 7cc089c..98b6c44 100644
--- a/TheLongRun-League-Function/Queries/Handlers/GetLeagueSummaryGetResults.cs
+++ b/TheLongRun-League-Function/Queries/Handlers/GetLeagueSummaryGetResults.cs
@@ -102,7 +102,7 @@ ILogger log
             if (Guid.TryParse(queryId, out queryGuid))
             {
                 // Get the current state of the query...
-                Projection getQueryState = new Projection(@"Query",
+                Projection getQueryState = new Projection(Constants.Domain_Query,
                     queryName,
                     queryGuid.ToString(),
                     nameof(Query_Summary_Projection));
diff --git a/TheLongRun-League-Function/Queries/OnGetLeagueSummaryQueryHandler.cs b/TheLongRun-League-Function/Queries/OnGetLeagueSummaryQueryHandler.cs
index e6003c4..70efb50 100644
--- a/TheLongRun-League-Function/Queries/OnGetLeagueSummaryQueryHandler.cs
+++ b/TheLongRun-League-Function/Queries/OnGetLeagueSummaryQueryHandler.cs
@@ -376,7 +376,7 @@ Microsoft.Extensions.Logging.ILogger log
                             {
                                 resp = await context.CallSubOrchestratorWithRetryAsync<ActivityResponse>("QueryOutputProcessorOrchestrator",
                                     DomainSettings.QueryRetryOptions(),
-                                    projectionQueryRequest);
+                                    request);
                             }
                             catch (FunctionFailedException ffs)
                             {