Federated query fixed (#128)

Co-authored-by: Robert Brands (RiwaAdmin) <[email protected]>
rbrands · Sep 15, 2023 · fb50d71 · fb50d71
1 parent 694b453
commit fb50d71
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/MeetUpFunctions/Constants.cs b/MeetUpFunctions/Constants.cs
@@ -22,7 +22,7 @@ public static class Constants
         public const string DEFAULT_DISCLAIMER = "Disclaimer";
         public const string DEFAULT_GUEST_DISCLAIMER = "Guest Disclaimer";
 
-        public const string VERSION = "2023-09-10";
+        public const string VERSION = "2023-09-15";
         public const int ADMINOVERBOOKFACTOR = 1; // no overbooking any more, because not needed
 
         public const int LOG_TTL = 30 * 24 * 3600; // 30 days TTL for Log items

diff --git a/MeetUpFunctions/GetExtendedCalendarItems.cs b/MeetUpFunctions/GetExtendedCalendarItems.cs
@@ -80,14 +80,7 @@ public async Task<IActionResult> Run(
             if (!String.IsNullOrEmpty(serverSettings.Federation))
             {
                 IEnumerable<CalendarItem> rawListOfFederatedCalendarItems;
-                if (null == tenant)
-                {
-                    rawListOfFederatedCalendarItems = await _cosmosRepository.GetItems(d => d.StartDate > compareDate && (d.Tenant ?? String.Empty) == String.Empty && d.Federation == serverSettings.Federation);
-                }
-                else
-                {
-                    rawListOfFederatedCalendarItems = await _cosmosRepository.GetItems(d => d.StartDate > compareDate && d.Tenant.Equals(tenant) && d.Federation == serverSettings.Federation);
-                }
+                rawListOfFederatedCalendarItems = await _cosmosRepository.GetItems(d => d.StartDate > compareDate && d.Federation.Equals(serverSettings.Federation));
                 rawCalendarItemsWithFederatedOnes = rawListOfCalendarItems.Concat(rawListOfFederatedCalendarItems);
             }
             List<ExtendedCalendarItem> resultCalendarItems = new List<ExtendedCalendarItem>(10);

diff --git a/MeetUpPlanner/Client/Pages/About.razor b/MeetUpPlanner/Client/Pages/About.razor
@@ -51,7 +51,7 @@
 </div>
 
 @code {
-    private const string clientVersion = "2023-09-10";
+    private const string clientVersion = "2023-09-15";
     private string serverVersion = "tbd";
     private string functionsVersion = "tbd";
 

diff --git a/MeetUpPlanner/Server/Controllers/UtilController.cs b/MeetUpPlanner/Server/Controllers/UtilController.cs
@@ -20,7 +20,7 @@ public class UtilController : ControllerBase
     {
         private readonly MeetUpFunctions _meetUpFunctions;
         private readonly ILogger<UtilController> logger;
-        const string serverVersion = "2023-09-10";
+        const string serverVersion = "2023-09-15";
         string functionsVersion = "tbd";
 
         public UtilController(ILogger<UtilController> logger, MeetUpFunctions meetUpFunctions)