Merge branch 'develop'

Author: peggy-quartech

.github/dependabot.yml

@@ -1,19 +1,19 @@
 version: 2
 updates:
-  - package-ecosystem: "nuget" # See documentation for possible values
-    directory: "/src"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 20
-  - package-ecosystem: "npm" # See documentation for possible values
-    directories:
-      - "/src/Spd.Presentation.Licensing/ClientApp"
-      - "/src/Spd.Presentation.Screening/ClientApp"
-      - "/src/Spd.Presentation.GuideDogServiceDog/ClientApp"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 20
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
+#  - package-ecosystem: "nuget" # See documentation for possible values
+#    directory: "/src"
+#    schedule:
+#      interval: "weekly"
+#    open-pull-requests-limit: 20
+#  - package-ecosystem: "npm" # See documentation for possible values
+#    directories:
+#      - "/src/Spd.Presentation.Licensing/ClientApp"
+#      - "/src/Spd.Presentation.Screening/ClientApp"
+#      - "/src/Spd.Presentation.GuideDogServiceDog/ClientApp"
+#    schedule:
+#      interval: "monthly"
+#    open-pull-requests-limit: 20
+#  - package-ecosystem: "github-actions"
+#    directory: "/"
+#    schedule:
+#      interval: "weekly"

src/Spd.Resource.Repository/Licence/Mappings.cs

@@ -47,7 +47,7 @@ public Mappings()
              .ForMember(d => d.IsDogsPurposeDetectionExplosives, opt => opt.MapFrom(s => SharedMappingFuncs.GetDogReasonFlag(s.spd_requestdogsreasons, RequestDogPurposeOptionSet.DetectionExplosives)))
              .ForMember(d => d.CarryAndUseRestraints, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_requestrestraints)))
              .ForMember(d => d.UseDogs, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_requestdogs)))
-             .ForMember(d => d.Conditions, opt => opt.MapFrom(s => s.spd_spd_licence_spd_licencecondition))
+             .ForMember(d => d.Conditions, opt => opt.MapFrom(s => s.spd_spd_licence_spd_licencecondition.Where(s => s.statecode == DynamicsConstants.StateCode_Active)))
              .ForMember(d => d.GDSDTeamId, opt => opt.MapFrom(s => s.spd_licence_spd_dogteam_LicenceId.FirstOrDefault() == null ? null : s.spd_licence_spd_dogteam_LicenceId.FirstOrDefault().spd_dogteamid))
              .ForMember(d => d.IsDogAssessor, opt => opt.MapFrom(s => SharedMappingFuncs.GetBool(s.spd_outd)))
              ;