Merge pull request #388 from KSG-IT/develop

2023.9.2 release
KSG-IT · Sep 20, 2024 · 51041b1 · 51041b1
2 parents c91932e + c571292
commit 51041b1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 
 ## [unreleased]
 
+## [2024.9.21] - 2024-09-21
+
+### Added
+- Organization: internal group position highlight filter on archive status
+
 ## [2024.8.1] - 2024-08-13
 ### Added
 - Schedules

diff --git a/ksg_nett/settings.py b/ksg_nett/settings.py
@@ -281,7 +281,7 @@
 DEPOSIT_TIME_RESTRICTION_HOUR = os.environ.get("DEPOSIT_TIME_RESTRICTION_HOUR", 20)
 LANGUAGE_SESSION_KEY = "language"
 
-VERSION = "2024.8.1"
+VERSION = "2024.9.21"
 
 # Feature flag keys
 STRIPE_INTEGRATION_FEATURE_FLAG = "stripe_integration"

diff --git a/organization/schema.py b/organization/schema.py
@@ -277,7 +277,6 @@ def mutate(self, info, membership_id, date_ended, date_joined, *args, **kwargs):
         return PatchInternalGroupPositionMembershipDateMutation(
             internal_group_position_membership=membership
         )
-
 
 
 class AssignNewInternalGroupPositionMembership(graphene.Mutation):
@@ -447,7 +446,9 @@ class InternalGroupUserHighlightQuery(graphene.ObjectType):
     all_internal_group_user_highlights = graphene.List(InternalGroupUserHighlightNode)
     internal_group_user_highlight = Node.Field(InternalGroupUserHighlightNode)
     internal_group_user_highlights_by_internal_group = graphene.List(
-        InternalGroupUserHighlightNode, internal_group_id=graphene.ID()
+        InternalGroupUserHighlightNode,
+        internal_group_id=graphene.ID(),
+        include_archived=graphene.Boolean(),
     )
 
     @gql_login_required()
@@ -456,12 +457,16 @@ def resolve_all_internal_group_user_highlights(self, info, *args, **kwargs):
 
     @gql_login_required()
     def resolve_internal_group_user_highlights_by_internal_group(
-        self, info, internal_group_id, *args, **kwargs
+        self, info, internal_group_id, include_archived, *args, **kwargs
     ):
         internal_group_id = disambiguate_id(internal_group_id)
-        return InternalGroupUserHighlight.objects.filter(
-            internal_group__id=internal_group_id
+        highlights = InternalGroupUserHighlight.objects.filter(
+            internal_group__id=internal_group_id,
         )
+        if not include_archived:
+            highlights = highlights.filter(archived=False)
+
+        return highlights
 
 
 class OrganizationMutations(graphene.ObjectType):

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ksg-nett"
-version = "2023.11.1"
+version = "2023.9.21"
 description = ""
 authors = ["Tormod Haugland <[email protected]>", "Alexander Orvik <[email protected]>", "Christian De Fréne <[email protected]>"]