fb/fix-issue-formatter-layout-bug (#174)

* Add camp without Geo to help debug Exception * Raise Db ms threshold, at 500 it fires too often * Fix layout bug in Issue Formatter * Script updates version to 1.1.5 --------- Co-authored-by: Daniel Gorin <[email protected]>
CheckMadeOrga · Aug 17, 2024 · 01d9620 · 01d9620
1 parent 48d9ac6
commit 01d9620
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 13 deletions.
diff --git a/...024_06_07_remove_mobile_projects/CheckMade.Mobile.Android/CheckMade.Mobile.Android.csproj b/...024_06_07_remove_mobile_projects/CheckMade.Mobile.Android/CheckMade.Mobile.Android.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net8.0-android</TargetFramework>
         <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
         <ApplicationId>com.CheckMadeOrga.CheckMade-Mobile</ApplicationId>
-        <ApplicationVersion>58</ApplicationVersion>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <ApplicationDisplayVersion>1.1.4</ApplicationDisplayVersion>
+        <ApplicationVersion>59</ApplicationVersion>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <ApplicationDisplayVersion>1.1.5</ApplicationDisplayVersion>
         <AndroidPackageFormat>apk</AndroidPackageFormat>
         <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
         <Configurations>Debug_Non_iOS;Debug_All;No_Build;Release</Configurations>

diff --git a/Src/CheckMade.Common.Model/Core/Submissions/Issues/Concrete/IssueFormatters.cs b/Src/CheckMade.Common.Model/Core/Submissions/Issues/Concrete/IssueFormatters.cs
@@ -25,8 +25,8 @@ public static UiString FormatOperationalInfo<T>(
             UiNewLines(1),
             Ui("<b>Reported by:</b> {0} ",
                 $"{issue.ReportedBy.ByUser.FirstName} {issue.ReportedBy.ByUser.LastName}"),
-            Ui("in their role as "), glossary.GetUi(issue.ReportedBy.RoleType.GetType()));
-        // UiNewLines(1),
+            Ui("in their role as "), glossary.GetUi(issue.ReportedBy.RoleType.GetType()),
+            UiNewLines(1));
         // Ui("<b>Currently handled by:</b> "), issue.HandledBy.IsSome 
         //     ? UiConcatenate(UiIndirect(
         //             $"{issue.HandledBy.GetValueOrThrow().ByUser.FirstName} " +

diff --git a/Src/CheckMade.Common.Persistence/DbExecutionHelper.cs b/Src/CheckMade.Common.Persistence/DbExecutionHelper.cs
@@ -37,7 +37,7 @@ await dbCommandRetryPolicy.ExecuteAsync(async () =>
                 await executeDbOperations(db, transaction);
                 stopwatch.Stop();
 
-                const int currentWarningThreshold = 500;
+                const int currentWarningThreshold = 750;
                 
                 if (stopwatch.ElapsedMilliseconds > currentWarningThreshold)
                 {

diff --git a/Src/CheckMade.DevOps/scripts/sql/seeding/fake_test_setup_data.sql b/Src/CheckMade.DevOps/scripts/sql/seeding/fake_test_setup_data.sql
@@ -145,7 +145,20 @@ new_sphere2_saniclean_at_X2024 AS (
         ON CONFLICT (live_event_id, name) DO NOTHING
 ),
 
-new_sphere3_siteclean_at_X2024 AS (
+ new_sphere3_saniclean_nogeo__at_X2024 AS (
+     INSERT INTO spheres_of_action (name, trade, live_event_id, details, status)
+         VALUES ('Camp3-NoGeo',
+                 'DX3KFI',
+                 (SELECT id FROM new_live_event_X2024),
+                 '{
+                   "AvailableFacilities": ["D55BLT"],
+                   "AvailableConsumables": ["DSTP1N"]
+                 }',
+                 1)
+         ON CONFLICT (live_event_id, name) DO NOTHING
+ ),
+
+new_sphere4_siteclean_at_X2024 AS (
     INSERT INTO spheres_of_action (name, trade, live_event_id, details, status)
         VALUES ('Zone1',
                 'DSIL7M',

diff --git a/Src/CheckMade.Tests/Integration/Persistence/LiveEventsRepositoryTests.cs b/Src/CheckMade.Tests/Integration/Persistence/LiveEventsRepositoryTests.cs
@@ -37,7 +37,7 @@ public async Task GetAsync_ReturnsCorrectLiveEventObjectGraph_ForX2024TestEvent(
 
         Assert.Contains(Sphere1_AtX2024.Name, allSphereNames);
         Assert.Contains(Sphere2_AtX2024.Name, allSphereNames);
-        Assert.Contains(Sphere3_AtX2024.Name, allSphereNames);
+        Assert.Contains(Sphere4_AtX2024.Name, allSphereNames);
 
         Assert.Equal(3, allSphereNames.Count);
 
@@ -52,9 +52,9 @@ public async Task GetAsync_ReturnsCorrectLiveEventObjectGraph_ForX2024TestEvent(
                 .First(s => s.Name == Sphere2_AtX2024.Name)
                 .GetTradeType());
         Assert.Equal(
-            Sphere3_AtX2024.GetTradeType(),
+            Sphere4_AtX2024.GetTradeType(),
             liveEventGraph.DivIntoSpheres
-                .First(s => s.Name == Sphere3_AtX2024.Name)
+                .First(s => s.Name == Sphere4_AtX2024.Name)
                 .GetTradeType());
 
         Assert.Equivalent(
@@ -70,7 +70,7 @@ public async Task GetAsync_ReturnsCorrectLiveEventObjectGraph_ForX2024TestEvent(
         Assert.Equivalent(
             Option<Geo>.None(),
             liveEventGraph.DivIntoSpheres
-                .First(s => s.Name == Sphere3_AtX2024.Name)
+                .First(s => s.Name == Sphere4_AtX2024.Name)
                 .Details.GeoCoordinates);
 
         List<DomainTerm> expectedFacilitiesAtX2024Sphere1 =

diff --git a/Src/CheckMade.Tests/Utils/TestData.cs b/Src/CheckMade.Tests/Utils/TestData.cs
@@ -201,7 +201,21 @@ internal static class TestData
                     Dt(ConsumablesItem.ToiletPaper)
                 }));
 
-    internal static readonly SphereOfAction<SiteCleanTrade> Sphere3_AtX2024 =
+    internal static readonly SphereOfAction<SanitaryTrade> Sphere3_AtX2024 =
+        new("Camp3-NoGeo",
+            new SanitaryCampDetails(
+                Option<Geo>.None(), 
+                new List<DomainTerm>
+                    {
+                        Dt(typeof(GeneralMisc))
+                    }
+                    .ToImmutableReadOnlyCollection(),
+                new List<DomainTerm>
+                {
+                    Dt(ConsumablesItem.ToiletPaper)
+                }));
+
+    internal static readonly SphereOfAction<SiteCleanTrade> Sphere4_AtX2024 =
         new("Zone1",
             new SiteCleaningZoneDetails(
                 Option<Geo>.None(),
@@ -221,7 +235,7 @@ internal static class TestData
         Venue1,
         new List<ISphereOfAction>
         {
-            Sphere1_AtX2024, Sphere2_AtX2024, Sphere3_AtX2024
+            Sphere1_AtX2024, Sphere2_AtX2024, Sphere4_AtX2024
         });
 
     internal static readonly LiveEvent Y2024 = new(

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.1.4
+1.1.5